Merge branch 'master' of http://git.huaml.com/zhh/front-end

hdApp/src/pagesPurchase/setPsd.vue

@@ -72,9 +72,24 @@ export default {
     changePsd () {
       console.log(this.keyContent.length)
       if (this.keyContent.length === 6) {
-        adminSetPayPassword({ password: this.keyContent }).then(res => {
-          this.$msg(res.msg)
-          uni.navigateBack({})
+        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)
+            }
+          })
+          
         }).catch(err => { 
           this.$msg(err.msg)
           uni.navigateBack({})