diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..16a8094
Binary files /dev/null and b/.DS_Store differ
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">
-
-
- { this.showIv = false, this.iv = '' }">
-
-
-
-
-
-
+
+
+ { this.showIv = false, this.iv = '' }">
+
+
+
+
+
+
-