修改密码的问题

hdApp/src/pagesPurchase/setPsd.vue

@@ -29,8 +29,9 @@
 </template>
 
 <script>
-import keyboardModule from './components/keyboard'
-import { adminSetPayPassword } from '@/api/admin/index'
+import keyboardModule from './components/keyboard';
+import { postWxCode } from '@/api/mini';
+import { adminSetPayPassword } from '@/api/admin/index';
 export default {
   components: {
     keyboardModule,
@@ -73,23 +74,9 @@ export default {
       console.log(this.keyContent.length)
       if (this.keyContent.length === 6) {
         adminSetPayPassword({ password: this.keyContent }).then(psdRes => {
-          uni.login({
-            provider: 'weixin',
-            success: res => {
-              postWxCode({ code: res.code }).then(subRes => {
-                this.$store.commit('setLoginInfo', {
-                  ...subRes.data.admin,
-                  ...subRes.data
-                })
-              })
-              this.$msg(psdRes.msg)
-              uni.navigateBack({})
-            },
-            fail:err=>{
-              reject(err)
-            }
-          })
-          
+          this.$store.commit('setPassWord', psdRes.data.payPassword)
+          this.$msg(psdRes.msg)
+          uni.navigateBack({})
         }).catch(err => { 
           this.$msg(err.msg)
           uni.navigateBack({}) 

hdApp/src/pagesPurchase/wechatPay.vue

@@ -50,14 +50,6 @@
       :type="_type"
       @closeKey="closeKeyFn"
     />
-    <!-- 弹窗 - 未设置支付密码 -->
-    <alert-module
-      :show="setPassModal"
-      btnText="设置"
-      btnColor="#FF2842"
-      padding="66rpx 24rpx 66rpx 24rpx"
-      @click="hideAlert"
-    >
       <div class="go-login-module">
         <div>请先设置支付密码！</div>
       </div>
@@ -68,14 +60,12 @@
 <script>
 import { purchaseClearCreateOrder, purchaseClearWxPay, purchaseBalancePay, purchaseDebtPay, purchaseWxPay } from "@/api/purchase/index";
 import keyboardModule from './components/keyboard'
-import AlertModule from "@/components/plugin/alert";
 import { mapGetters } from "vuex";
 import wexinPay from "@/utils/pay/wxPay";
 export default {
   name: "callback",
   components: {
-    keyboardModule,
-    AlertModule
+    keyboardModule
   },
   data () {
     return {
@@ -88,7 +78,6 @@ export default {
       psdKey: '',
       orderSn: '',
       actPrice: '',
-      setPassModal: false,
       _type: '1'
     };
   },
@@ -150,20 +139,26 @@ export default {
       this.$msg("支付失败!");
     },
     _balancePay () {
-      console.log(this.getLoginInfo, this.getDictionariesInfo)
+      console.log('this.getLoginInfo===>', this.getLoginInfo, this.getDictionariesInfo)
       if (this.getLoginInfo.payPassword) {
         this.keyShow = true
       } else {
-        this.setPassModal = true
+        uni.showModal({
+          title: '',
+          content: '即将前往设置密码页面',
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              uni.navigateTo({
+                url: '/pagesPurchase/setPsd'
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消');
+            }
+          }
+        });
       }
     },
-    // 设置支付密码
-    hideAlert () {
-      this.setPassModal = false
-      uni.navigateTo({
-        url: '/pagesPurchase/setPsd'
-      })
-    },
     // 点击数字键盘
     clickKeyFn (val) {
       this.psdKey = val

hdApp/src/store/modules/login.js

@@ -18,6 +18,9 @@ export default {
 	mutations: {
 		setLoginInfo(state, payload) {
 			state.loginInfo = payload
+    },
+    setPassWord(state, payload) {
+			state.loginInfo.payPassword = payload
 		},
 		setDictionariesInfo(state, payload) {
 			console.log('payload',payload)