diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue index fe74eb6..9ab2f45 100644 --- a/pageE/mine/MemberServe.vue +++ b/pageE/mine/MemberServe.vue @@ -173,7 +173,7 @@ export default { .coupon-btn { margin-left: auto; width: 85rpx; - height: 42rpx; + // height: 42rpx; border: 2rpx solid rgba(255,120,15,1); border-radius: 10rpx; font-size: 26rpx; diff --git a/pages.json b/pages.json index eaf37fe..f3d24f4 100644 --- a/pages.json +++ b/pages.json @@ -207,27 +207,6 @@ { "root": "pageE", "pages":[ - { - "path": "mine/MineIndex", - "style": { - "navigationBarTitleText": "我的", - "app-plus": { - "titleSize": "36px", - "titleNView": { - "titleColor": "#333333", - "backgroundColor": "#FFFFFF", - "buttons": [ - { - "type": "none", - "text": "\ue502", - "float": "right", - "fontSize": "14" - } - ] - } - } - } - }, { "path": "tool/MineHistory", "style": { @@ -667,37 +646,29 @@ "navigationBarTitleText": "首页", "navigationStyle": "custom" } + }, + { + "path": "pages/mine/index", + "style": { + "navigationBarTitleText": "我的", + "app-plus": { + "titleSize": "36px", + "titleNView": { + "titleColor": "#333333", + "backgroundColor": "#FFFFFF", + "buttons": [ + { + "type": "none", + "text": "\ue502", + "float": "right", + "fontSize": "14" + } + ] + } + } + } } ], - "tabBar": { - "color": "#999999", - "selectedColor": "#FF780F", - "backgroundColor": "#ffffff", - "fontSize": "12", - "iconWidth": "20", - "spacing": "7", - "list": [{ - "pagePath": "pages/index/index", - "iconPath": "static/image/home.png", - "selectedIconPath": "static/image/home2.png", - "text": "首页" - }, { - "pagePath": "pages/API/index", - "iconPath": "static/image/mall.png", - "selectedIconPath": "static/image/mall2.png", - "text": "商城" - }, { - "pagePath": "pages/API/index", - "iconPath": "static/image/message.png", - "selectedIconPath": "static/image/message2.png", - "text": "消息" - }, { - "pagePath": "pageE/mine/MineIndex", - "iconPath": "static/image/mine.png", - "selectedIconPath": "static/image/mine2.png", - "text": "我的" - }] - }, "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pageE/mine/MineIndex.vue b/pages/mine/index.vue similarity index 88% rename from pageE/mine/MineIndex.vue rename to pages/mine/index.vue index bd6e3d1..1b1457e 100644 --- a/pageE/mine/MineIndex.vue +++ b/pages/mine/index.vue @@ -2,12 +2,12 @@ - + - + 待支付 - + 已取消 - + 待收货 - + 试穿试送 - + 待评价 - + 售后 @@ -81,15 +81,15 @@ 我的工具 - + 送洗 - + 美甲 - + 足迹 @@ -98,19 +98,19 @@ 更多工具 - + 收货地址 - + 售后政策 - + 使用帮助 - + 投诉意见 @@ -128,12 +128,12 @@ export default { }, onLoad() {}, onNavigationBarButtonTap() { - console.log("setting"); - this.toOtherPage("/setting/Index"); + // console.log("setting"); + this.toOtherPage("/pageE/setting/Index"); }, methods: { toOtherPage(url) { - console.log(url); + // console.log(url); uni.navigateTo({ url: '/pageE' + url }); @@ -160,6 +160,7 @@ export default { border-radius: 50%; border: 2rpx solid rgba(251,251,251,1); margin-right: 30rpx; + flex-shrink: 0; } .user-info { display: flex; diff --git a/static/image/mine/1.png b/static/image/mine/1.png new file mode 100644 index 0000000..e7ac03f Binary files /dev/null and b/static/image/mine/1.png differ diff --git a/static/image/mine/13.png b/static/image/mine/13.png new file mode 100644 index 0000000..ee7078c Binary files /dev/null and b/static/image/mine/13.png differ diff --git a/static/image/mine/14.png b/static/image/mine/14.png new file mode 100644 index 0000000..2075aff Binary files /dev/null and b/static/image/mine/14.png differ diff --git a/static/image/mine/15.png b/static/image/mine/15.png new file mode 100644 index 0000000..f720a02 Binary files /dev/null and b/static/image/mine/15.png differ diff --git a/static/image/mine/16.png b/static/image/mine/16.png new file mode 100644 index 0000000..f3f687a Binary files /dev/null and b/static/image/mine/16.png differ diff --git a/static/image/mine/17.png b/static/image/mine/17.png new file mode 100644 index 0000000..9f576ae Binary files /dev/null and b/static/image/mine/17.png differ diff --git a/static/image/mine/18.png b/static/image/mine/18.png new file mode 100644 index 0000000..66a0c16 Binary files /dev/null and b/static/image/mine/18.png differ diff --git a/static/image/mine/19.png b/static/image/mine/19.png new file mode 100644 index 0000000..cf67c08 Binary files /dev/null and b/static/image/mine/19.png differ diff --git a/static/image/mine/2.png b/static/image/mine/2.png new file mode 100644 index 0000000..cb00cc7 Binary files /dev/null and b/static/image/mine/2.png differ diff --git a/static/image/mine/20.png b/static/image/mine/20.png new file mode 100644 index 0000000..7cd550f Binary files /dev/null and b/static/image/mine/20.png differ diff --git a/static/image/mine/21.png b/static/image/mine/21.png new file mode 100644 index 0000000..8aa6d13 Binary files /dev/null and b/static/image/mine/21.png differ diff --git a/static/image/mine/23.png b/static/image/mine/23.png new file mode 100644 index 0000000..cae1a3d Binary files /dev/null and b/static/image/mine/23.png differ diff --git a/static/image/mine/3.png b/static/image/mine/3.png new file mode 100644 index 0000000..a102b3f Binary files /dev/null and b/static/image/mine/3.png differ diff --git a/static/image/mine/6.png b/static/image/mine/6.png new file mode 100644 index 0000000..ba7d225 Binary files /dev/null and b/static/image/mine/6.png differ diff --git a/static/image/mine/9.png b/static/image/mine/9.png new file mode 100644 index 0000000..52524b4 Binary files /dev/null and b/static/image/mine/9.png differ diff --git a/static/image/home.png b/static/image/tabbar/home.png similarity index 100% rename from static/image/home.png rename to static/image/tabbar/home.png diff --git a/static/image/home2.png b/static/image/tabbar/home2.png similarity index 100% rename from static/image/home2.png rename to static/image/tabbar/home2.png diff --git a/static/image/mall.png b/static/image/tabbar/mall.png similarity index 100% rename from static/image/mall.png rename to static/image/tabbar/mall.png diff --git a/static/image/mall2.png b/static/image/tabbar/mall2.png similarity index 100% rename from static/image/mall2.png rename to static/image/tabbar/mall2.png diff --git a/static/image/message.png b/static/image/tabbar/message.png similarity index 100% rename from static/image/message.png rename to static/image/tabbar/message.png diff --git a/static/image/message2.png b/static/image/tabbar/message2.png similarity index 100% rename from static/image/message2.png rename to static/image/tabbar/message2.png diff --git a/static/image/mine.png b/static/image/tabbar/mine.png similarity index 100% rename from static/image/mine.png rename to static/image/tabbar/mine.png diff --git a/static/image/mine2.png b/static/image/tabbar/mine2.png similarity index 100% rename from static/image/mine2.png rename to static/image/tabbar/mine2.png