拉取代码

app.json

@@ -16,9 +16,7 @@
     "pages/qrCode/index",
     "pages/recharge/index",
     "pages/questions/index",
-    "pages/editInvoice/index",
     "pages/rechargeDetail/index",
-
     "pages/updateInvoice/index",
     "pages/rechargeWay/index"
   ],

pages/editInvoice/index.js

@@ -1,66 +0,0 @@
-// pages/editInvoice/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/editInvoice/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/editInvoice/index.wxml-->
-<text>pages/editInvoice/index.wxml</text>

pages/login/index.js

@@ -41,10 +41,9 @@ Page({
     //   })
     //   return
     // }
-    // wx.switchTab({
+    wx.redirectTo({
-    //   url: '/pages/home/index',
+      url: '/pages/login/index',
-    // })
+    })
-   
   },
   async getPrivacy() {
     const { code, message, data } = await getPrivaciList()
@@ -90,6 +89,7 @@ Page({
   },
   getPhoneNumber(e) {
     const { errno, code: phoneCode } = e.detail;
+    console.log('e', e)
     switch(errno) {
       case 103:
         alertInfo("已拒绝");

project.config.json

@@ -6,11 +6,10 @@
     "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
-    "ignoreDevUnusedFiles": false,
     "minified": true,
     "newFeature": false,
     "coverView": true,
-    "nodeModules": false,
+    "nodeModules": true,
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
@@ -19,14 +18,19 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
     "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": true,
     "packNpmRelationList": [
@@ -35,14 +39,8 @@
         "miniprogramNpmDistDir": "./"
       }
     ],
-    "minifyWXSS": true,
+    "minifyWXSS": true
-    "showES6CompileOption": false,
-    "condition": false,
-    "compileWorklet": false,
-    "ignoreUploadUnusedFiles": false,
-    "useIsolateContext": true
   },
-  "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
@@ -51,5 +49,7 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxb34b4e70f8a5c6f1"
+  "appid": "wxb34b4e70f8a5c6f1",
+  "projectname": "elec",
+  "condition": {}
 }

utils/index.js

@@ -238,4 +238,12 @@ export const getPixelRatio = () => {
 
 export function isValidPhoneNumber(phoneNumber) {
   return /^1\d{10}$/.test(phoneNumber);
+}
+
+/** 获取当前页面url */
+export function getPageUrl() {
+  const pages = getCurrentPages()    //获取加载的页面
+  const currentPage = pages[pages.length-1]    //获取当前页面的对象
+  const url = currentPage.route    //当前页面url
+  return url
 }

utils/request.js

@@ -86,9 +86,12 @@ const parseResponse = function (response, url) {
   const { code } = response?.data || {};
   console.log('url', url,'code', code,  'response.data', response.data)
   if (code === 401) {
-    wx.redirectTo({
+    const currentUrl = getPageUrl()
-      url: '/pages/login/index',
+    if (!['pages/home/index', 'pages/login/index'].includes(currentUrl)) {
-    })
+      wx.redirectTo({
+        url: '/pages/login/index',
+      })
+    }
     wx.clearStorageSync()
     return { code: 401, message: '未登录状态' }
   }