From 48845dff41c5b4ea6e356db43645a78c65e20392 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Fri, 1 Jul 2022 12:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=B4=A3=E5=A3=B0=E6=98=8E=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=8C=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=AD=89=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes apis/interfaces/account.js | 2 +- apis/interfaces/user.js | 3 +- pages/account/resetPassword.vue | 9 +- pages/life/capacity.vue | 4 +- pages/rank/index.vue | 2 +- pages/user/index.vue | 686 +++++++++++---------- static/.DS_Store | Bin 0 -> 6148 bytes static/rank.zip | Bin 0 -> 41286 bytes static/user/userIcon_13.png | Bin 0 -> 2822 bytes unpackage/dist/dev/app-plus/app-service.js | 163 +++-- unpackage/dist/dev/app-plus/app-view.js | 150 +++-- 12 files changed, 576 insertions(+), 443 deletions(-) create mode 100644 .DS_Store create mode 100644 static/.DS_Store create mode 100644 static/rank.zip create mode 100644 static/user/userIcon_13.png diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..16a8094d525165f800191272fd410bc471eadcc2 GIT binary patch literal 6148 zcmeHK%}T>S5Z-NTn^J@v6nb3nTClCHAYMYPFJMFuDm5`hgE3p0)Er77XMG``#OHBl zcXJ2^youNunEhtwXE*yn_J=XXC#zt_>uH0 z2KtLG{PreGSjs%m^7nuEizrOee*cr#>W!Ud%W7F2>&|_WnVWj)Dw%l88|+<58Tp0n z`B&jQo7sD3GETiPo-b8F7|bE%_BxCMnN8#>4iZ)C>VVa@+B3VmUXKRjo){0uo1R#o z4EsGXIy&BL+SdNT;pxTfIeLlZnzm`$R#8Ohyh}N z7}!1r%voS{wr}aQVq$<8_<;f39|S0(V=&jKwhn0U`i$`gA_~~}mOvB+9fP?>h=6ci z3aCrDd17!~4t`5MxXsU-%8fieSi-L>)jKZjqY z@{wOIp&l_n4E!?&cw_2LC$K1Uwtib4p0xt>9ux)hax_4|E?okkgZoHV1$A7Y4S9~i WTqBNxepL=g7Xd{GHN?O#Fz^M~#Y`js literal 0 HcmV?d00001 diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index 59f8bd2..d76b7c3 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -67,7 +67,7 @@ const setpassword = data => { // 获取验证码 const getSms = data => { return request({ - url: 'user/transaction/setpassword/sms', + url: 'user/transaction/setpassword/smsnew', method: 'POST' }) } diff --git a/apis/interfaces/user.js b/apis/interfaces/user.js index ceef1e4..6ed83d7 100644 --- a/apis/interfaces/user.js +++ b/apis/interfaces/user.js @@ -18,7 +18,8 @@ const info = () =>{ const chainSeed = (data) => { return request({ url: 'chain/safe/seed', - data + data, + method: 'POST' }) } diff --git a/pages/account/resetPassword.vue b/pages/account/resetPassword.vue index 593db7a..b3673fa 100644 --- a/pages/account/resetPassword.vue +++ b/pages/account/resetPassword.vue @@ -51,10 +51,12 @@ let outTime; let smsTime = 60; getSms().then(res => { + console.log(res) uni.showToast({ - title: res, + title: res.message, icon: "none", }); + this.phone = res.mobile this.getCodeState = true; this.sendCode = smsTime + 's后重新获取'; outTime = setInterval(() => { @@ -94,10 +96,11 @@ password: this.password, password_confirmation: this.verify, code: this.code - }).then(res => { + }).then(res => { + console.log(res) uni.showModal({ title: '提示', - content: '支付密码设置成功', + content: res, showCancel:false, success: res=> { uni.navigateBack() diff --git a/pages/life/capacity.vue b/pages/life/capacity.vue index 63a80a7..1c1d446 100644 --- a/pages/life/capacity.vue +++ b/pages/life/capacity.vue @@ -63,9 +63,7 @@ {{item.remark}} - - PS产品设置每100个共力值或共建值可以加速5%的角色产率; - + 用户须知:用户所产生共力分,在每日结算时,平台会扣除30%的共力分用于平台运营使用。 diff --git a/pages/rank/index.vue b/pages/rank/index.vue index 8dfc01a..81b23ca 100644 --- a/pages/rank/index.vue +++ b/pages/rank/index.vue @@ -20,7 +20,7 @@ - 加成{{type === '1'?'有效':'生效'}}倒计时 : + 加成{{type === '1'?' 结束':'生效'}}倒计时 : diff --git a/pages/user/index.vue b/pages/user/index.vue index de50284..2bb8f12 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -5,7 +5,7 @@ + :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill" /> {{ userInfo.nickname }} @@ -24,8 +24,8 @@ - - {{serial === '' ? '共力会员': 'NO:' + serial}} + + {{serial === '' ? '共力会员': 'NO:' + serial}} @@ -43,63 +43,63 @@ DT积分 {{account.dt}} - - - - - + + + + + 我的订单 - - {{order.init}} + + {{order.init}} 待付款 - - {{order.paid}} + + {{order.paid}} 待发货 - - {{order.delivered}} + + {{order.delivered}} 待收货 - - {{order.refund}} + + {{order.refund}} 退换货 - - - - - 共力分钱包 - - - - - DT积分钱包 - - - - - 导出助记词 - - - - - - 平台数据看板 - - - - + + + + + 共力分钱包 + + + + + DT积分钱包 + + + + + 导出助记词 + + + + + + 平台数据看板 + + + + @@ -110,12 +110,17 @@ 分享邀请 - - - - 供应商入驻 - - + + + + 供应商入驻 + + + + + {{hasPassword ? '修改' : '设置'}}支付密码 + + @@ -128,6 +133,11 @@ 版本更新 + + + 免责声明 + + 退出登录 @@ -149,275 +159,297 @@ mode="widthFix"> - - - - - - - - - + + + + + + + + + -