diff --git a/pages.json b/pages.json index 82f18c4..14a959e 100644 --- a/pages.json +++ b/pages.json @@ -9,74 +9,75 @@ } }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "pages/video/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "pages/task/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "pages/chasingDrama/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "enablePullDownRefresh": true - } - },{ - "path": "pages/me/index", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom" - } - },{ - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" - } - },{ - "path": "pages/login/register", - "style": { - "navigationBarTitleText": "注册", - "navigationStyle": "custom" - } - },{ - "path": "pages/login/registerApp", - "style": { - "navigationBarTitleText": "注册", - "navigationStyle": "custom" - } - },{ - "path": "pages/login/forgetPwd", - "style": { - "navigationBarTitleText": "忘记密码", - "navigationStyle": "custom" - } - },{ - "path": "pages/me/userInfo", - "style": { - "navigationBarTitleText": "个人资料" - } - }, - { - "path" : "pages/index/search/index", - "style" : { - "navigationBarTitleText" : "搜索" + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { + "path": "pages/video/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { + "path": "pages/task/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { + "path": "pages/chasingDrama/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, { + "path": "pages/watching_history/watching_history" + }, { + "path": "pages/me/index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, { + "path": "pages/login/register", + "style": { + "navigationBarTitleText": "注册", + "navigationStyle": "custom" + } + }, { + "path": "pages/login/registerApp", + "style": { + "navigationBarTitleText": "注册", + "navigationStyle": "custom" + } + }, { + "path": "pages/login/forgetPwd", + "style": { + "navigationBarTitleText": "忘记密码", + "navigationStyle": "custom" + } + }, { + "path": "pages/me/userInfo", + "style": { + "navigationBarTitleText": "个人资料" + } + }, + { + "path": "pages/index/search/index", + "style": { + "navigationBarTitleText": "搜索" + } } - } ], "globalStyle": { "navigationBarTextStyle": "black", @@ -89,13 +90,12 @@ "selectedColor": "#FF7581", "backgroundColor": "#FFFFFF", "borderStyle": "black", - "list": [ - { + "list": [{ "pagePath": "pages/index/index", "iconPath": "static/tabbar/index.png", "selectedIconPath": "static/tabbar/index_2.png", "text": "小剧场" - },{ + }, { "pagePath": "pages/video/index", "iconPath": "static/tabbar/learn.png", "selectedIconPath": "static/tabbar/learn_2.png", @@ -107,7 +107,7 @@ "selectedIconPath": "static/tabbar/task_2.png", "text": "任务" }, - + { "pagePath": "pages/chasingDrama/index", "iconPath": "static/tabbar/zhuiju.png", diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue index 6b3509b..3e87028 100644 --- a/pages/chasingDrama/index.vue +++ b/pages/chasingDrama/index.vue @@ -4,7 +4,7 @@ 最近观看 - 更多 + 更多 @@ -62,7 +62,7 @@ 我的追剧 - 更多 + 更多 diff --git a/pages/watching_history/watching_history.vue b/pages/watching_history/watching_history.vue new file mode 100644 index 0000000..2c601f9 --- /dev/null +++ b/pages/watching_history/watching_history.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/uni.scss b/uni.scss index 5351510..0155abc 100644 --- a/uni.scss +++ b/uni.scss @@ -13,6 +13,8 @@ */ /* 颜色变量 */ +$uni-zj-color-primary: #ff7581; +$uni-zj-color-primary-active: #cb5d68; /* 行为相关颜色 */ $uni-color-primary: #007aff; @@ -21,32 +23,32 @@ $uni-color-warning: #f0ad4e; $uni-color-error: #dd524d; /* 文字基本颜色 */ -$uni-text-color:#333;//基本色 -$uni-text-color-inverse:#fff;//反色 -$uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息 +$uni-text-color: #333; //基本色 +$uni-text-color-inverse: #fff; //反色 +$uni-text-color-grey: #999; //辅助灰色,如加载更多的提示信息 $uni-text-color-placeholder: #808080; -$uni-text-color-disable:#c0c0c0; +$uni-text-color-disable: #c0c0c0; /* 背景颜色 */ -$uni-bg-color:#ffffff; -$uni-bg-color-grey:#f8f8f8; -$uni-bg-color-hover:#f1f1f1;//点击状态颜色 -$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 +$uni-bg-color: #ffffff; +$uni-bg-color-grey: #f8f8f8; +$uni-bg-color-hover: #f1f1f1; //点击状态颜色 +$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色 /* 边框颜色 */ -$uni-border-color:#c8c7cc; +$uni-border-color: #c8c7cc; /* 尺寸变量 */ /* 文字尺寸 */ -$uni-font-size-sm:12px; -$uni-font-size-base:14px; -$uni-font-size-lg:16px; +$uni-font-size-sm: 12px; +$uni-font-size-base: 14px; +$uni-font-size-lg: 16px; /* 图片尺寸 */ -$uni-img-size-sm:20px; -$uni-img-size-base:26px; -$uni-img-size-lg:40px; +$uni-img-size-sm: 20px; +$uni-img-size-base: 26px; +$uni-img-size-lg: 40px; /* Border Radius */ $uni-border-radius-sm: 2px; @@ -68,10 +70,10 @@ $uni-spacing-col-lg: 12px; $uni-opacity-disabled: 0.3; // 组件禁用态的透明度 /* 文章场景相关 */ -$uni-color-title: #2C405A; // 文章标题颜色 -$uni-font-size-title:20px; +$uni-color-title: #2c405a; // 文章标题颜色 +$uni-font-size-title: 20px; $uni-color-subtitle: #555555; // 二级标题颜色 -$uni-font-size-subtitle:26px; -$uni-color-paragraph: #3F536E; // 文章段落颜色 -$uni-font-size-paragraph:15px; -@import 'uview-plus/theme.scss'; \ No newline at end of file +$uni-font-size-subtitle: 26px; +$uni-color-paragraph: #3f536e; // 文章段落颜色 +$uni-font-size-paragraph: 15px; +@import 'uview-plus/theme.scss';