优化列表筛选器组件显示兼容性

Tevin

2021-10-13 67d4bf09d8d40aa5121e61dde63030fc958e2a14

 bases/Fetcher.js

@@ -17,8 +17,9 @@
    constructor(options = {}) {
        this._data = {
            urlPrefix: options.urlPrefix || ['/api/common/', '/api/common/'],
            mock: Tools.getUrlParam('mock') || project.host.mock,
        };
        if (project.host.mock === 'on') {
        if (this._data.mock === 'on') {
            if (project.host.assetsPath.indexOf('..') === 0) {
                this._defaultConfig.url = Fetcher.host + '/' + project.host.assetsPath.replace('/assets', '/mocks');
            } else {
@@ -33,17 +34,35 @@
     * 请求配置
     * @private
     */
    _defaultConfig = {
        url: '',
        header: {
            'X-Requested-With': 'XMLHttpRequest',
            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
            'Ax-Rq-Type': 'separation',
        },
        credentials: 'same-origin',
        dataType: 'json',
        timeout: 30 * 1000,
    };
    _defaultConfig = (() => {
        // 跨域模式，一般为 App 内嵌页面
        if (project.appHybrid) {
            return {
                url: '',
                header: {
                    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
                },
                mode: 'cors',
                credentials: 'include',
                dataType: 'json',
                timeout: 30 * 1000,
            };
        }
        // 正常模式，小程序、普通H5
        else {
            return {
                url: '',
                header: {
                    'X-Requested-With': 'XMLHttpRequest',
                    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
                    'Ax-Rq-Type': 'separation',
                },
                credentials: 'same-origin',
                dataType: 'json',
                timeout: 30 * 1000,
            };
        }
    })();

    /**
     * 拼写 URL 地址
@@ -54,11 +73,11 @@
    spellURL(devSuffix, serSuffix) {
        let url = '';
        // mock 模式
        if (project.host.mock === 'on') {
        if (this._data.mock === 'on') {
            url = this._data.urlPrefix[0].replace('api/', '') + devSuffix + '.json';
        }
        // 强制实际请求模式
        else if (project.host.mock === 'real') {
        else if (this._data.mock === 'real') {
            url = this._data.urlPrefix[1] + (serSuffix || devSuffix);
        }
        // 正常模式
@@ -107,7 +126,7 @@
     * @return {Promise<any>}
     */
    post(url, data, remap = [], options = null) {
        if (project.host.mock === 'on') {
        if (this._data.mock === 'on') {
            return this.get(url, data, remap = [], options);
        }
        const params = Qs.stringify(data);
@@ -170,16 +189,16 @@
    }

    _saveCookies(cookies) {
        const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
        const localCookies = JSON.parse(Taro.getStorageSync('cookies') || '{}');
        cookies.forEach(cookie => {
            const mc = cookie.match(/([a-zA-Z0-9_\-]+)=(.*?);/);
            localCookies[mc[1]] = mc[2];
        });
        wx.setStorageSync('cookies', JSON.stringify(localCookies));
        Taro.setStorageSync('cookies', JSON.stringify(localCookies));
    }

    _getCookies() {
        const localCookies = JSON.parse(wx.getStorageSync('cookies') || '{}');
        const localCookies = JSON.parse(Taro.getStorageSync('cookies') || '{}');
        const cookiesArr = [];
        Object.keys(localCookies).forEach(key => {
            cookiesArr.push(key + '=' + localCookies[key]);
@@ -195,6 +214,49 @@
        // 标准请求，不转换
        if (typeof responseData.state === 'object' && typeof responseData.data === 'object') {
            return responseData;
        }
        // App版请求，响应体转换
        if (typeof responseData.ret !== 'undefined' && typeof responseData.data !== 'undefined') {
            // 转换数据体
            let data2 = { rows: [] };
            // 数组类型
            if (responseData.data instanceof Array) {
                if (responseData.data.length > 0) {
                    data2.rows = responseData.data;
                }
            }
            // 对象类型
            else if (responseData.data instanceof Object) {
                if (!Tools.isEmptyObject(responseData.data)) {
                    data2 = responseData.data;
                }
            }
            // 转换响应码
            let code = 0;
            // 正常
            if (responseData.ret === 0) {
                code = 2000;
            }
            // 特殊模式下的状态码，转换为正常模式，由页面处理业务
            else if (responseData.ret === 10999) {
                code = 2000;
            }
            // 未登录
            else if (responseData.ret === 101110) {
                code = 9001;
            }
            // 其他按报错
            else {
                code = 5000;
            }
            // 合并响应体
            return {
                state: {
                    code,
                    msg: responseData.msg,
                },
                data: data2,
            };
        }
        // 旧请求，操作类通讯，响应体转换
        if (typeof responseData.status !== 'undefined' && typeof responseData.dataMsg !== 'undefined') {
@@ -323,9 +385,16 @@
            }, 20);
            return null;
        } else if (response.state.code === 9001) {
            // 在微信公众号中，每次进入即登陆，登陆失效关闭重进即可（进入链接带公司绑定码，页面没有存这个码，也不需要）
            // 在小程序中，使用自动登陆机制，自动登陆失败才去授权页绑定账号
            if (process.env.TARO_ENV === 'weapp') {
                Taro.navigateTo({ url: '/pages/home/index/index?mode=login' });
            }
            // 在App中，直接跳转登陆页
            if (project.appHybrid) {
                Taro.reLaunch({ url: '/pages/home/login/login' });
            }
            return null;
        } else {
            setTimeout(() => {
                this.message('error', response.state.msg);
@@ -395,7 +464,7 @@
     * @return {String}
     * @private
     */
    _stringToCamel(str) {
    stringToCamel(str) {
        let str2 = '';
        if (str.indexOf('_') <= 0) {
            str2 = str;
@@ -415,7 +484,7 @@
     * @return {String}
     * @private
     */
    _stringToUnderline(str) {
    stringToUnderline(str) {
        let str2 = '';
        if ((/[A-Z]/).test(str)) {
            str2 = str.replace(/([A-Z])/g, ($1) => {
@@ -445,9 +514,9 @@
                    // 字符串键名进行转换
                    else {
                        if (type === 'camel') {
                            key = this._stringToCamel(p);
                            key = this.stringToCamel(p);
                        } else if (type === 'underline') {
                            key = this._stringToUnderline(p);
                            key = this.stringToUnderline(p);
                        }
                    }
                    // 属性为对象时，递归转换
@@ -585,48 +654,41 @@
     * @type {String}
     */
    static host = (() => {
        // 网页
        // 网页模式
        if (process.env.TARO_ENV === 'h5') {
            // 开发
            if (Fetcher.inDevMod) {
                // 网址访问
                if (window.location.protocol.indexOf('http') >= 0) {
                    return window.location.protocol + '//' + window.location.host;
            // 如果网址参数有指定服务器
            const server = Tools.getUrlParam('server');
            if (server) {
                // 如果是完整网址，直接使用地址
                if (server.indexOf('http') >= 0) {
                    return server;
                }
                // 文件访问
                // 如果有匹配服务器，使用指定的服务器地址
                if (typeof project.host.hosts[server] !== 'undefined') {
                    return project.host.hosts[server];
                }
                // 否则使用本地
                else {
                    return project.host.hosts[project.host.devType];
                    return project.host.hosts.lc;
                }
            }
            // 生产
            // 网页域名提取服务器地址
            else if (window.location.protocol.indexOf('http') >= 0) {
                return window.location.protocol + '//' + window.location.host;
            }
            // 既不指定server也不是域名访问，使用设置的服务器地址
            else {
                // 如果网址参数有指定服务器
                const sever = Tools.getUrlParam('sever');
                if (sever) {
                    // 如果是完整网址，直接使用地址
                    if (sever.indexOf('http') >= 0) {
                        return sever;
                    }
                    // 如果有匹配服务器，使用指定的服务器地址
                    if (typeof project.host.hosts[sever] !== 'undefined') {
                        return project.host.hosts[sever];
                    }
                    // 否则使用本地
                    else {
                        return project.host.hosts.lc;
                    }
                // 开发
                if (Fetcher.inDevMod) {
                    return project.host.hosts[project.host.devType];
                }
                // 网页域名提取服务器地址
                else if (window.location.protocol.indexOf('http') >= 0) {
                    return window.location.protocol + '//' + window.location.host;
                }
                // 既不指定server也不是域名访问，使用设置的服务器地址
                // 生产
                else {
                    return project.host.hosts[project.host.serverType];
                }
            }
        }
        // 小程序
        // 小程序模式
        else if (process.env.TARO_ENV === 'weapp') {
            // 开发
            if (Fetcher.inDevMod) {