From e4f61bb43673d0934b549fc865f228188aa03528 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期三, 27 三月 2024 15:59:30 +0800
Subject: [PATCH] 调整登录

---
 pages/home/home.js |   70 ++++++++--------------------------
 1 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index a066913..7b75da0 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,6 +1,6 @@
 import { fetchHome } from '../../services/home/home';
 import moment from 'moment'
-import { checkLoginInfo } from '../../assets/js/login';
+import { loginInfo } from '../../assets/js/login';
 const app = getApp()
 Page({
   data: {
@@ -8,7 +8,6 @@
     navBarHeight: '',
     searchVal: '',
     isWhite: false,
-    backUrl: null,
     userInfo: {},
     tabList: [], //鐩綍
     current: 1,//杞挱鍥惧弬鏁�
@@ -39,7 +38,7 @@
 
   },
 
-  onLoad(options) {
+  onLoad() {
     const systInfo = wx.getSystemInfoSync();
     const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
     const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -47,24 +46,22 @@
       barHeight: systInfo.statusBarHeight,
       navBarHeight: navBarHeight,
     });
-    if (options.backUrl) {
-      let backUrl = JSON.parse(decodeURIComponent(options.backUrl));
-      if (backUrl.options) {
-        for (let key in backUrl.options) {
-          const value = backUrl.options[key]
-          backUrl.backUrl += `${key}=${value}&`
-        }
-      }
-      this.setData({
-        backUrl: backUrl.backUrl
-      })
-    }
 
-    // checkLoginInfo(app, (data) => {
-    //   if (data) {
-    //     this.getCurrentUserInfo();
-    //   }
-    // })
+    // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+    // 妫�鏌ョ櫥褰曠姸鎬�
+    const token = wx.getStorageSync(app.config.tokenKey)
+    if (!token) {
+      loginInfo(app, (data) => {
+        // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+        if (data) {
+          // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+        } else {
+          // 鍑虹幇閿欒锛岃繑鍥瀎alse
+        }
+      })
+    } else {
+      // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+    }
 
     this.init();
   },
@@ -91,39 +88,6 @@
     }, 500);
   },
 
-  getCurrentUserInfo() {
-    app.MG.identity.getCurrentAppUser().then(res => {
-      // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
-      if (res) {
-        let defaultUser = {};
-        let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
-        let phoneNumber = res.secretList.find(i => i.type == 'MobilePhone')
-        if (WeChatInfo) {
-          defaultUser = {
-            nickName: WeChatInfo.name,
-            avatarUrl: WeChatInfo.icon,
-            weChatId: WeChatInfo.id
-          }
-        }
-        if (phoneNumber) {
-          defaultUser.phoneNumber = phoneNumber.credential
-        }
-        this.setData({
-          userInfo: defaultUser,
-        })
-        wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
-      }
-      if (this.data.backUrl) {
-        wx.navigateTo({
-          url: this.data.backUrl,
-        })
-      } else {
-        wx.switchTab({
-          url: '/pages/home/home'
-        })
-      }
-    });
-  },
   getBannerList() {
     const list = []
     app.MG.resource.getItem({

--
Gitblit v1.9.1