From a69aee6376d5564b68439a5e51c3177f1d6f88af Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sat, 19 Jun 2021 17:08:51 +0800
Subject: [PATCH] 修复升级后 Tools 在 h5 模式下 rem 转 px 函数报错的问题

---
 bases/Fetcher.js |   86 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index f227744..5dce631 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -18,7 +18,11 @@
         this._data = {
             urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
         };
-        this._defaultConfig.url = Fetcher.host;
+        if (project.host.mock === 'on') {
+            this._defaultConfig.url = Fetcher.host + project.host.assetsPath.replace('/assets', '/mocks');
+        } else {
+            this._defaultConfig.url = Fetcher.host;
+        }
     }
 
     /**
@@ -45,13 +49,24 @@
      */
     spellURL(devSuffix, serSuffix) {
         let url = '';
-        // 开发环境地址
-        if (Fetcher.inDevMod) {
-            url = this._data.urlPrefix[0] + devSuffix;
+        // mock 模式
+        if (project.host.mock === 'on') {
+            url = this._data.urlPrefix[0].replace('api/', '') + devSuffix + '.json';
         }
-        // 生产环境地址
-        else {
+        // 强制实际请求模式
+        else if (project.host.mock === 'real') {
             url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+        }
+        // 正常模式
+        else {
+            // 开发环境地址
+            if (Fetcher.inDevMod) {
+                url = this._data.urlPrefix[0] + devSuffix;
+            }
+            // 生产环境地址
+            else {
+                url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
+            }
         }
         const fixReg = /[a-zA-Z0-9]+\/\.\.\//;
         while (url.indexOf('../') >= 0) {
@@ -88,6 +103,9 @@
      * @return {Promise<any>}
      */
     post(url, data, remap = [], options = null) {
+        if (project.host.mock === 'on') {
+            return this.get(url, data, remap = [], options);
+        }
         const params = Qs.stringify(data);
         const data2 = {};
         params.split('&').forEach(param => {
@@ -110,12 +128,22 @@
      */
     query(type, url, data = null, remap, options = {}) {
         return new Promise((resolve, reject) => {
+            const header = {
+                ...this._defaultConfig.header,
+            };
+            if (process.env.TARO_ENV === 'weapp') {
+                header['Cookie'] = this._getCookies();
+            }
             Taro.request({
                 ...this._defaultConfig,
+                header,
                 url: this._defaultConfig.url + url,
                 method: type.toUpperCase(),
                 data,
                 success: response => {
+                    if (process.env.TARO_ENV === 'weapp') {
+                        this._saveCookies(response.cookies);
+                    }
                     /**
                      * @type {{state: {code, http, msg}, data: Object}}
                      * @example response.state.code
@@ -135,6 +163,24 @@
                 },
             });
         });
+    }
+
+    _saveCookies(cookies) {
+        const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+        cookies.forEach(cookie => {
+            const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
+            localCookies[mc[1]] = mc[2];
+        });
+        wx.setStorageSync('cookies', JSON.stringify(localCookies));
+    }
+
+    _getCookies() {
+        const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
+        const cookiesArr = [];
+        Object.keys(localCookies).forEach(key => {
+            cookiesArr.push(key + '=' + localCookies[key]);
+        });
+        return cookiesArr.join('; ');
     }
 
     /**
@@ -233,7 +279,9 @@
         } else {
             msg += '解析通讯数据异常！';
         }
-        this.message('error', msg);
+        setTimeout(() => {
+            this.message('error', msg);
+        }, 20);
     }
 
     /**
@@ -266,12 +314,18 @@
                 return response.data;
             }
         } else if (response.state.code === 2001) {
-            this.message('info', response.state.msg);
+            setTimeout(() => {
+                this.message('info', response.state.msg);
+            }, 20);
             return null;
         } else if (response.state.code === 9001) {
-            // this._showLoginExpired();
+            if (process.env.TARO_ENV === 'weapp') {
+                Taro.navigateTo({ url: '/pages/home/index/index?mode=login' });
+            }
         } else {
-            this.message('error', response.state.msg);
+            setTimeout(() => {
+                this.message('error', response.state.msg);
+            }, 20);
             return null;
         }
     }
@@ -540,13 +594,13 @@
                 if (sever && typeof project.host.hosts[sever] !== 'undefined') {
                     return project.host.hosts[sever];
                 }
-                // 使用设置的默认服务器地址
-                else if (project.host.server) {
-                    return project.host.server;
-                }
                 // 网页域名提取服务器地址
-                else {
+                else if (window.location.protocol.indexOf('http') >= 0) {
                     return window.location.protocol + '//' + window.location.host;
+                }
+                // 非 http 协议打开时，使用设置的服务器地址
+                else if (project.host.server) {
+                    return project.host.hosts[project.host.serverType];
                 }
             }
         }
@@ -558,7 +612,7 @@
             }
             // 生产
             else {
-                return project.host.server;
+                return project.host.hosts[project.host.serverType];
             }
         }
     })();

--
Gitblit v1.9.1