From 011bcae11aa03a36fc7d31e3ef5e89b46582f11b Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 3 Jun 2021 16:42:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/seller/bill/accountStatementBill.vue | 2 +-
 seller/src/views/shop/bill/accountStatementBill.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/seller/bill/accountStatementBill.vue b/manager/src/views/seller/bill/accountStatementBill.vue
index 8ef67236..bf494d0f 100644
--- a/manager/src/views/seller/bill/accountStatementBill.vue
+++ b/manager/src/views/seller/bill/accountStatementBill.vue
@@ -189,7 +189,7 @@ export default {
         (this.searchForm.endTime = this.$options.filters.unixToDate(
           this.searchForm.endTime / 1000
         ));
-      this.searchForm.billStatus = "OUT";
+      this.searchForm.billStatus = "CHECK";
       API_Shop.getBuyBillPage(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
diff --git a/seller/src/views/shop/bill/accountStatementBill.vue b/seller/src/views/shop/bill/accountStatementBill.vue
index 6e62f342..e944f432 100644
--- a/seller/src/views/shop/bill/accountStatementBill.vue
+++ b/seller/src/views/shop/bill/accountStatementBill.vue
@@ -225,7 +225,7 @@
       },
       getDataList() {
         this.loading = true;
-        this.searchForm.billStatus = "CHECK"
+        this.searchForm.billStatus = "OUT"
         API_Shop.getBillPage(this.searchForm).then((res) => {
           this.loading = false;
           if (res.success) {

From 43b4c041e4d2e8e523dc1643a638141e54521094 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 3 Jun 2021 17:37:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/goods/goods-seller/goodsOperation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index 1458178b..bb794f9b 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -61,7 +61,7 @@
       </p>
       <template v-if="!$route.query.id">
         <Divider>或选择商品模版</Divider>
-        <Select v-model="draftId" style="width: 200px">
+        <Select v-model="draftId" clearable style="width: 200px">
           <Option v-for="item in goodsTemplates" :value="item.id" :key="item.id"
           >{{ item.goodsName || item.id }}
           </Option>

From e32e2a92cdaec8436dec46c3c3582d55722c599b Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Thu, 3 Jun 2021 18:06:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E5=9C=B0=E5=8C=BA=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/region/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/region/index.vue b/manager/src/views/region/index.vue
index 26fbe42e..7c7b5487 100644
--- a/manager/src/views/region/index.vue
+++ b/manager/src/views/region/index.vue
@@ -303,7 +303,7 @@ export default {
         content: "更新后店铺以及用户地区绑定数据将全部错乱",
         onOk: () => {
           let timer;
-          let numer;
+          let number;
 
           this.asyncLoading = true
 
@@ -319,7 +319,8 @@ export default {
                       click: () => {
                         this.$Message.destroy();
                         this.asyncLoading = false
-                        clearInterval(timer, numer);
+                        clearInterval(number);
+                        clearTimeout(timer)
                       },
                     },
                   },
@@ -329,11 +330,12 @@ export default {
             },
           });
 
-          numer = setInterval(() => {
+          number = setInterval(() => {
             this.num--;
           }, 1000);
 
           timer = setTimeout(() => {
+            clearInterval(number)
             asyncRegion().then((res) => {
               this.asyncLoading = false
               this.$Message.loading("地区数据正在更新中！");