From c5605c568d26e4fec87cd5dc670bc0d9410356d7 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Mon, 11 Oct 2021 09:30:02 +0800 Subject: [PATCH 1/5] [...] --- router/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/router/index.js b/router/index.js index d04e494..ca262ed 100644 --- a/router/index.js +++ b/router/index.js @@ -24,11 +24,11 @@ const router = createRouter({ router.beforeEach((to, from, next) => { const token = store.getters.getToken || uni.getStorageSync('token') // 检查是否需要微信授权 - if(store.getters.getCode === '' && to.name != 'wxAuth'){ - next({ - name: 'wxAuth' - }) - } + // if(store.getters.getCode === '' && to.name != 'wxAuth'){ + // next({ + // name: 'wxAuth' + // }) + // } // 检查是否需要登录 if(to.auth && token === ''){ next({ From 1e57b9272a5844785085ee5c1b3a121440a46560 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Wed, 13 Oct 2021 13:11:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=8F=8A=E8=B0=83=E8=8A=82?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 3 +- pages.json | 52 +- pages/vip/vip.vue | 1201 ++-- .../dist/dev/app-plus/app-config-service.js | 2 +- unpackage/dist/dev/app-plus/app-service.js | 5578 +++++++-------- unpackage/dist/dev/app-plus/app-view.js | 6316 +++++++++-------- 6 files changed, 6642 insertions(+), 6510 deletions(-) diff --git a/apis/index.js b/apis/index.js index d893939..f423da0 100644 --- a/apis/index.js +++ b/apis/index.js @@ -9,7 +9,8 @@ import store from '@/store' // 基础配置 const config = { - apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境 + // apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境 + apiUrl : 'http://api.ahxh.shangkelian.cn/api/', // 测试环境 apiUrls : 'https://storage.lianshang.vip/', // 图片路径（测试/正式） timeout : 60000 } diff --git a/pages.json b/pages.json index 41a7764..fe5337c 100644 --- a/pages.json +++ b/pages.json @@ -3,26 +3,26 @@ "path": "pages/index/index", "name": "Index", "style": { - "navigationBarBackgroundColor":"#1f1922", - "backgroundColor":"#1f1922", - "navigationStyle":"custom", - "navigationBarTextStyle":"white" + "navigationBarBackgroundColor": "#1f1922", + "backgroundColor": "#1f1922", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/found/index", "name": "Found", "auth": true, "style": { - "navigationBarTitleText": "发现更多", - "navigationStyle":"custom" + "navigationBarTitleText": "发现更多", + "navigationStyle": "custom" } }, { "path": "pages/user/index", "name": "User", "auth": true, - "style": { - "navigationBarTitleText": "节点中心", - "navigationStyle":"custom" + "style": { + "navigationBarTitleText": "节点中心", + "navigationStyle": "custom" } }, { "path": "pages/user/code", @@ -63,13 +63,15 @@ "path": "pages/vip/vip", "name": "vipIndex", "style": { - "navigationBarTitleText": "开通节点" + "navigationBarTitleText": "开通节点", + "navigationBarBackgroundColor": "#774ffd" } }, { "path": "pages/vip/agree", "name": "vipAgree", "style": { - "navigationBarTitleText": "用户协议" + "navigationBarTitleText": "用户协议", + "navigationBarBackgroundColor": "#774ffd" } }, { "path": "pages/vip/examine", @@ -136,9 +138,9 @@ "path": "pages/login/login", "name": "Login", "style": { - "navigationBarTitleText": "登录", - "navigationBarBackgroundColor":"#FFFFFF", - "navigationBarTextStyle":"black" + "navigationBarTitleText": "登录", + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" } }, { "path": "pages/login/guide", @@ -298,17 +300,17 @@ }, "name": "withdrawList" }, { - "path" : "pages/wxAuth/wxAuth", - "name" : "wxAuth" - },{ - "path" : "pages/clearOpen/clearOpen", - "style" : { - "navigationBarTitleText": "提现记录", - "enablePullDownRefresh": false - }, - "name": "clearOpen" - } - ], + "path": "pages/wxAuth/wxAuth", + "name": "wxAuth" + }, { + "path": "pages/clearOpen/clearOpen", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false + }, + "name": "clearOpen" + } + ], "globalStyle": { "backgroundColor": "#F5F5F5" }, diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue index 2f2bac6..205d063 100644 --- a/pages/vip/vip.vue +++ b/pages/vip/vip.vue @@ -5,32 +5,41 @@ 上传打款凭证 - + 提交 - + {{ item.name }} - + - {{ item.count.stock > 0 ? '剩余名额：' + item.count.residue : '不限名数' }} + + {{ item.count.stock > 0 ? '剩余名额：' + item.count.residue : '不限名数' }} + 当前身份 - {{ item.title }} + {{ item.title }} + - {{ item.title }} + + {{ item.title }} - {{ item.title }} + + {{ item.title }} - {{ item.title }} + + {{ item.title }} @@ -61,7 +70,8 @@ {{ openCondition.service_charge.message }} - {{ openCondition.price.message }} + {{ openCondition.certification.message }} @@ -69,13 +79,17 @@ 节点权益 - &{{ item.remark }} + &{{ item.remark }} - 请仔细阅读并确认服务协议 + + + 请仔细阅读并确认服务协议 + 会员服务协议 @@ -83,7 +97,7 @@ - + - - 上传打款凭证 - - 提交 + + + 打款凭证 + + + 状态：{{voucher.status.text}} + 驳回原因：{{voucher.remark}} + 重新提交 + + + + 上传打款凭证 + + 提交 + + - + 请仔细阅读并确认服务协议 - + 会员服务协议 - - + + + {{voucher.status.value === 1?'申请审核中':''}}{{voucher.status.value === 3?'申请被驳回查看原因':''}} + 当前不可开通 + 当前身份 - - - - - - 签到成功 - - - 能量碎片+{{sign.signSuccess}} - - - - - - - 发现更多 + + + + + + + 签到成功 + + + 能量碎片+{{sign.signSuccess}} + + + + + + + 发现更多 海量能量碎片等你解锁 - - - - 已签 - - - - - - - - - {{ item.text }} - - - - 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片 - - - - - 签到领取能量碎片 - - - - - 能量碎片记录 - - - - - - - 能量碎片任务 - - - - - {{item.title}} - {{item.remark}} - {{item.is_finish ? '已完成' : item.tips}} - - - + + + + 已签 + + + + + + + + + {{ item.text }} + + + + 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片 + + + + + + 签到领取能量碎片 + + + + + 能量碎片记录 + + + + + + + 能量碎片任务 + + + + + {{item.title}} + {{item.remark}} + {{item.is_finish ? '已完成' : item.tips}} + + + + + diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index 43aa64c..900df52 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -57,7 +57,7 @@ - + 关于链商星球 diff --git a/pages/user/index.vue b/pages/user/index.vue index 844c931..67ad9de 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -3,26 +3,28 @@ - - - 扫描上方微信二维码，添加您的专属VIP客服 - - + + + 扫描上方微信二维码，添加您的专属VIP客服 + + - - {{newList[newPopIndex].title}} - - - - - - 下一条 - - + + {{newList[newPopIndex].title}} + + + + + + 下一条 + + + @@ -31,18 +33,23 @@ - - + +