From 1c64c10f8dd88018c0d30de79237f3128173f118 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 26 三月 2024 17:36:51 +0800
Subject: [PATCH] 调整登录
---
pages/home/home.js | 69 ++++++----------------------------
1 files changed, 13 insertions(+), 56 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 298b193..0a15970 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 { setSessionGuid } from "../../assets/js/userAction"
+import { checkLoginInfo } from '../../assets/js/login';
const app = getApp()
Page({
data: {
@@ -11,6 +11,7 @@
backUrl: null,
userInfo: {},
tabList: [], //鐩綍
+ current: 1,//杞挱鍥惧弬鏁�
autoplay: true, //杞挱鍥惧弬鏁�
duration: '500',//杞挱鍥惧弬鏁�
interval: 5000,//杞挱鍥惧弬鏁�
@@ -28,12 +29,13 @@
rankingList: [],//鎺掕姒�
shoppingCartGetId: [],
baseRefresh: {
- value: true
+ value: false
}
},
onShow() {
this.loadHomePage();
this.getBannerList()
+
},
onLoad(options) {
@@ -56,14 +58,20 @@
backUrl: backUrl.backUrl
})
}
- this.getTestLoginInfo()
+
+ // checkLoginInfo(app, (data) => {
+ // if (data) {
+ // this.getCurrentUserInfo();
+ // }
+ // })
+
this.init();
},
onReachBottom() {
},
onPullDownRefresh() {
this.setData({
- isWhite: true
+ 'baseRefresh.value': true,
})
this.init();
},
@@ -77,59 +85,9 @@
setTimeout(() => {
this.setData({
- baseRefresh: {
- value: false,
- },
- isWhite: false,
+ 'baseRefresh.value': false,
})
}, 500);
- },
- // 鑾峰彇娴嬭瘯鐧诲綍鏃剁殑token
- getTestLoginInfo() {
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- wx.login({
- success: (res) => {
- wx.getUserInfo({
- success: (infoRes) => {
- app.MG.identity.checkWeChatAppAccount({
- code: res.code,
- appCode: app.config.appRefCode,
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(loginRes => {
- if (!loginRes) {
- // wx.navigateTo({
- // url: "/pages/index/bindInfo/index?code=" + res.code,
- // });
- } else {
- wx.login({
- success: (res) => {
- app.MG.identity.loginByWeChatAppCode({
- code: res.code,
- appRefCode: app.config.appRefCode,
- platform: "weChatApp",
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(res => {
- if (res && res.status == "Ok") {
- wx.setStorageSync(app.config.tokenKey, res.token);
- setSessionGuid()
- this.getCurrentUserInfo()
- }
- })
- },
- })
- }
- })
- }
- })
-
- },
- })
- } else {
- this.getShoppingCartList();
- }
},
getCurrentUserInfo() {
@@ -164,7 +122,6 @@
url: '/pages/home/home'
})
}
-
});
},
getBannerList() {
--
Gitblit v1.9.1