diff --git a/common/config.js b/common/config.js index 40ef49e..2c09f72 100644 --- a/common/config.js +++ b/common/config.js @@ -2,13 +2,13 @@ const mode = 'production'; //devLocal:本地测试、devOnline:线上测试 let ROOTPATH = ''; //域名 switch (mode) { case 'devLocal': - ROOTPATH = "https://agenttest.xfgshop.com" + ROOTPATH = "https://agent.xfgshop.com" break; case 'devOnline': - ROOTPATH = "https://agenttest.xfgshop.com" + ROOTPATH = "https://agent.xfgshop.com" break; case 'production': - ROOTPATH = "https://agenttest.xfgshop.com" + ROOTPATH = "https://agent.xfgshop.com" break; default: throw new Error('未配置环境'); diff --git a/common/http.interceptor.js b/common/http.interceptor.js index a0801ad..9960178 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -23,8 +23,8 @@ const install = (Vue, vm) => { // 请求拦截部分,如配置,每次请求前都会执行 Vue.prototype.$u.http.interceptor.request = (config) => { console.log('config-http', config) - let xtt_lifeData = uni.getStorageSync('xtt_lifeData') - let vuex_token = xtt_lifeData.vuex_token; + let xtt_lifeData2 = uni.getStorageSync('xtt_lifeData2') + let vuex_token = xtt_lifeData2.vuex_token; if (vuex_token || vm.vuex_token) { config.header['Authorization'] = `Bearer ${vuex_token || vm.vuex_token}`; } @@ -43,7 +43,7 @@ const install = (Vue, vm) => { confirmText: '重新获取', success: function(res) { if (res.confirm) { - uni.removeStorageSync('xtt_lifeData') + uni.removeStorageSync('xtt_lifeData2') uni.login({ provider: 'weixin', success: (res) => { @@ -57,7 +57,7 @@ const install = (Vue, vm) => { method: 'GET', success: result => { console.log("result",result) - uni.setStorageSync("xtt_lifeData",{'vuex_token':result.data.token}) + uni.setStorageSync("xtt_lifeData2",{'vuex_token':result.data.token}) const currentPage = getCurrentPages()[ diff --git a/pages/home/home.vue b/pages/home/home.vue index d4504c1..76f5d77 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -81,12 +81,12 @@ - + - - + + @@ -122,7 +122,7 @@ }, onLoad(option) { this.getBanner() - let token = uni.getStorageSync('xtt_lifeData')?uni.getStorageSync('xtt_lifeData').vuex_token:'' + let token = uni.getStorageSync('xtt_lifeData2')?uni.getStorageSync('xtt_lifeData2').vuex_token:'' if (isNull(token)) { this.getToken() } diff --git a/pages/me/me.vue b/pages/me/me.vue index 13d6534..d6e9c2f 100644 --- a/pages/me/me.vue +++ b/pages/me/me.vue @@ -163,7 +163,7 @@ onLoad() { const MenuButton = uni.getMenuButtonBoundingClientRect() this.navBarTop = MenuButton.top //左侧文字与右侧胶囊对齐 - this.myToken = uni.getStorageSync('xtt_lifeData').vuex_token + this.myToken = uni.getStorageSync('xtt_lifeData2').vuex_token }, onShow() { this.getInitUser() diff --git a/store/index.js b/store/index.js index 726b5bb..597ec22 100644 --- a/store/index.js +++ b/store/index.js @@ -2,11 +2,11 @@ import Vue from 'vue' import Vuex from 'vuex' Vue.use(Vuex) -let xtt_lifeData = {}; +let xtt_lifeData2 = {}; try{ - // 尝试获取本地是否存在xtt_lifeData变量,第一次启动APP时是不存在的 - xtt_lifeData = uni.getStorageSync('xtt_lifeData'); + // 尝试获取本地是否存在xtt_lifeData2变量,第一次启动APP时是不存在的 + xtt_lifeData2 = uni.getStorageSync('xtt_lifeData2'); }catch(e){ } @@ -15,26 +15,26 @@ try{ let saveStateKeys = ['vuex_user', 'vuex_token','vuex_share']; // 保存变量到本地存储中 -const savextt_LifeData = function(key, value){ +const savextt_LifeData2 = function(key, value){ // 判断变量名是否在需要存储的数组中 if(saveStateKeys.indexOf(key) != -1) { - // 获取本地存储的xtt_lifeData对象,将变量添加到对象中 - let tmp = uni.getStorageSync('xtt_lifeData'); - // 第一次打开APP,不存在xtt_lifeData变量,故放一个{}空对象 + // 获取本地存储的xtt_lifeData2对象,将变量添加到对象中 + let tmp = uni.getStorageSync('xtt_lifeData2'); + // 第一次打开APP,不存在xtt_lifeData2变量,故放一个{}空对象 tmp = tmp ? tmp : {}; tmp[key] = value; - // 执行这一步后,所有需要存储的变量,都挂载在本地的xtt_lifeData对象中 - uni.setStorageSync('xtt_lifeData', tmp); + // 执行这一步后,所有需要存储的变量,都挂载在本地的xtt_lifeData2对象中 + uni.setStorageSync('xtt_lifeData2', tmp); } } const store = new Vuex.Store({ // 下面这些值仅为示例,使用过程中请删除 state: { - // 如果上面从本地获取的xtt_lifeData对象下有对应的属性,就赋值给state中对应的变量 + // 如果上面从本地获取的xtt_lifeData2对象下有对应的属性,就赋值给state中对应的变量 // 加上vuex_前缀,是防止变量名冲突,也让人一目了然 - vuex_user: xtt_lifeData.vuex_user ? xtt_lifeData.vuex_user : {}, - vuex_token: xtt_lifeData.vuex_token ? xtt_lifeData.vuex_token : '', - // 如果vuex_version无需保存到本地永久存储,无需xtt_lifeData.vuex_version方式 + vuex_user: xtt_lifeData2.vuex_user ? xtt_lifeData2.vuex_user : {}, + vuex_token: xtt_lifeData2.vuex_token ? xtt_lifeData2.vuex_token : '', + // 如果vuex_version无需保存到本地永久存储,无需xtt_lifeData2.vuex_version方式 vuex_version: '1.0.0', vuex_sign_base64: '', @@ -59,7 +59,7 @@ const store = new Vuex.Store({ saveKey = payload.name; } // 保存变量到本地,见顶部函数定义 - savextt_LifeData(saveKey, state[saveKey]) + savextt_LifeData2(saveKey, state[saveKey]) } } })