diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue index 616842c..e69de29 100644 --- a/components/m-goods-list/list.vue +++ b/components/m-goods-list/list.vue @@ -1,281 +0,0 @@ - - - - - diff --git a/manifest.json b/manifest.json index 4cc39c1..9267136 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__EC9FD60", "description" : "", - "versionName" : "4.2.5", - "versionCode" : 4000250, + "versionName" : "4.2.6", + "versionCode" : 4000260, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/plugins/APPUpdate/index.js b/plugins/APPUpdate/index.js index b980d1c..cfa6979 100644 --- a/plugins/APPUpdate/index.js +++ b/plugins/APPUpdate/index.js @@ -854,8 +854,7 @@ function downloadPopup(data, callback, cancelCallback, rebootCallback) { export default function (isPrompt = false) { getCurrentNo((version) => { getServerNo((res) => { - - if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "")) { + if (res.versionCode.replace(/\./g, "") <= version.version.replace(/\./g, "") ) { return false; } diff --git a/utils/request.js b/utils/request.js index d8e112e..8cc8969 100644 --- a/utils/request.js +++ b/utils/request.js @@ -119,8 +119,9 @@ http.interceptors.response.use( response.data.status === 403 ) { if (!isRefreshing) { - console.log('旧token', token) + console.log('旧token',token) isRefreshing = true; + storage.setAccessToken('') let oldRefreshToken = storage.getRefreshToken(); //调用刷新token的接口 return refreshTokenFn(oldRefreshToken) @@ -131,13 +132,13 @@ http.interceptors.response.use( response.header.accessToken = `${accessToken}`; // token 刷新后将数组的方法重新执行 - // console.log('接口队列', requests, '新token', accessToken) + console.log('接口队列',requests,'新token',accessToken) requests.forEach((cb) => cb(accessToken)); requests = []; // 重新请求完清空 return http.request(response.config); }) .catch((err) => { - console.log('刷新token报错' + oldRefreshToken, err) + console.log('刷新token报错'+oldRefreshToken,err) cleanStorage(); return Promise.reject(err); }) @@ -157,9 +158,9 @@ http.interceptors.response.use( // 如果当前返回没登录 } else if ( (!token && !storage.getRefreshToken() && response.statusCode === 403) || - response.data.code === 403 || response.data.code === 20004 + response.data.code === 403 ) { - // console.log('没有token 以及刷新token 内容', token, storage.getRefreshToken()) + console.log('没有token 以及刷新token 内容',token,storage.getRefreshToken()) cleanStorage(); // 如果当前状态码为正常但是success为不正常时