From 984bc4b6351220c7a0df4b4863799fff64a30506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Wed, 7 Dec 2022 09:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E5=BA=97=E9=93=BA=20?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/seller/shop/shopDetail.vue | 4 +++-
 manager/src/views/seller/shop/shopList.vue   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/seller/shop/shopDetail.vue b/manager/src/views/seller/shop/shopDetail.vue
index 56f0b3ba..ff7763b3 100644
--- a/manager/src/views/seller/shop/shopDetail.vue
+++ b/manager/src/views/seller/shop/shopDetail.vue
@@ -871,7 +871,9 @@
           this.$set(this, "storeInfo", res.result);
           //因switch开关需要用到true或者false 所以进行一次格式化
           this.storeInfo.storeDisable = this.storeInfo.storeDisable === "OPEN" ? true : false
-          this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(",");
+          if(this.storeInfo.goodsManagementCategory != null){
+            this.checkAllGroup = this.storeInfo.goodsManagementCategory.split(",");
+          }
           this.storeInfo.legalPhoto = this.storeInfo.legalPhoto.split(",");
         });
       },
diff --git a/manager/src/views/seller/shop/shopList.vue b/manager/src/views/seller/shop/shopList.vue
index 8e25b918..061b5f1a 100644
--- a/manager/src/views/seller/shop/shopList.vue
+++ b/manager/src/views/seller/shop/shopList.vue
@@ -24,7 +24,7 @@
           <Select v-model="searchForm.storeDisable" clearable style="width: 200px">
             <Option value="OPEN">开启中</Option>
             <Option value="CLOSED">已关闭</Option>
-            <Option value="APPLY">申请中</Option>
+            <!-- <Option value="APPLY">申请中</Option> -->
             <Option value="APPLYING">审核中</Option>
             <Option value="REFUSED">审核拒绝</Option>
           </Select>
@@ -329,6 +329,7 @@ export default {
     },
     // 获取列表数据
     getDataList() {
+      console.log(this.searchForm)
       this.loading = true;
       // 带多条件搜索参数获取表单数据 请自行修改接口
       getShopListData(this.searchForm).then((res) => {