diff --git a/common/env.js b/common/env.js index adaa76e..a1b2027 100644 --- a/common/env.js +++ b/common/env.js @@ -41,7 +41,7 @@ const testing = { // 根据环境变量选择对应配置 -let currentEnv = testing;//production;//testing;//production_wz; +let currentEnv = production;//production;//testing;//production_wz; // 衍生配置 const config = { ...currentEnv, diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js index fed21e2..bbc29f8 100644 --- a/common/platform/BasePlatform.js +++ b/common/platform/BasePlatform.js @@ -30,9 +30,9 @@ class BasePlatform { } async appData() { await this.loadCacheData(); - // uni.switchTab({ - // url: '/pages/shouye/index' - // }); + uni.switchTab({ + url: '/pages/shouye/index' + }); } /** diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js index 7a87c7d..e0672b2 100644 --- a/common/platform/H5Platform.js +++ b/common/platform/H5Platform.js @@ -170,11 +170,11 @@ class H5Platform extends BasePlatform { } } - if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") { - uni.switchTab({ - url: '/pages/shouye/index' - }); - } + // if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") { + // uni.switchTab({ + // url: '/pages/shouye/index' + // }); + // } } getOrderNo(event) { return new Promise((resolve, reject) => { diff --git a/common/request.js b/common/request.js index e1db137..0610331 100644 --- a/common/request.js +++ b/common/request.js @@ -50,7 +50,7 @@ class RequestManager { * @param {Boolean} showLoading 是否显示加载提示 * @returns {Promise} 返回请求Promise */ - static getCache(url, data = {}, showLoading = true) { + static getCache(url, data = {}, showLoading = false) { // 生成缓存键 const cacheKey = url + JSON.stringify(data); diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index f72c032..810ddf6 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -121,722 +121,507 @@ \ No newline at end of file