Merge branch 'fanpeng' into 'develop'

fix: 修复手机号登录bug

See merge request StarlockTeam/wx-starlock!33

pages/home/home.vue

@@ -447,17 +447,35 @@
         if (data.detail.errMsg === 'getPhoneNumber:fail user deny') {
           return
         }
-        const result = await this.phoneLogin({
+
-          encryptedData: data.detail.encryptedData,
+        const that = this
-          iv: data.detail.iv
+        uni.showLoading({
+          title: '登录中'
         })
+        uni.login({
+          provider: 'weixin',
+          async success(loginRes) {
+            const result = await that.phoneLogin({
+              encryptedData: data.detail.encryptedData,
+              iv: data.detail.iv,
+              code: loginRes.code
+            })
+            uni.hideLoading()
             if (!result) {
               uni.showToast({
-            title: '登录失败，请重试',
+                title: result.message,
                 icon: 'none'
               })
             }
           },
+          fail() {
+            uni.hideLoading()
+            uni.showToast({
+              title: '登录失败，请重试'
+            })
+          }
+        })
+      },
       async nextPage() {
         if (this.lockList.length < this.lockTotal) {
           const sreach = {

pages/mine/mine.vue

@@ -143,35 +143,37 @@
         if (res.detail.errMsg === 'getPhoneNumber:fail user deny') {
           return
         }
-        const result = await this.checkSession()
+
-        if (!result) {
+        const that = this
-          uni.showToast({
+        uni.showLoading({
-            title: '登录失败，请重试',
+          title: '登录中'
-            icon: 'none'
         })
-          return
+        uni.login({
-        }
+          provider: 'weixin',
+          async success(loginRes) {
             const openid = getStorage('openid')
             const { code, data, message } = await phoneLoginRequest({
               encryptedData: res.detail.encryptedData,
               iv: res.detail.iv,
               rebind: true,
-          openid
+              openid,
+              js_code: loginRes.code
             })
+            uni.hideLoading()
             if (code === 0) {
               removeStorage('userInfo')
               removeStorage('lockList')
               setStorage('token', data.accessToken)
-          this.updateLockSearch({
+              that.updateLockSearch({
-            ...this.lockSearch,
+                ...that.lockSearch,
                 pageNo: 1
               })
-          this.getUserInfo()
+              that.getUserInfo()
-          this.getLockList(this.lockSearch)
+              that.getLockList(that.lockSearch)
-          this.updateNotificationSearch({
+              that.updateNotificationSearch({
                 pageNo: 1
               })
-          this.getNotificationList(this.notificationSearch)
+              that.getNotificationList(that.notificationSearch)
               uni.showToast({
                 title: '账号切换成功',
                 icon: 'none'
@@ -185,21 +187,47 @@
               })
             }
           },
+          fail() {
+            uni.hideLoading()
+            uni.showToast({
+              title: '登录失败，请重试'
+            })
+          }
+        })
+      },
       async getphonenumber(data) {
         if (data.detail.errMsg === 'getPhoneNumber:fail user deny') {
           return
         }
-        const result = await this.phoneLogin({
+
-          encryptedData: data.detail.encryptedData,
+        const that = this
-          iv: data.detail.iv
+        uni.showLoading({
+          title: '登录中'
         })
+        uni.login({
+          provider: 'weixin',
+          async success(loginRes) {
+            const result = await that.phoneLogin({
+              encryptedData: data.detail.encryptedData,
+              iv: data.detail.iv,
+              code: loginRes.code
+            })
+            uni.hideLoading()
             if (!result) {
               uni.showToast({
-            title: '登录失败，请重试',
+                title: result.message,
                 icon: 'none'
               })
             }
           },
+          fail() {
+            uni.hideLoading()
+            uni.showToast({
+              title: '登录失败，请重试'
+            })
+          }
+        })
+      },
       toUsereInfo() {
         this.routeJump({
           name: 'userInfo'

pages/notificationList/notificationList.vue

@@ -157,17 +157,35 @@
         if (data.detail.errMsg === 'getPhoneNumber:fail user deny') {
           return
         }
-        const result = await this.phoneLogin({
+
-          encryptedData: data.detail.encryptedData,
+        const that = this
-          iv: data.detail.iv
+        uni.showLoading({
+          title: '登录中'
         })
+        uni.login({
+          provider: 'weixin',
+          async success(loginRes) {
+            const result = await that.phoneLogin({
+              encryptedData: data.detail.encryptedData,
+              iv: data.detail.iv,
+              code: loginRes.code
+            })
+            uni.hideLoading()
             if (!result) {
               uni.showToast({
-            title: '登录失败，请重试',
+                title: result.message,
                 icon: 'none'
               })
             }
           },
+          fail() {
+            uni.hideLoading()
+            uni.showToast({
+              title: '登录失败，请重试'
+            })
+          }
+        })
+      },
       scroll() {
         this.$refs.swipeItem.forEach(item => {
           if (item.show) {

stores/user.js

@@ -35,12 +35,12 @@ export const useUserStore = defineStore('user', {
       return code
     },
     async phoneLogin(params) {
-      const { iv, encryptedData } = params
+      const { iv, encryptedData, code: js_code } = params
       const openid = await getStorage('openid')
       if (!openid) {
         return false
       }
-      const { code, data } = await phoneLoginRequest({ iv, encryptedData, openid })
+      const { code, data } = await phoneLoginRequest({ iv, encryptedData, openid, js_code })
       if (code === 0) {
         setStorage('token', data.accessToken)
         this.getUserInfo()