Merge branch 'feature/zl' into 'test'

Feature/zl

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!402

src/views/shop/shop-list.vue

@@ -195,7 +195,7 @@
 
               <el-button v-if="checkSpe(scope.row)" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
 
-              <el-button  v-if="scope.row.tradeStore.storeType == 3" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
+              <el-button  v-if="scope.row.tradeStore.storeType == 3 && isOutsideGetted == 'no'" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
             </div>
           </template>
         </el-table-column>
@@ -273,12 +273,14 @@
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
   import { queryStore, queryShopAuth, closeShop } from '@/utils/shop';
+  import { getUserTypeReq } from "@/utils/cme/cmeApi";
   export default {
     components: {
       BreadCrumb
     },
     data(){
       return{
+        isOutsideGetted: 'no',
         curmbFirst: '云鹊店铺',
         showAllFlag: false,
         showNewFlag: false,
@@ -326,13 +328,17 @@
           }],
         storeTypeList: [
 
+          {
+            value: 1,
+            label: "待完善"
+          },
           {
             value: 2,
-            label: "认证提交中"
+            label: "待审核"
           },
           {
             value: 3,
-            label: "认证通过"
+            label: "审核通过"
           },
            {
             value: 4,
@@ -372,6 +378,7 @@
       // this.idType = localStorage.getItem("storageIdType");
       this.storageIdType = localStorage.getItem("storageIdType") - 0;
       console.log(this.storageIdType);
+      this.getUserTypeReq();
       this.getAddAuth();
       this.searchList();
     },
@@ -384,6 +391,15 @@
           }
         })
       },
+      getUserTypeReq () {
+        getUserTypeReq().then(res => {
+          console.log('--res', res);
+          if(res.code == '000000'){
+            this.isOutsideGetted = res.data.code;
+          }
+
+        });
+      },
       searchList() {
         openLoading(this);
         let params = this.searchForm;