合并master

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("地区数据正在更新中！");

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) {

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) {