From 2c08a98f7e85ec7c9376f27a7933e75e44d672f7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 27 八月 2024 15:52:59 +0800
Subject: [PATCH] ll

---
 wechat_staff/pages/login/index.js |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/wechat_staff/pages/login/index.js b/wechat_staff/pages/login/index.js
index 98dbf50..d7b0acd 100644
--- a/wechat_staff/pages/login/index.js
+++ b/wechat_staff/pages/login/index.js
@@ -56,6 +56,9 @@
       }, 1000)
     })
   },
+  onShow(){
+    wx.hideHomeButton()
+  },
   handleJudge(e) {
     const flag = e.currentTarget.dataset.flag
     console.log(e);
@@ -116,6 +119,7 @@
       }else{
         wx.showToast({
           title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+          icon: 'none'
         })
       }
     })
@@ -154,6 +158,7 @@
             that.setData({openid:res.data.openid})
             if (res && res.data !=null && res.data.token!=null) { 
               console.log(res)
+              wx.hideLoading()
               wx.setStorageSync('member', res.data.users || '')
               wx.setStorageSync('token', res.data.token || '')
               wx.switchTab({
@@ -162,13 +167,15 @@
             } 
           })
         } else {
-          wx.navigateTo({
+          wx.reLaunch({
             url: '/pages/login/index',
           })
+          wx.hideLoading()
           console.log('鐧诲綍澶辫触锛�' + res)
         }
       },
       fail(err) {
+        wx.hideLoading()
         console.log(err)
       }
     })
@@ -180,17 +187,10 @@
     getWxMiniPhone({
       encryptedData: data.encryptedData,
       iv: data.iv,
+      openid:this.data.openid,
       sessionKey: wx.getStorageSync('sessionKey'),
     }).then(res => {
-      if (res.data && res.data.token) {
-        wx.login({
-          timeout: 5000,
-          success: (loginRes) =>  {
-            if (loginRes.code) {
-              this.bindingOpenid(loginRes.code, res.data.token)
-            }
-          }
-        })
+      if (res.data && res.data.token) { 
         if(res.data.phone){
           res.data.users.phone = res.data.phone || res.data.users.phone
         }
@@ -202,6 +202,7 @@
       }else{
         wx.showToast({
           title: '浣犺繕涓嶆槸璇ョ郴缁熺敤鎴凤紝璇疯仈绯荤浉鍏崇鐞嗗憳娉ㄥ唽',
+          icon: 'none'
         })
       }
 
@@ -262,13 +263,6 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
   onReady() {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
-   */
-  onShow() {
 
   },
 

--
Gitblit v1.9.3