From 8d60f69402813488545502941785bf2d951e45bb Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 28 十月 2024 17:12:33 +0800
Subject: [PATCH] login

---
 assets/request/index.js |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/assets/request/index.js b/assets/request/index.js
index 5c0c389..d20f265 100644
--- a/assets/request/index.js
+++ b/assets/request/index.js
@@ -1,6 +1,11 @@
 import config from "../js/config"
+import {
+  loginInfo
+} from '../js/login';
+const app = getApp()
 let clearStorage = false;
 let timer = null;
+let backUrl = null
 const request = (params) => {
   let fullUrl = `${config.requestCtx}${params.url}`
   let token = wx.getStorageSync(config.tokenKey) ? wx.getStorageSync(config.tokenKey) : ''
@@ -22,7 +27,7 @@
           const url = currentPage.route
           let options = currentPage.options
           let urlargs = `/${url}?`
-          wx.clearStorageSync();
+          // wx.clearStorageSync();
           if (!clearStorage) {
             clearStorage = true;
             if (!timer) {
@@ -31,16 +36,39 @@
               }, 4000);
             }
             // urlargs = JSON.stringify(urlargs)
+            console.log()
             let strOpt = JSON.stringify(options)
             let currentUrl = {
               options: options,
               backUrl: urlargs
             }
-            currentUrl = JSON.stringify(currentUrl)
+            // currentUrl = JSON.stringify(currentUrl)
             // 涓嶅幓棣栭〉鐧诲綍锛岀洿鎺ヨ皟鐢ㄥ叕鍏辩櫥褰曟柟娉�
             // wx.reLaunch({
             //   url: urlargs ? '/pages/home/home?backUrl=' + encodeURIComponent(currentUrl) : '/pages/home/home'
             // })
+            console.log(currentUrl, 123)
+            loginInfo(app, (data) => {
+              if (data) {
+                if (currentUrl.options) {
+                  for (let key in options) {
+                    const value = currentUrl.options[key]
+                    currentUrl.backUrl += `${key}=${value}&`
+                  }
+                  backUrl = currentUrl.backUrl
+                  console.log(backUrl, "url")
+                  if (backUrl) {
+                    wx.reLaunch({
+                      url: backUrl
+                    })
+                  } else {
+                    wx.reLaunch({
+                      url: '/pages/home/home'
+                    })
+                  }
+                }
+              } else {}
+            })
           }
         } else {
           wx.showToast({

--
Gitblit v1.9.1