From 879a7bd04dbd3e27eecfae700029dcba8cfd33b2 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 13 May 2022 17:43:39 +0800
Subject: [PATCH 1/2] commit

---
 pages/account/index.vue |  2 +-
 pages/cart/index.vue    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pages/account/index.vue b/pages/account/index.vue
index 7da4820..f68fa28 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 17:48:36
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 12:19:04
+ * @LastEditTime: 2022-05-12 19:42:49
  * @Description: file content
 -->
 <template>
diff --git a/pages/cart/index.vue b/pages/cart/index.vue
index db6fd87..b65afb0 100644
--- a/pages/cart/index.vue
+++ b/pages/cart/index.vue
@@ -2,12 +2,13 @@
  * @Author: ch
  * @Date: 2022-05-03 22:41:15
  * @LastEditors: ch
- * @LastEditTime: 2022-05-12 18:11:55
+ * @LastEditTime: 2022-05-12 19:40:43
  * @Description: file content
 -->
 <template>
 	<div>
-		<UiEmpty v-if="!isLoading && !list.length" desc="购物车空空如也，去挑点喜欢的好货吧~" :icon="require('@/assets/img/cart/empty.png')">
+		<UiEmpty v-if="!isLoading && !list.length" desc="购物车空空如也，去挑点喜欢的好货吧~" 
+			:icon="require('@/assets/img/cart/empty.png')">
 			<UiButton type="grey" @click="$router.push('/')">去逛逛</UiButton>
 		</UiEmpty>
 		<UiLoading v-if="isLoading" ></UiLoading>
@@ -32,22 +33,21 @@
 					<tbody>
 						<tr v-for="item in list" :key="item.id" :class="item.status !== 'normal' && 'disable'">
 							<td width="50">
-								<el-checkbox v-if="item.status === 'normal'" :label="item.id" class="checkbox"></el-checkbox>
+								<el-checkbox v-if="item.status === 'normal'" :label="item.id" class="checkbox" />
 								<span v-else class="tag">失效</span>
 							</td>
 							<td>
-								<UIGoodsInfo :goods="item"></UIGoodsInfo>
+								<UIGoodsInfo :goods="item" />
 							</td>
 							<td width="115">
-								<UiMoney :money="item.productSku ? item.productSku.sellPrice : 0"></UiMoney>
+								<UiMoney :money="item.productSku ? item.productSku.sellPrice : 0" />
 							</td>
 							<td width="115">
 								<el-input-number :value="item.number" @change="onChangeStepper($event, item)" 
-								:min="1" :max="item.maxBuyNum" size="mini">
-								</el-input-number>
+								:min="1" :max="item.maxBuyNum" size="mini" />
 							</td>
 							<td width="115">
-								<UiMoney :money="item.totalPrice"></UiMoney>
+								<UiMoney :money="item.totalPrice" />
 							</td>
 							<td width="115">
 								<a @click="handleDelete(item.id)" class="del">删除</a>
@@ -58,15 +58,15 @@
 			</el-checkbox-group>
 			<div class="operation">
 				<div>
-					<el-checkbox label="全选" @change="handleCheckAll" 
-					v-model="checkAll" :indeterminate="isIndeterminate"></el-checkbox>
+					<el-checkbox label="全选" @change="handleCheckAll" v-model="checkAll" :indeterminate="isIndeterminate" />
 					<a @click="handleDelete()" class="operation--del">批量删除</a>
 				</div>
 				<div class="operation--right">
 					<p>已选<span class="operation--count">{{checkedIds.length}}</span>件</p>
-					<p class="operation--total">总计：
-						<UiMoney class="operation--total-price" :money="totalPrice"
-							size="20px" float prefix preSize="14px"/>
+					<p class="operation--total">
+						总计：
+						<UiMoney class="operation--total-price" size="20px" float prefix preSize="14px"
+						 :money="totalPrice"/>
 					</p>
 					<UiButton class="operation--settlement" @click="settlement" :disabled="!checkedIds.length">去结算</UiButton>
 				</div>

From c5439314588c8900a675e3b4bd90775026f471b2 Mon Sep 17 00:00:00 2001
From: xiaoguang <aadsdas1@dingtalk.com>
Date: Mon, 16 May 2022 11:24:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E9=9A=90=E8=97=8F=E6=97=B6=E9=87=8D=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsLogin.vue | 7 +++----
 plugins/axiosTk.js     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/BsLogin.vue b/components/BsLogin.vue
index f75ddbd..c326611 100644
--- a/components/BsLogin.vue
+++ b/components/BsLogin.vue
@@ -107,10 +107,9 @@ export default {
       },
       set(val) {
         if (!val) {
-          Object.assign(this.form, {
-            phone: "",
-            verificationCode: "",
-          });
+          this.$refs.ruleForm.resetFields();
+          this.isAcceptAgreement = false;
+          this.countDown = 0;
         }
         this.$emit("update:visible", val);
       },
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index b108c06..141af11 100644
--- a/plugins/axiosTk.js
+++ b/plugins/axiosTk.js
@@ -23,7 +23,7 @@ export default function ({$axios, store, route}, inject) {
 				return result.data;
 			}
 			if(result.code === 'TOKEN_FAIL'){
-				await store.dispatch('logout');
+				await store.commit('setLoginOut');
 				store.commit('setLoginVisible');
 				return result;
 			}