Merge branch 'feature/zl' into 'release'

Feature/zl

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

src/views/shop/create-shop.vue

@@ -320,17 +320,17 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
-                  <el-form-item
-                    label="医疗资质"
-                    prop="storeQualityUrl"
-                  >
-                    <el-input
-                      size="small"
-                      v-model="formData.storeQualityUrl"
-                      placeholder="请填写URL,仅对批发商品生效"
-                      style="width: 35%"
-                    ></el-input>
-                  </el-form-item>
+<!--                  <el-form-item-->
+<!--                    label="医疗资质"-->
+<!--                    prop="storeQualityUrl"-->
+<!--                  >-->
+<!--                    <el-input-->
+<!--                      size="small"-->
+<!--                      v-model="formData.storeQualityUrl"-->
+<!--                      placeholder="请填写URL,仅对批发商品生效"-->
+<!--                      style="width: 35%"-->
+<!--                    ></el-input>-->
+<!--                  </el-form-item>-->
                 </div>
               </div>
               <el-form-item
@@ -1731,14 +1731,14 @@ export default {
             storejs.remove('store_info');
             this.curmbSecond = "新建店铺";
             this.isDisabled = false;
-            if(s){
-              // 存在数据 就反现
-              this.formData = s;
-              const {areaStr} = s.certifyReq;
-              const v = areaStr.map(i => {return i.label;}).join('/');
-              this.orgRegionValueFirst = v;
-              this.orgDateReverse();
-            }
+            // if(s){
+            //   // 存在数据 就反现
+            //   this.formData = s;
+            //   const {areaStr} = s.certifyReq;
+            //   const v = areaStr.map(i => {return i.label;}).join('/');
+            //   this.orgRegionValueFirst = v;
+            //   this.orgDateReverse();
+            // }
           }
         }
     },
@@ -3130,6 +3130,7 @@ export default {
     max-width: 1400px;
     display: flex;
     justify-content: space-between;
+    flex-wrap: wrap;
     .el-range-editor{
       width: 500px;
     }

src/views/shop/shop-list.vue

@@ -185,17 +185,17 @@
 
               <el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>
 
-              <el-button @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
+              <el-button v-if="checkIsEdit(scope.row)" checkIsEdit @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
 
-              <el-button  @click="shopManage(scope.row)"  type="text" size="small">商品管理</el-button>
+              <el-button  v-if="checkGoods(scope.row)" @click="shopManage(scope.row)"  type="text" size="small">商品管理</el-button>
 
-              <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
+              <el-button  v-if="checkBills(scope.row)" @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
 
-              <el-button  @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
+              <el-button  v-if="checkSpe(scope.row)" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
 
-              <el-button @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
+              <el-button v-if="checkSpe(scope.row)" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
 
-              <el-button   @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;
@@ -693,14 +709,48 @@
       },
       checkIsEdit (row){
         const {storeType, certifyStatus} = row.tradeStore;
-        if(storeType == 1 && certifyStatus == 3){
+        if(storeType == 1 && Number(certifyStatus) > 2){
+          return true;
+        }else if(storeType == 2){
+          return true;
+        }else{
+          return false;
+        }
+      },
+      checkGoods(row) {
+        const {storeType, certifyStatus} = row.tradeStore;
+        if(storeType == 1 && Number(certifyStatus) === 3){
           return true
-        }else if(storeType == 2 && (certifyStatus == 1 || certifyStatus == 3)){
+        }else if(storeType == 2){
           return true
-        }else if(storeType == 3 && certifyStatus>2) {
+        }else if(storeType == 3){
+          if(Number(certifyStatus) == 1 || Number(certifyStatus) == 3){
+            return true;
+          }else{
+            return  false;
+          }
+        }else{
+          return  false;
+        }
+      },
+      checkBills(row) {
+        const {storeType, certifyStatus} = row.tradeStore;
+        if(storeType == 1 && Number(certifyStatus) !== 3){
           return false;
+        }else{
+          return true;
         }
-      }
+      },
+      checkSpe(row) {
+        const {storeType, certifyStatus} = row.tradeStore;
+        if(storeType == 1 && Number(certifyStatus) == 3){
+          return true;
+        }else if(storeType == 2){
+          return true;
+        }else{
+          return false;
+        }
+      },
     },
     filters: {
       storeTypeFormat: function(value){