From 8fbd6b8d09e70494d920cc0b77812e9643be3196 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 23 八月 2022 17:37:31 +0800
Subject: [PATCH] 2022.8.23

---
 pages/module_user/userlogin/userlogin.js |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/pages/module_user/userlogin/userlogin.js b/pages/module_user/userlogin/userlogin.js
index f3b05bc..dd378ee 100644
--- a/pages/module_user/userlogin/userlogin.js
+++ b/pages/module_user/userlogin/userlogin.js
@@ -23,7 +23,7 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
   onReady: function () {
-
+    // this.login()
   },
 
   /**
@@ -39,18 +39,42 @@
       lang: 'zh_CN',
       desc: '鐢ㄤ簬鏄剧ず锛屾彁绀虹敤鎴峰綋鍓嶅凡鐧诲綍',
       success(res) {
-        //鑾峰彇缂撳瓨鐨勭敤鎴疯处鎴峰瘑鐮�
+        console.log(res);
+        // wx.login({
+        //   timeout: 10000,
+        //   success: (result) => {
+        //     console.log(result);
+        //   },
+        //   fail: (res) => {},
+        //   complete: (res) => {},
+        // })
+
+        that.login()
+      }
+    })
+  },
+
+  login() {
+    //鑾峰彇缂撳瓨鐨勭敤鎴疯处鎴峰瘑鐮�
+    var that = this
     wx.getStorage({
       key: 'accessToken',
-      success(res) {
+      success(res) { //鑾峰彇鎴愬姛鑷姩鐧诲綍
         app.globalData.accessToken = res.data
         that.setData({
           userName: res.data.userName,
           password: res.data.password
         })
 
+        wx.showLoading({
+          title: '鐧诲綍涓�',
+          mask: true,
+        })
+        setTimeout(() => {
+          wx.hideLoading()
+        }, 10000);
         userservice.login(that.data.userName, that.data.password, {
-          success (data) {
+          success(data) {
             if (data.success) {
               app.globalData.accessToken = {
                 userName: that.data.userName,
@@ -71,20 +95,27 @@
               })
             }
           },
-          complete () {
+          complete() {
             that.setData({
               loading: false
             })
+            wx.hideLoading()
           }
         })
       },
-    })
+      fail(e) { //鑾峰彇澶辫触
+        //鍚庡彴鏌ヨ寰俊鏄惁缁戝畾璐﹀彿锛屾湭缁戝畾鍒欒烦杞敞鍐岀晫闈�
+        wx.navigateTo({
+          url: '/pages/module_user/userregistercompany/userregistercompany',
+          success: (result) => {},
+          fail: (res) => {},
+          complete: (res) => {},
+        })
       }
     })
   },
 
   getUserInfo() {
-    var that = this
     userservice.getUserInfo(app.globalData.accessToken.userId, {
       success(data) {
         app.globalData.userInfo = data

--
Gitblit v1.9.3