Merge branch 'feature/zl' into 'release'

save

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

src/views/shop/create-shop.vue

@@ -106,7 +106,7 @@
                   ></el-input>
                   <span class="word-num"
                   >{{
-                      formData.storeDescription.replace(/\s+/g, "").length
+                      formData.storeDescription ? formData.storeDescription.replace(/\s+/g, "").length : ''
                     }}/400</span
                   >
                 </el-col>
@@ -1750,7 +1750,8 @@ export default {
       this.formData.imgUrlC5Date = [assignorValidDateBegin, assignorValidDateEnd];
       this.formData.imgUrlC3Date = [legalValidDateBegin, legalValidDateEnd];
       // imgUrlC3Date
-      (certifyReportImgList || []).concat(certifyLicenseImgList).map(i => {
+      const cl = certifyLicenseImgList || [];
+      (certifyReportImgList || []).concat(cl).map(i => {
         const n = `imgUrlP${i.imageType}Date`;
         const m = `imgUrlP${i.imageType}`;
         this.formData[n] = [i.validDateBegin, i.validDateEnd];