Merge branch 'feature/zl' into 'develop'

save

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

src/views/shop/create-shop.vue

@@ -11,7 +11,7 @@
             <span>
                {{curmbSecond}}
             </span>
-            <span v-if="certifyStatus > 1" class="verify-status" style="margin-left: 20px">{{ certifyStatus | storeStatusFormat}}</span>
+            <span v-if="certifyStatus > 1" class="verify-status" :class="certifyStatusColor"  style="margin-left: 20px">{{ certifyStatus | storeStatusFormat}}</span>
           </p>
         </el-col>
         <el-col :span="4" style="text-align: right">
@@ -1658,6 +1658,9 @@ export default {
     };
   },
   computed: {
+    certifyStatusColor () {
+      return `certifyStatusColor${this.certifyStatus}`;
+    }
   },
   watch: {
     "formData.certifyReq.bizScope": {
@@ -1741,7 +1744,8 @@ export default {
       const {certifyLicenseImgList, certifyReportImgList} = this.formData.certifyReq;
       this.formData.imgUrlC1Date = [licenseValidDateBegin, licenseValidDateEnd];
       this.formData.imgUrlC5Date = [assignorValidDateBegin, assignorValidDateEnd];
-      this.formData.imgUrlC5Date = [legalValidDateBegin, legalValidDateEnd];
+      this.formData.imgUrlC3Date = [legalValidDateBegin, legalValidDateEnd];
+      // imgUrlC3Date
       (certifyReportImgList || []).concat(certifyLicenseImgList).map(i => {
         const n = `imgUrlP${i.imageType}Date`;
         const m = `imgUrlP${i.imageType}`;
@@ -2452,6 +2456,7 @@ export default {
     },
     //新增管理员
     addItem(index) {
+      if(this.disabledFORM){return false;}
       if (
         this.formData.adminList != null &&
         this.formData.adminList.length >= 5
@@ -2468,6 +2473,7 @@ export default {
     },
     //删除管理员
     deleteItem(index) {
+      if(this.disabledFORM){return false;}
       if (this.formData.adminList.length == 1 && index == 0) {
         this.$message.warning("最少需要1位管理员哦！");
         return;
@@ -3108,5 +3114,15 @@ export default {
        color: #606266;
      }
    }
+  .certifyStatusColor4{
+    color: #FF4B33;
+  }
+  .certifyStatusColor2{
+    color: #FF720C;
+  }
+  .certifyStatusColor3{
+    color: #f6ffed;
+  }
+
 }
 </style>

src/views/shop/shop-list.vue

@@ -111,16 +111,15 @@
         </el-table-column>
         <el-table-column prop="storeType" label="审核状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span :class="scope.row.tradeStore.certifyStatus == 3 ? 'red' : 'green'">
+            <span :class="scope.row.tradeStore.certifyStatus == 4 ? 'red' : 'green'">
               {{ scope.row.tradeStore.certifyStatus | storeStatusFormat}}
             </span>
             <el-popover
               placement="top-start"
-              title="标题"
               width="200"
               trigger="hover"
               :content="certificateInfoRespContent(scope.row.certificateInfoResp)">
-              <i v-if="scope.row.tradeStore.certifyStatus == 3"  slot="reference" class="el-icon-warning-outline red"></i>
+              <i v-if="scope.row.tradeStore.certifyStatus == 4"  slot="reference" class="el-icon-warning-outline red"></i>
             </el-popover>
 
           </template>
@@ -658,8 +657,9 @@
       },
       certificateInfoRespContent (c) {
         let v ='';
-        if( c && c.length > 0) {
-            c.map( (i, j)=> {
+        const b = c ? c.certifyValidDtoList : [];
+        if( b.length > 0) {
+            b.map( (i, j)=> {
               if(j <= 3){
                 v = v + i.refuseContent;
               }