diff --git a/pages.json b/pages.json index 1b9904e..9d7d108 100644 --- a/pages.json +++ b/pages.json @@ -1,21 +1,14 @@ { "pages": [ { - "path": "pages/index/test", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/index/test2", + "path": "pages/index/home", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": false + "enablePullDownRefresh": true } }, { - "path": "pages/index/home", + "path": "pages/index/member", "style": { "navigationStyle": "custom", "enablePullDownRefresh": true @@ -101,22 +94,10 @@ }, "tabBar": { "color": "#999", - "selectedColor": "#c70019", + "selectedColor": "#06DADC", "borderStyle": "white", "backgroundColor": "#ffffff", "list": [ - { - "pagePath": "pages/index/test", - "text": "测试", - "iconPath": "static/维修图标.png", - "selectedIconPath": "static/维修图标-点击.png" - }, - { - "pagePath": "pages/index/test2", - "text": "webView", - "iconPath": "static/维修图标.png", - "selectedIconPath": "static/维修图标-点击.png" - }, { "pagePath": "pages/index/home", "text": "主页", @@ -125,9 +106,15 @@ }, { "pagePath": "pages/index/maintain", - "text": "维修", - "iconPath": "static/维修图标.png", - "selectedIconPath": "static/维修图标-点击.png" + "text": "书桌", + "iconPath": "static/书桌图标.png", + "selectedIconPath": "static/书桌图标-点击.png" + }, + { + "pagePath": "pages/index/member", + "text": "会员", + "iconPath": "static/会员图标.png", + "selectedIconPath": "static/会员图标-点击.png" }, { "pagePath": "pages/index/user", diff --git a/pages/index/member.vue b/pages/index/member.vue new file mode 100644 index 0000000..ba53413 --- /dev/null +++ b/pages/index/member.vue @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/static/主页图标-点击.png b/static/主页图标-点击.png index 16ed10a..0d75498 100644 Binary files a/static/主页图标-点击.png and b/static/主页图标-点击.png differ diff --git a/static/主页图标.png b/static/主页图标.png index 13d207d..a685ae1 100644 Binary files a/static/主页图标.png and b/static/主页图标.png differ diff --git a/static/书桌图标-点击.png b/static/书桌图标-点击.png new file mode 100644 index 0000000..1de7820 Binary files /dev/null and b/static/书桌图标-点击.png differ diff --git a/static/书桌图标.png b/static/书桌图标.png new file mode 100644 index 0000000..c1e6075 Binary files /dev/null and b/static/书桌图标.png differ diff --git a/static/会员图标-点击.png b/static/会员图标-点击.png new file mode 100644 index 0000000..e7f8593 Binary files /dev/null and b/static/会员图标-点击.png differ diff --git a/static/会员图标.png b/static/会员图标.png new file mode 100644 index 0000000..365a36a Binary files /dev/null and b/static/会员图标.png differ diff --git a/static/我的图标-点击.png b/static/我的图标-点击.png index a07bd80..5650045 100644 Binary files a/static/我的图标-点击.png and b/static/我的图标-点击.png differ diff --git a/static/我的图标.png b/static/我的图标.png index e87e20e..55df0cc 100644 Binary files a/static/我的图标.png and b/static/我的图标.png differ diff --git a/static/维修图标-点击.png b/static/维修图标-点击.png deleted file mode 100644 index 4772576..0000000 Binary files a/static/维修图标-点击.png and /dev/null differ diff --git a/static/维修图标.png b/static/维修图标.png deleted file mode 100644 index ea06790..0000000 Binary files a/static/维修图标.png and /dev/null differ diff --git a/uni.scss b/uni.scss index 1c1d400..481a46b 100644 --- a/uni.scss +++ b/uni.scss @@ -16,8 +16,8 @@ /* 颜色变量 */ // 自定义颜色 -$primary-color: #C70019; -$secondary-color: #990012; +$primary-color: #06DADC; +$secondary-color: #E8FBFB; $primary-text-color: #000; $secondary-text-color: #999;