From 74139f2bc6bdc8147dd570ac1d774245f67e4f9f Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 01 四月 2024 14:05:45 +0800
Subject: [PATCH] 样式修改
---
assets/js/login.js | 143 +++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/assets/js/login.js b/assets/js/login.js
index 1ddfc12..10e49ae 100644
--- a/assets/js/login.js
+++ b/assets/js/login.js
@@ -4,78 +4,85 @@
export const loginInfo = (app, callback) => {
- 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) {
- const pages = getCurrentPages();
- const currentPage = pages[pages.length - 1];
- let url = `/${currentPage.route}`;
- if (Object.keys(currentPage.options).length) {
- let option = "";
- for (const key in currentPage.options) {
- if (currentPage.options[key]) {
- if (option) {
- option += "&"
+ if (app.config.appId == 27) {
+ wx.navigateTo({
+ url: "/pages/testLogin/index",
+ });
+ } else {
+ 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) {
+ const pages = getCurrentPages();
+ const currentPage = pages[pages.length - 1];
+ let url = `/${currentPage.route}`;
+ if (Object.keys(currentPage.options).length) {
+ let option = "";
+ for (const key in currentPage.options) {
+ if (currentPage.options[key]) {
+ if (option) {
+ option += "&"
+ }
+ option += key + "=" + currentPage.options[key]
}
- option += key + "=" + currentPage.options[key]
}
+ url += "?" + option
}
- url += "?" + option
+ console.log(url);
+ wx.navigateTo({
+ url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
+ });
+ } else {
+ wx.login({
+ success: (res) => {
+ app.MG.identity.loginByWeChatAppCode({
+ code: res.code,
+ appRefCode: app.config.appRefCode,
+ platform: "WeChatAppCustom",
+ encryptedData: infoRes.encryptedData,
+ iv: infoRes.iv
+ }).then(res => {
+ if (res && res.status == "Ok") {
+ // 鍌ㄥ瓨token
+ wx.setStorageSync(app.config.tokenKey, res.token);
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ getUserInfo(app, callback, res.token)
+ // 璁板綍鐧诲綍缁熻
+ setSessionGuid()
+ } else {
+ console.log(res);
+ callback(false)
+ }
+ })
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
}
- console.log(url);
- wx.navigateTo({
- url: "/pages/bindInfo/index?page=" + encodeURIComponent(url),
- });
- } else {
- wx.login({
- success: (res) => {
- app.MG.identity.loginByWeChatAppCode({
- code: res.code,
- appRefCode: app.config.appRefCode,
- platform: "WeChatAppCustom",
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(res => {
- if (res && res.status == "Ok") {
- // 鍌ㄥ瓨token
- wx.setStorageSync(app.config.tokenKey, res.token);
- // 鑾峰彇鐢ㄦ埛淇℃伅
- getUserInfo(app, callback, res.token)
- // 璁板綍鐧诲綍缁熻
- setSessionGuid()
- } else {
- console.log(res);
- callback(false)
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
- },
- fail: (err) => {
- console.log(err);
- callback(false)
- }
- })
+ })
+
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
+ },
+ fail: (err) => {
+ console.log(err);
+ callback(false)
+ }
+ })
+ }
}
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
--
Gitblit v1.9.1