diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index ce4979b61..73cab736e 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -9,7 +9,6 @@ - @@ -64,7 +63,7 @@ - + @@ -221,6 +220,13 @@ this.getAllOrderList(); }, methods: { + goPagesmy(num) { + if (num == 1) { + uni.navigateTo({ + url: '/pagesMy/signIn/index' + }) + } + }, // 查询全部充值订单 getAllOrderList() { request({ diff --git a/gasStation-uni/pagesMy/signIn/index.vue b/gasStation-uni/pagesMy/signIn/index.vue index 5ca66e297..8be104ff9 100644 --- a/gasStation-uni/pagesMy/signIn/index.vue +++ b/gasStation-uni/pagesMy/signIn/index.vue @@ -3,6 +3,22 @@ + + 已连续签到 + 0 + 5 + + + + + 第6天 + + 5积分 + + + + 签到 + @@ -50,9 +66,9 @@ }, // 分页——网络请求 async getList() { - uni.showLoading({ - title: '加载中' - }); + // uni.showLoading({ + // title: '加载中' + // }); let res = await request({ url: '网络请求', method: 'get', @@ -82,6 +98,7 @@ .container { width: 100%; box-sizing: border-box; + padding-bottom: 50px; } @@ -94,4 +111,68 @@ height: 100%; } } + + .cont-title { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + .or-size { + font-weight: 400; + font-size: 14px; + color: #333333; + } + + .or-num { + box-sizing: border-box; + padding: 0px 5px; + background: #FF9655; + color: #fff; + font-weight: 600; + font-size: 32px; + color: #FFFFFF; + margin: 10px; + } + + .wrap-box { + width: 100%; + display: flex; + flex-wrap: wrap; + box-sizing: border-box; + padding: 10px; + } + + .w_box { + width: 19%; + box-sizing: border-box; + padding: 5px 15px; + background: #F7F7F7; + text-align: center; + font-size: 12px; + border-radius: 4px; + margin-right: 1%; + margin-bottom: 2%; + + image { + margin: 5px auto; + } + } + + .anniu { + width: 80%; + height: 40px; + background: #FF9655; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + border-radius: 50px; + margin: 25px auto; + } + + .acv_w { + background: #FF9655 !important; + } \ No newline at end of file diff --git a/gasStation-uni/pages/my/icon/newmy.png b/gasStation-uni/static/icon/icon/newmy.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy.png rename to gasStation-uni/static/icon/icon/newmy.png diff --git a/gasStation-uni/pages/my/icon/newmy1.png b/gasStation-uni/static/icon/icon/newmy1.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy1.png rename to gasStation-uni/static/icon/icon/newmy1.png diff --git a/gasStation-uni/pages/my/icon/newmy10.png b/gasStation-uni/static/icon/icon/newmy10.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy10.png rename to gasStation-uni/static/icon/icon/newmy10.png diff --git a/gasStation-uni/pages/my/icon/newmy11.png b/gasStation-uni/static/icon/icon/newmy11.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy11.png rename to gasStation-uni/static/icon/icon/newmy11.png diff --git a/gasStation-uni/pages/my/icon/newmy12.png b/gasStation-uni/static/icon/icon/newmy12.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy12.png rename to gasStation-uni/static/icon/icon/newmy12.png diff --git a/gasStation-uni/pages/my/icon/newmy2.png b/gasStation-uni/static/icon/icon/newmy2.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy2.png rename to gasStation-uni/static/icon/icon/newmy2.png diff --git a/gasStation-uni/pages/my/icon/newmy3.png b/gasStation-uni/static/icon/icon/newmy3.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy3.png rename to gasStation-uni/static/icon/icon/newmy3.png diff --git a/gasStation-uni/pages/my/icon/newmy4.png b/gasStation-uni/static/icon/icon/newmy4.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy4.png rename to gasStation-uni/static/icon/icon/newmy4.png diff --git a/gasStation-uni/pages/my/icon/newmy5.png b/gasStation-uni/static/icon/icon/newmy5.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy5.png rename to gasStation-uni/static/icon/icon/newmy5.png diff --git a/gasStation-uni/pages/my/icon/newmy6.png b/gasStation-uni/static/icon/icon/newmy6.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy6.png rename to gasStation-uni/static/icon/icon/newmy6.png diff --git a/gasStation-uni/pages/my/icon/newmy7.png b/gasStation-uni/static/icon/icon/newmy7.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy7.png rename to gasStation-uni/static/icon/icon/newmy7.png diff --git a/gasStation-uni/pages/my/icon/newmy8.png b/gasStation-uni/static/icon/icon/newmy8.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy8.png rename to gasStation-uni/static/icon/icon/newmy8.png diff --git a/gasStation-uni/pages/my/icon/newmy9.png b/gasStation-uni/static/icon/icon/newmy9.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmy9.png rename to gasStation-uni/static/icon/icon/newmy9.png diff --git a/gasStation-uni/pages/my/icon/newmyc.png b/gasStation-uni/static/icon/icon/newmyc.png similarity index 100% rename from gasStation-uni/pages/my/icon/newmyc.png rename to gasStation-uni/static/icon/icon/newmyc.png