修复登录页面重复调用token导致token失效的bug

2022-06-15 16:07:25 +08:00
parent fe178cc98c
commit 7d8b0994f5
127 changed files with 167 additions and 31 deletions
--- a/apis/index.js
+++ b/apis/index.js
@@ -11,7 +11,7 @@ import router from '../router'
 // 基础配置
 const config = {
 	apiUrl	: 'https://api.gongli.vip/api/', // 正式环境
-	// apiUrl	: 'http://api.zh.shangkelian.cn/api/', //  大健康调试环境，目前没有任何数据无法正常显示，所以需要使用该环境，最后会删除
+	// apiUrl	: 'http://api.gl.shangkelian.cn/api/', //  测试
 	timeout	: 60000
 }

--- a/1
+++ b/1
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -45,9 +45,6 @@
 				isShowParent: false
 			};
 		},
-		mounted() {
-			this.$store.commit('setToken', '')
-		},
 		methods: {
 			// 获取验证码
 			getPhoneCode() {
--- a/pages/life/life.vue
+++ b/pages/life/life.vue
@@ -87,7 +87,7 @@
 					<image src="../../static/life/icon_04.png" mode="widthFix"></image>
 					我的订单
 				</view>
-				<view class="other-subtitle">{{order.all || '暂无订单'}}</view>
+				<view class="other-subtitle">{{order.all === 0 ? '暂无订单': '订单数量' + order.all}}</view>
 				<image class="other-back" src="../../static/life/icon_09.png"></image>
 			</view>
 			<!-- <view class="life-flex-item other" @click="onToast('共力好友暂未开放尽情期待')">
--- a/pages/refund/list.vue
+++ b/pages/refund/list.vue
@@ -87,21 +87,9 @@
                refunds({
                    page: this.page
                }).then(res => {
-                    console.log(res)
                    if (res.page.current === 1) {
                        this.array = []
-                    }
-                    // let ordersArr = res.data.map(val => {
-                    //     return {
-                    //         no: val.order_no,
-                    //         cover: val.items[0].sku.cover,
-                    //         name: val.items[0].sku.goods_name,
-                    //         price: val.total,
-                    //         sum: val.items[0].qty,
-                    //         stateText: val.state,
-                    //         cans: val.can
-                    //     }
-                    // })
+                    }
                    uni.stopPullDownRefresh();
                    this.array = this.array.concat(res.data);
                    this.status = res.page.has_more ? 'loadmore' : 'nomore';
--- a/store/index.js
+++ b/store/index.js
@@ -23,7 +23,7 @@ export default new Vuex.Store({
 		}
 	},
 	mutations: {
-		setToken(state, tokenString) {
+		setToken(state, tokenString) {
 			state.token = tokenString
 			uni.setStorageSync('token', tokenString)
 		},
--- a/unpackage/debug/.roid.ins
+++ b/unpackage/debug/.roid.ins
@@ -0,0 +1 @@
+installed
--- a/unpackage/debug/android_debug.apk
+++ b/unpackage/debug/android_debug.apk
--- a/unpackage/dist/build/.automator/app-plus/.automator.json
+++ b/unpackage/dist/build/.automator/app-plus/.automator.json
--- a/unpackage/dist/build/app-plus/__uniappchooselocation.js
+++ b/unpackage/dist/build/app-plus/__uniappchooselocation.js
--- a/unpackage/dist/build/app-plus/__uniapperror.png
+++ b/unpackage/dist/build/app-plus/__uniapperror.png
--- a/unpackage/dist/build/app-plus/__uniappes6.js
+++ b/unpackage/dist/build/app-plus/__uniappes6.js
--- a/unpackage/dist/build/app-plus/__uniappopenlocation.js
+++ b/unpackage/dist/build/app-plus/__uniappopenlocation.js
--- a/unpackage/dist/build/app-plus/__uniapppicker.js
+++ b/unpackage/dist/build/app-plus/__uniapppicker.js
--- a/unpackage/dist/build/app-plus/__uniappquill.js
+++ b/unpackage/dist/build/app-plus/__uniappquill.js
--- a/unpackage/dist/build/app-plus/__uniappquillimageresize.js
+++ b/unpackage/dist/build/app-plus/__uniappquillimageresize.js
--- a/unpackage/dist/build/app-plus/__uniappscan.js
+++ b/unpackage/dist/build/app-plus/__uniappscan.js
--- a/unpackage/dist/build/app-plus/__uniappsuccess.png
+++ b/unpackage/dist/build/app-plus/__uniappsuccess.png
--- a/unpackage/dist/build/app-plus/__uniappview.html
+++ b/unpackage/dist/build/app-plus/__uniappview.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>
--- a/unpackage/dist/build/app-plus/app-config-service.js
+++ b/unpackage/dist/build/app-plus/app-config-service.js
--- a/unpackage/dist/build/app-plus/app-config.js
+++ b/unpackage/dist/build/app-plus/app-config.js
@@ -0,0 +1 @@
+(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]||[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/app-view.js
+++ b/unpackage/dist/build/app-plus/app-view.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
--- a/unpackage/dist/build/app-plus/static/background/supplier_back.png
+++ b/unpackage/dist/build/app-plus/static/background/supplier_back.png
--- a/unpackage/dist/build/app-plus/static/background/wallet-code-background.png
+++ b/unpackage/dist/build/app-plus/static/background/wallet-code-background.png
--- a/unpackage/dist/build/app-plus/static/icon/back.png
+++ b/unpackage/dist/build/app-plus/static/icon/back.png
--- a/unpackage/dist/build/app-plus/static/icon/checked-icon.png
+++ b/unpackage/dist/build/app-plus/static/icon/checked-icon.png
--- a/unpackage/dist/build/app-plus/static/icon/goods_row.png
+++ b/unpackage/dist/build/app-plus/static/icon/goods_row.png
--- a/unpackage/dist/build/app-plus/static/icon/helper.png
+++ b/unpackage/dist/build/app-plus/static/icon/helper.png
--- a/unpackage/dist/build/app-plus/static/icon/icon-back.png
+++ b/unpackage/dist/build/app-plus/static/icon/icon-back.png
--- a/unpackage/dist/build/app-plus/static/icon/icon-exchange.png
+++ b/unpackage/dist/build/app-plus/static/icon/icon-exchange.png
--- a/unpackage/dist/build/app-plus/static/icon/icon-money.png
+++ b/unpackage/dist/build/app-plus/static/icon/icon-money.png
--- a/unpackage/dist/build/app-plus/static/icon/logs-null.png
+++ b/unpackage/dist/build/app-plus/static/icon/logs-null.png
--- a/unpackage/dist/build/app-plus/static/icon/null-icon.png
+++ b/unpackage/dist/build/app-plus/static/icon/null-icon.png
--- a/unpackage/dist/build/app-plus/static/icon/reset-info.png
+++ b/unpackage/dist/build/app-plus/static/icon/reset-info.png
--- a/unpackage/dist/build/app-plus/static/icon/share_icon_00.png
+++ b/unpackage/dist/build/app-plus/static/icon/share_icon_00.png
--- a/unpackage/dist/build/app-plus/static/icon/share_icon_01.png
+++ b/unpackage/dist/build/app-plus/static/icon/share_icon_01.png
--- a/unpackage/dist/build/app-plus/static/icon/share_icon_02.png
+++ b/unpackage/dist/build/app-plus/static/icon/share_icon_02.png
--- a/unpackage/dist/build/app-plus/static/icon/sign_btn.png
+++ b/unpackage/dist/build/app-plus/static/icon/sign_btn.png
--- a/unpackage/dist/build/app-plus/static/icon/unchecked-icon.png
+++ b/unpackage/dist/build/app-plus/static/icon/unchecked-icon.png
--- a/unpackage/dist/build/app-plus/static/icon/userCloes.png
+++ b/unpackage/dist/build/app-plus/static/icon/userCloes.png
--- a/unpackage/dist/build/app-plus/static/icon/vip.png
+++ b/unpackage/dist/build/app-plus/static/icon/vip.png
--- a/unpackage/dist/build/app-plus/static/iconfont.css
+++ b/unpackage/dist/build/app-plus/static/iconfont.css
@@ -0,0 +1,49 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 2869797 */
+  src: url('@/static/iconfont.ttf');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-jia:before {
+  content: "\e60a";
+}
+
+.icon-dui:before {
+  content: "\e609";
+}
+
+.icon-gengduo2:before {
+  content: "\e608";
+}
+
+.icon-gengduo:before {
+  content: "\e607";
+}
+
+.icon-saoma:before {
+  content: "\e605";
+}
+
+.icon-tuandui:before {
+  content: "\e606";
+}
+
+.icon-sousuo:before {
+  content: "\e603";
+}
+
+.icon-pinglun:before {
+  content: "\e601";
+}
+
+.icon-shezhi:before {
+  content: "\e602";
+}
+
--- a/unpackage/dist/build/app-plus/static/iconfont.ttf
+++ b/unpackage/dist/build/app-plus/static/iconfont.ttf
--- a/unpackage/dist/build/app-plus/static/img/code_back.png
+++ b/unpackage/dist/build/app-plus/static/img/code_back.png
--- a/unpackage/dist/build/app-plus/static/img/house_back.jpg
+++ b/unpackage/dist/build/app-plus/static/img/house_back.jpg
--- a/unpackage/dist/build/app-plus/static/img/team_00.png
+++ b/unpackage/dist/build/app-plus/static/img/team_00.png
--- a/unpackage/dist/build/app-plus/static/img/team_back.jpg
+++ b/unpackage/dist/build/app-plus/static/img/team_back.jpg
--- a/unpackage/dist/build/app-plus/static/img/text_back.jpg
+++ b/unpackage/dist/build/app-plus/static/img/text_back.jpg
--- a/unpackage/dist/build/app-plus/static/life/back.png
+++ b/unpackage/dist/build/app-plus/static/life/back.png
--- a/unpackage/dist/build/app-plus/static/life/icon_00.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_00.png
--- a/unpackage/dist/build/app-plus/static/life/icon_01.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_01.png
--- a/unpackage/dist/build/app-plus/static/life/icon_02.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_02.png
--- a/unpackage/dist/build/app-plus/static/life/icon_03.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_03.png
--- a/unpackage/dist/build/app-plus/static/life/icon_04.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_04.png
--- a/unpackage/dist/build/app-plus/static/life/icon_05.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_05.png
--- a/unpackage/dist/build/app-plus/static/life/icon_06.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_06.png
--- a/unpackage/dist/build/app-plus/static/life/icon_07.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_07.png
--- a/unpackage/dist/build/app-plus/static/life/icon_08.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_08.png
--- a/unpackage/dist/build/app-plus/static/life/icon_09.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_09.png
--- a/unpackage/dist/build/app-plus/static/life/icon_10.png
+++ b/unpackage/dist/build/app-plus/static/life/icon_10.png
--- a/unpackage/dist/build/app-plus/static/login/auth_bg.png
+++ b/unpackage/dist/build/app-plus/static/login/auth_bg.png
--- a/unpackage/dist/build/app-plus/static/role/1.png
+++ b/unpackage/dist/build/app-plus/static/role/1.png
--- a/unpackage/dist/build/app-plus/static/role/10.png
+++ b/unpackage/dist/build/app-plus/static/role/10.png
--- a/unpackage/dist/build/app-plus/static/role/11.png
+++ b/unpackage/dist/build/app-plus/static/role/11.png
--- a/unpackage/dist/build/app-plus/static/role/2.png
+++ b/unpackage/dist/build/app-plus/static/role/2.png
--- a/unpackage/dist/build/app-plus/static/role/3.png
+++ b/unpackage/dist/build/app-plus/static/role/3.png
--- a/unpackage/dist/build/app-plus/static/role/4.png
+++ b/unpackage/dist/build/app-plus/static/role/4.png
--- a/unpackage/dist/build/app-plus/static/role/5.png
+++ b/unpackage/dist/build/app-plus/static/role/5.png
--- a/unpackage/dist/build/app-plus/static/role/7.png
+++ b/unpackage/dist/build/app-plus/static/role/7.png
--- a/unpackage/dist/build/app-plus/static/role/8.png
+++ b/unpackage/dist/build/app-plus/static/role/8.png
--- a/unpackage/dist/build/app-plus/static/role/9.png
+++ b/unpackage/dist/build/app-plus/static/role/9.png
--- a/unpackage/dist/build/app-plus/static/role/role_icon_00.png
+++ b/unpackage/dist/build/app-plus/static/role/role_icon_00.png
--- a/unpackage/dist/build/app-plus/static/store/store_icon_00.png
+++ b/unpackage/dist/build/app-plus/static/store/store_icon_00.png
--- a/unpackage/dist/build/app-plus/static/store/store_icon_01.png
+++ b/unpackage/dist/build/app-plus/static/store/store_icon_01.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_00.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_00.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_01.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_01.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_02.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_02.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_03.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_03.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_04.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_04.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_00.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_00.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_01.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_01.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_02.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_02.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_03.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_03.png
--- a/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_04.png
+++ b/unpackage/dist/build/app-plus/static/tabBar/tabBar_show_04.png
--- a/unpackage/dist/build/app-plus/static/user/cover.png
+++ b/unpackage/dist/build/app-plus/static/user/cover.png
--- a/unpackage/dist/build/app-plus/static/user/feedback-upd.png
+++ b/unpackage/dist/build/app-plus/static/user/feedback-upd.png
--- a/unpackage/dist/build/app-plus/static/user/icon_00.png
+++ b/unpackage/dist/build/app-plus/static/user/icon_00.png
--- a/unpackage/dist/build/app-plus/static/user/icon_01.png
+++ b/unpackage/dist/build/app-plus/static/user/icon_01.png
--- a/unpackage/dist/build/app-plus/static/user/icon_02.png
+++ b/unpackage/dist/build/app-plus/static/user/icon_02.png
--- a/unpackage/dist/build/app-plus/static/user/icon_06.png
+++ b/unpackage/dist/build/app-plus/static/user/icon_06.png
--- a/unpackage/dist/build/app-plus/static/user/icon_07.png
+++ b/unpackage/dist/build/app-plus/static/user/icon_07.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_00.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_00.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_01.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_01.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_02.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_02.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_03.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_03.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_04.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_04.png
--- a/unpackage/dist/build/app-plus/static/user/order_icon_05.png
+++ b/unpackage/dist/build/app-plus/static/user/order_icon_05.png
--- a/unpackage/dist/build/app-plus/static/user/userIcon_00.png
+++ b/unpackage/dist/build/app-plus/static/user/userIcon_00.png
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				(function(e){function r(r){for(var n,l,i=r[0],p=r[1],a=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);f&&f(r);while(s.length)s.shift()();return u.push.apply(u,a\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var p=t[i];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={"app-config":0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"===typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e["default"]}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonp"]=this["webpackJsonp"]\|\|[],p=i.push.bind(i);i.push=r,i=i.slice();for(var a=0;a<i.length;a++)r(i[a]);var f=p;t()})([]);