兼容二级域名，本地缓存更名

common/authorize.js

@@ -48,7 +48,7 @@ export function authorize(url = window.location.href) {
   });
 }
 export function bindCode(code) {
-  if (!uni.getStorageSync("user_account")) {
+  if (!uni.getStorageSync("seller_account")) {
     return;
   }
   OfficialLogin({

common/config.js

@@ -1,7 +1,7 @@
 // test 测试环境
 
 const dev = {
-  BASE_URL: "https://testapi.xyyxt.net",
+  BASE_URL: "http://120.79.166.78:19013",
   BASE_IMG_URL: "https://file-dev.xyyxt.net/",
 };
 

common/tool.js

@@ -2,7 +2,7 @@ import store from "@/store/index.js";
 import config from "@/common/config";
 export default {
   isGoLogin(isBack = true) {
-    if (!uni.getStorageSync("user_account")) {
+    if (!uni.getStorageSync("seller_account")) {
       uni.navigateTo({
         url: "/pages/login/login?isBack=" + 1,
       });
@@ -12,7 +12,7 @@ export default {
     }
   },
   isLogin() {
-    if (uni.getStorageSync("user_account")) {
+    if (uni.getStorageSync("seller_account")) {
       return true;
     } else {
       return false;
@@ -53,7 +53,7 @@ export default {
     return uni.getStorageSync("uuid");
   },
   exit() {
-    uni.removeStorageSync("user_account");
+    uni.removeStorageSync("seller_account");
     uni.removeStorageSync("token");
     store.state.userInfo = null;
     uni.reLaunch({

store/index.js

@@ -17,13 +17,13 @@ const store = new Vuex.Store({
       state.userInfo = userInfo;
     },
     EXIT: (state) => {
-      uni.removeStorageSync("user_account");
-      uni.removeStorageSync("token");
+      uni.removeStorageSync("seller_account");
+      uni.removeStorageSync("seller_token");
       state.userInfo = null;
     },
     LOGIN_CB: (state, data) => {
-      uni.setStorageSync("user_account", data.user_account);
-      uni.setStorageSync("token", data.token);
+      uni.setStorageSync("seller_account", data.user_account);
+      uni.setStorageSync("seller_token", data.token);
     },
   },
   actions: {

unpackage/dist/dev/mp-weixin/app.json

@@ -1,13 +1,25 @@
 {
   "pages": [
-    "pages/index/index"
+    "pages/index/index",
+    "pages/login/login",
+    "pages/login/register",
+    "pages/login/forget",
+    "pages/profile/index",
+    "pages/vcard/index",
+    "pages/actlist/index",
+    "pages/commission/index",
+    "pages/comdetail/index",
+    "pages/cashout/index",
+    "pages/cashout/record",
+    "pages/actdetail/index",
+    "pages/bill/index"
   ],
   "subPackages": [],
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF"
   },
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,20 +9,35 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.30.2",
+  "libVersion": "",
   "appid": "touristappid",
   "projectname": "saas_manager",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "",
+          "path": "",
+          "query": "",
+          "id": 0
+        }
+      ]
+    }
   }
 }

utils/request.js

@@ -19,7 +19,7 @@ export const myRequest = (options) => {
       tenantId = await getTenantId();
       uni.setStorageSync(host, tenantId);
     }
-    let token = uni.getStorageSync("token");
+    let token = uni.getStorageSync("seller_token");
     uni.request({
       url: BASE_URL + options.url,
       method: options.method || "GET",
@@ -29,8 +29,7 @@ export const myRequest = (options) => {
             TenantId: tenantId,
           }
         : {
-            AuthorizationToken:
-              "Bearer " + (token ? token : uni.getStorageSync("token_temp")),
+            AuthorizationToken: "Bearer " + token,
             TenantId: tenantId,
           },
       success: async (res) => {
@@ -40,7 +39,7 @@ export const myRequest = (options) => {
         }
         if (res.data.code == 401) {
           if (num <= 2) {
-            if (!uni.getStorageSync("user_account")) {
+            if (!uni.getStorageSync("seller_account")) {
               var pages = getCurrentPages(); // 获取栈实例
               let currentRoute = pages[pages.length - 1].route; // 获取当前页面路由
               if (currentRoute != "pages/login/login") {
@@ -53,7 +52,7 @@ export const myRequest = (options) => {
               res = await doRequest(options);
             }
           } else {
-            uni.removeStorageSync("user_account");
+            uni.removeStorageSync("seller_account");
             var pages = getCurrentPages(); // 获取栈实例
             let currentRoute = pages[pages.length - 1].route; // 获取当前页面路由
             if (currentRoute != "pages/login/login") {
@@ -86,14 +85,14 @@ export const myRequest = (options) => {
     });
   });
   async function doRequest(response) {
-    let user_account = uni.getStorageSync("user_account");
+    let seller_account = uni.getStorageSync("seller_account");
     try {
       const res = await myRequest({
-        url: "/app/common/seller/refreshToken/" + user_account,
+        url: "/app/common/seller/refreshToken/" + seller_account,
         method: "get",
         noToken: true,
       });
-      uni.setStorageSync("token", res.token);
+      uni.setStorageSync("seller_token", res.token);
       num = 1;
       store.dispatch("getUserInfo");
       myRequest(response);