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/manifest.json b/manifest.json
index 5c35465..ff72b2a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "共力生态",
"appid" : "__UNI__DE7B0E6",
"description" : "共力生态",
- "versionName" : "1.0.33",
+ "versionName" : "1.0.34",
"versionCode" : 100,
"transformPx" : false,
/* 5+App特有相关 */
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 010c144..81b23ca 100644
--- a/pages/rank/index.vue
+++ b/pages/rank/index.vue
@@ -20,7 +20,7 @@
- 加成{{type === '1'?'有效':'生效'}}倒计时 :
+ 加成{{type === '1'?' 结束':'生效'}}倒计时 :
@@ -98,8 +98,10 @@
this.timeData = e
},
changeType(type) {
- if (this.type !== type) {
- this.type = type;
+ if (this.type !== type) {
+ this.lists = [];
+ this.type = type;
+ uni.showLoading({})
this.getList();
}
},
@@ -117,10 +119,10 @@
urlRequest = week
}
urlRequest().then(res => {
- this.lists = [];
this.lists = res.rand;
this.page_id = res.page_id;
- this.end_timestamp = res.end_timestamp * 1000;
+ this.end_timestamp = res.end_timestamp * 1000;
+ uni.hideLoading()
}).catch(err => {
uni.showToast({
title: err.message,
@@ -306,7 +308,7 @@
align-items: center;
justify-content: space-between;
box-sizing: border-box;
- border-bottom: solid 1rpx #bdc6d7;
+ border-bottom: solid 1rpx #f9f9f9;
padding: 30rpx 20rpx 30rpx 0;
margin-left: 30rpx;
@@ -328,7 +330,8 @@
.nickname {
font-size: 30rpx;
color: #333;
- max-width: 200rpx;
+ max-width: 200rpx;
+ font-weight: bold;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
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">
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-