完善混合App退出机制

Tevin

2021-11-14 4076fed6ad20dbbec939fa11230a290f018886db

 bases/Fetcher.js

@@ -82,12 +82,8 @@
        }
        // 正常模式
        else {
            // 代理模式
            if (typeof project.host.proxyType !== 'undefined' && project.host.proxyType !== 'lc') {
                url = '/proxy' + this._data.urlPrefix[1] + (serSuffix || devSuffix);
            }
            // 开发环境地址
            else if (Fetcher.inDevMod) {
            if (Fetcher.inDevMod) {
                url = this._data.urlPrefix[0] + devSuffix;
            }
            // 生产环境地址
@@ -107,31 +103,29 @@
     * get 请求
     * @param {String} url
     * @param {*} data
     * @param {(String[])[]} [remap]
     * @param {object} [options]
     * @return {Promise<any>}
     */
    get(url, data, remap = [], options = null) {
    get(url, data, options = {}) {
        const params = Qs.stringify(data);
        if (url.indexOf('?') >= 0) {
            url += '&' + params;
        } else {
            url += '?' + params;
        }
        return this.query('get', url, null, remap, options);
        return this.query('get', url, null, options);
    }

    /**
     * post 请求
     * @param {String} url
     * @param {*} data
     * @param {(String[])[]} [remap]
     * @param {object} [options]
     * @return {Promise<any>}
     */
    post(url, data, remap = [], options = null) {
    post(url, data, options = {}) {
        if (this._data.mock === 'on') {
            return this.get(url, data, remap = [], options);
            return this.get(url, data, options);
        }
        const params = Qs.stringify(data);
        const data2 = {};
@@ -141,7 +135,7 @@
                data2[decodeURIComponent(item[0])] = decodeURIComponent(item[1]);
            }
        });
        return this.query('post', url, data2, remap, options);
        return this.query('post', url, data2, options);
    }

    /**
@@ -149,11 +143,10 @@
     * @param {String} type
     * @param {String} url
     * @param {*} [data]
     * @param {*} [remap]
     * @param {object} [options]
     * @return {Promise<any>|}
     */
    query(type, url, data = null, remap, options = {}) {
    query(type, url, data = null, options = {}) {
        return new Promise((resolve, reject) => {
            const header = {
                ...this._defaultConfig.header,
@@ -182,10 +175,12 @@
                     */
                    const responseData = this._adaptiveResponseData(response.data);
                    responseData.state.http = response.statusCode;
                    resolve(this._transformResponseData(responseData, remap));
                    resolve(this._transformResponseData(responseData, options));
                },
                fail: error => {
                    this._resolveCaughtNetErr(error);
                    if (typeof options.silence === 'undefined' || !options.silence) {
                        this._resolveCaughtNetErr(error);
                    }
                    reject(null);
                },
            });
@@ -357,11 +352,10 @@
    /**
     * 转换响应体
     * @param response
     * @param {Array[]} remap
     * @returns {Object|{}|null}
     * @private
     */
    _transformResponseData(response, remap) {
    _transformResponseData(response, options) {
        if (!response) {
            return null;
        }
@@ -375,17 +369,15 @@
                }
                // 先转驼峰
                response.data = this.transKeyName('camel', response.data);
                // 再重映射
                if (remap && remap.length > 0) {
                    response.data = this._remapData(response.data, remap);
                }
                // 转换常规数字字符串为数值
                response.data = this._transNumStringToNumber(response.data);
                return response.data;
            }
        } else if (response.state.code === 2001) {
            setTimeout(() => {
                this.message('info', response.state.msg);
                if (typeof options.silence === 'undefined' || !options.silence) {
                    this.message('info', response.state.msg);
                }
            }, 20);
            return null;
        } else if (response.state.code === 9001) {
@@ -396,70 +388,18 @@
            }
            // 在App中，直接跳转登陆页
            if (project.appHybrid) {
                Taro.reLaunch({ url: '/pages/home/login/login' });
                Taro.removeStorageSync('AiSim@UserInfo');
                Taro.navigateBack({ delta: Taro.getCurrentPages().length });
            }
            return null;
        } else {
            setTimeout(() => {
                this.message('error', response.state.msg);
                if (typeof options.silence === 'undefined' || !options.silence) {
                    this.message('error', response.state.msg);
                }
            }, 20);
            return null;
        }
    }

    /**
     * 转换响应体数据结构
     * @param {Object} data
     * @param {Array[]} maps
     * @example maps: [
     *          ['rows.[]', 'recvName', 'userName']   // 默认语法：键名转换（路径，旧名，新名）
     *      ]
     * @private
     */
    _remapData(data, maps) {
        // 渡值
        const ferryValue = (source, paths, map) => {
            // 最后一环，传值
            if (paths.length === 0) {
                // 目标已有值，跳过传值不覆盖
                if (typeof source[map[2]] !== 'undefined') {
                    return;
                }
                // 来源没有值，赋值空字符串
                if (typeof source[map[1]] === 'undefined') {
                    source[map[2]] = '';
                }
                // 来源有值，直接赋值
                else {
                    source[map[2]] = source[map[1]];
                }
                delete source[map[1]];
                return;
            }
            // 提取当前环节
            const curPath = paths.shift();
            if (curPath === '[]') {
                source.forEach(item => {
                    ferryValue(item, [...paths], map);
                });
            } else {
                ferryValue(source[curPath], [...paths], map);
            }
        };
        for (let map of maps) {
            // 键名转换
            if (map[0].indexOf('.') >= 0) {
                const paths = map[0].split('.');
                ferryValue(data, paths, map);
            } else {
                if (map[0].length > 0) {
                    ferryValue(data, [map[0]], map);
                } else {
                    ferryValue(data, [], map);
                }
            }
        }
        return data;
    }

    /**
@@ -663,9 +603,11 @@
            // 如果网址参数有指定服务器
            const server = Tools.getUrlParam('server');
            if (server) {
                // 如果是完整网址，直接使用地址
                // 如果是完整网址，使用网址对应的域名
                if (server.indexOf('http') >= 0) {
                    return server;
                    const portal = server.split('//')[0];
                    const domain = server.split('//')[1].split('/')[0];
                    return portal + '//' + domain;
                }
                // 如果有匹配服务器，使用指定的服务器地址
                if (typeof project.host.hosts[server] !== 'undefined') {