免责声明添加，修改密码功能完善，改文字提示等相关内容调整

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'
 	})
 }

apis/interfaces/user.js

@@ -18,7 +18,8 @@ const info = () =>{
 const chainSeed = (data) => {
 	return request({
 		url: 'chain/safe/seed',
-		data
+		data,
+        method: 'POST'
 	})
 }
 

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(() => {
@@ -95,9 +97,10 @@
 					password_confirmation: this.verify,
 					code: this.code
 				}).then(res => {
+                    console.log(res)
 					uni.showModal({
 						title: '提示',
-						content: '支付密码设置成功',
+						content: res,
 						showCancel:false,
 						success: res=> {
 							uni.navigateBack()

pages/life/capacity.vue

@@ -63,9 +63,7 @@
         	</view>
         	<view class="capacity-block-text " v-if="item.remark">{{item.remark}}</view>
         </view>
-		<view class="capacity-hint">
+		<view class="capacity-hint"> 用户须知：用户所产生共力分，在每日结算时，平台会扣除30%的共力分用于平台运营使用。 </view>
-			PS产品设置每100个共力值或共建值可以加速5%的角色产率；
-		</view>
 	</view>
 </template>
 

pages/rank/index.vue

@@ -20,7 +20,7 @@
         </view>
 
         <view class="rank_update_time" v-if="lists.length > 0">
-            <view class="title"> 加成{{type === '1'?'有效':'生效'}}倒计时 : </view>
+            <view class="title"> 加成{{type === '1'?' 结束':'生效'}}倒计时 : </view>
             <u-count-down :time="end_timestamp" format="DD:HH:mm:ss" autoStart millisecond @change="onChange">
                 <view class="time">
                     <view class="time__item">

pages/user/index.vue

@@ -116,6 +116,11 @@
                 供应商入驻
                 <uni-icons class="forward" type="forward" color="#999" />
             </view>
+            <view class="btns-box-item" @click="resetPassword">
+                <image class="icon" src="@/static/user/userIcon_13.png" mode="widthFix" />
+                {{hasPassword ? '修改' : '设置'}}支付密码
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
         </view>
         <view class="btns-box">
             <view class="btns-box-item" @click="onBtn('Feedback', {})">
@@ -128,6 +133,11 @@
                 版本更新
                 <uni-icons class="forward" type="forward" color="#999" />
             </view>
+            <view class="btns-box-item" @click="mianze">
+                <image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix" />
+                免责声明
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
             <view class="btns-box-item" @click="logOut" v-if="$store.state.token != ''">
                 <image class="icon" src="@/static/user/userIcon_05.png" mode="widthFix" />
                 退出登录
@@ -256,7 +266,12 @@
                         confirmText: '立即设置',
                         success: modalRes => {
                             if (modalRes.confirm) {
-								this.$Router.push({name: 'AccountResetPassword', params: {phone: this.userInfo.username}})
+                                this.$Router.push({
+                                    name: 'AccountResetPassword',
+                                    params: {
+                                        phone: this.userInfo.username
+                                    }
+                                })
                                 return
                             }
                             this.showIv = false
@@ -267,14 +282,23 @@
                 this.showIv = true
 
             },
+            resetPassword(){
+                this.$Router.push({
+                    name: 'AccountResetPassword',
+                    params: {
+                        phone: this.userInfo.username
+                    }
+                })
+            },
             // 验证支付密码
             validationIv() {
                 chainSeed({
-					password: this.iv
+                    transfer_password: this.iv
                 }).then(res => {
                     this.mnemonic = res.seed
                     this.showIv = false
                     this.wordsShow = true
+                    this.iv = ''
                 }).catch(err => {
                     uni.showToast({
                         title: err.message,
@@ -282,6 +306,11 @@
                     })
                 })
             },
+            mianze() {
+                uni.navigateTo({
+                    url: 'pages/vip/agreement?id=7'
+                })
+            },
             // 按钮导航
             onBtn(name, params) {
                 this.$Router.push({
@@ -294,7 +323,9 @@
                 uni.removeStorageSync('isnew')
                 // uni.removeStorageSync('isWalleNum')
                 this.$store.commit('setToken', '');
-				this.$Router.replaceAll({name: 'Auth'})
+                this.$Router.replaceAll({
+                    name: 'Auth'
+                })
             },
             // 复制
             copy(data) {
@@ -418,6 +449,7 @@
         height: 0px;
         overflow: hidden;
     }
+
     .content {
         background: $window-color;
         min-height: 100vh;

unpackage/dist/dev/app-plus/app-view.js

@@ -4071,19 +4071,12 @@ var render = function() {
               })
             ],
             1
-          )
-        ],
-        1
           ),
-      _c(
-        "v-uni-view",
-        { staticClass: _vm._$g(71, "sc"), attrs: { _i: 71 } },
-        [
           _c(
             "v-uni-view",
             {
-              staticClass: _vm._$g(72, "sc"),
+              staticClass: _vm._$g(71, "sc"),
-              attrs: { _i: 72 },
+              attrs: { _i: 71 },
               on: {
                 click: function($event) {
                   return _vm.$handleViewEvent($event)
@@ -4092,21 +4085,28 @@ var render = function() {
             },
             [
               _c("v-uni-image", {
-                staticClass: _vm._$g(73, "sc"),
+                staticClass: _vm._$g(72, "sc"),
                 attrs: {
-                  src: "/static/user/userIcon_06.png",
+                  src: "/static/user/userIcon_13.png",
                   mode: "widthFix",
-                  _i: 73
+                  _i: 72
                 }
               }),
-              _vm._v("意见反馈"),
+              _vm._v(_vm._$g(71, "t1-0") + "支付密码"),
               _c("uni-icons", {
-                staticClass: _vm._$g(74, "sc"),
+                staticClass: _vm._$g(73, "sc"),
-                attrs: { _i: 74 }
+                attrs: { _i: 73 }
               })
             ],
             1
+          )
+        ],
+        1
       ),
+      _c(
+        "v-uni-view",
+        { staticClass: _vm._$g(74, "sc"), attrs: { _i: 74 } },
+        [
           _c(
             "v-uni-view",
             {
@@ -4122,12 +4122,12 @@ var render = function() {
               _c("v-uni-image", {
                 staticClass: _vm._$g(76, "sc"),
                 attrs: {
-                  src: "/static/user/userIcon_08.png",
+                  src: "/static/user/userIcon_06.png",
                   mode: "widthFix",
                   _i: 76
                 }
               }),
-              _vm._v("版本更新"),
+              _vm._v("意见反馈"),
               _c("uni-icons", {
                 staticClass: _vm._$g(77, "sc"),
                 attrs: { _i: 77 }
@@ -4135,8 +4135,7 @@ var render = function() {
             ],
             1
           ),
-          _vm._$g(78, "i")
+          _c(
-            ? _c(
             "v-uni-view",
             {
               staticClass: _vm._$g(78, "sc"),
@@ -4151,18 +4150,75 @@ var render = function() {
               _c("v-uni-image", {
                 staticClass: _vm._$g(79, "sc"),
                 attrs: {
-                      src: "/static/user/userIcon_05.png",
+                  src: "/static/user/userIcon_08.png",
                   mode: "widthFix",
                   _i: 79
                 }
               }),
-                  _vm._v("退出登录"),
+              _vm._v("版本更新"),
               _c("uni-icons", {
                 staticClass: _vm._$g(80, "sc"),
                 attrs: { _i: 80 }
               })
             ],
             1
+          ),
+          _c(
+            "v-uni-view",
+            {
+              staticClass: _vm._$g(81, "sc"),
+              attrs: { _i: 81 },
+              on: {
+                click: function($event) {
+                  return _vm.$handleViewEvent($event)
+                }
+              }
+            },
+            [
+              _c("v-uni-image", {
+                staticClass: _vm._$g(82, "sc"),
+                attrs: {
+                  src: "/static/user/userIcon_02.png",
+                  mode: "widthFix",
+                  _i: 82
+                }
+              }),
+              _vm._v("免责声明"),
+              _c("uni-icons", {
+                staticClass: _vm._$g(83, "sc"),
+                attrs: { _i: 83 }
+              })
+            ],
+            1
+          ),
+          _vm._$g(84, "i")
+            ? _c(
+                "v-uni-view",
+                {
+                  staticClass: _vm._$g(84, "sc"),
+                  attrs: { _i: 84 },
+                  on: {
+                    click: function($event) {
+                      return _vm.$handleViewEvent($event)
+                    }
+                  }
+                },
+                [
+                  _c("v-uni-image", {
+                    staticClass: _vm._$g(85, "sc"),
+                    attrs: {
+                      src: "/static/user/userIcon_05.png",
+                      mode: "widthFix",
+                      _i: 85
+                    }
+                  }),
+                  _vm._v("退出登录"),
+                  _c("uni-icons", {
+                    staticClass: _vm._$g(86, "sc"),
+                    attrs: { _i: 86 }
+                  })
+                ],
+                1
               )
             : _vm._e()
         ],
@@ -4170,10 +4226,10 @@ var render = function() {
       ),
       _c(
         "v-uni-view",
-        { staticClass: _vm._$g(81, "sc"), attrs: { _i: 81 } },
+        { staticClass: _vm._$g(87, "sc"), attrs: { _i: 87 } },
         [
-          _c("v-uni-view", { attrs: { _i: 82 } }, [_vm._v("共力生态")]),
+          _c("v-uni-view", { attrs: { _i: 88 } }, [_vm._v("共力生态")]),
-          _c("v-uni-view", { attrs: { _i: 83 } }, [
+          _c("v-uni-view", { attrs: { _i: 89 } }, [
             _vm._v("The total force ecological")
           ])
         ],
@@ -4182,7 +4238,7 @@ var render = function() {
       _c(
         "u-modal",
         {
-          attrs: { _i: 84 },
+          attrs: { _i: 90 },
           on: {
             confirm: function($event) {
               return _vm.$handleViewEvent($event)
@@ -4195,16 +4251,16 @@ var render = function() {
             [
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(86, "sc"), attrs: { _i: 86 } },
+                { staticClass: _vm._$g(92, "sc"), attrs: { _i: 92 } },
                 [
                   _c(
                     "v-uni-view",
-                    { staticClass: _vm._$g(87, "sc"), attrs: { _i: 87 } },
+                    { staticClass: _vm._$g(93, "sc"), attrs: { _i: 93 } },
                     [_vm._v("导出助记词")]
                   ),
                   _c(
                     "v-uni-view",
-                    { staticClass: _vm._$g(88, "sc"), attrs: { _i: 88 } },
+                    { staticClass: _vm._$g(94, "sc"), attrs: { _i: 94 } },
                     [
                       _vm._v(
                         "请务必抄下助记词并存在安全的地方，若助记词丢失，重装或换设备登录时将无法查看历史消息！若助记词被他人获取，将可能获取你的信息！"
@@ -4213,15 +4269,15 @@ var render = function() {
                   ),
                   _c(
                     "v-uni-view",
-                    { staticClass: _vm._$g(89, "sc"), attrs: { _i: 89 } },
+                    { staticClass: _vm._$g(95, "sc"), attrs: { _i: 95 } },
-                    [_vm._v(_vm._$g(89, "t0-0"))]
+                    [_vm._v(_vm._$g(95, "t0-0"))]
                   ),
                   _c("v-uni-image", {
-                    staticClass: _vm._$g(90, "sc"),
+                    staticClass: _vm._$g(96, "sc"),
                     attrs: {
                       src: "/static/icon/userCloes.png",
                       mode: "widthFix",
-                      _i: 90
+                      _i: 96
                     },
                     on: {
                       click: function($event) {
@@ -4233,7 +4289,7 @@ var render = function() {
                 1
               )
             ],
-            { _i: 85 }
+            { _i: 91 }
           )
         ],
         2
@@ -4241,7 +4297,7 @@ var render = function() {
       _c(
         "u-modal",
         {
-          attrs: { _i: 91 },
+          attrs: { _i: 97 },
           on: {
             confirm: function($event) {
               return _vm.$handleViewEvent($event)
@@ -4257,22 +4313,22 @@ var render = function() {
             [
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(93, "sc"), attrs: { _i: 93 } },
+                { staticClass: _vm._$g(99, "sc"), attrs: { _i: 99 } },
                 [
                   _c("v-uni-input", {
-                    staticClass: _vm._$g(94, "sc"),
+                    staticClass: _vm._$g(100, "sc"),
                     attrs: {
                       focus: true,
                       type: "number",
                       password: true,
                       maxlength: "10",
                       placeholder: "输入支付密码",
-                      _i: 94
+                      _i: 100
                     },
                     model: {
-                      value: _vm._$g(94, "v-model"),
+                      value: _vm._$g(100, "v-model"),
                       callback: function($$v) {
-                        _vm.$handleVModelEvent(94, $$v)
+                        _vm.$handleVModelEvent(100, $$v)
                       },
                       expression: "iv"
                     }
@@ -4281,7 +4337,7 @@ var render = function() {
                 1
               )
             ],
-            { _i: 92 }
+            { _i: 98 }
           )
         ],
         2
@@ -24246,7 +24302,9 @@ var render = function() {
         )
       }),
       _c("v-uni-view", { staticClass: _vm._$g(48, "sc"), attrs: { _i: 48 } }, [
-        _vm._v("PS产品设置每100个共力值或共建值可以加速5%的角色产率；")
+        _vm._v(
+          "用户须知：用户所产生共力分，在每日结算时，平台会扣除30%的共力分用于平台运营使用。"
+        )
       ])
     ],
     2