Merge branch 'feature/dmx' into 'testing/inspect'

Feature/dmx

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

src/views/shop/create-shop.vue

@@ -1179,7 +1179,7 @@
               <el-form-item label="送检地址管理" class="warehouseAdress-wrap" v-if="formData.storeType < 3">
                 <p class="warehouseAdress-tip">(该地址用于机构回寄样本地址，请准确填写)</p>
                 <el-button type="success" class="warehouseAdress-add" size="small" @click="createDetectionAdress(0)">+新增地址</el-button>
-                <div class="detectionAddress" v-show="Object.keys(formData.tradeStoreDetectionAddress).length">
+                <div class="detectionAddress" v-if="formData.tradeStoreDetectionAddress && formData.tradeStoreDetectionAddress.receiverMobile">
                   <div class="warehouseAdress-item">
                 <span class="warehouseAdress-main">
                 <span class="warehouseAdress-msg">{{formData.tradeStoreDetectionAddress.receiver}}</span>
@@ -1864,14 +1864,13 @@ export default {
         storeOwner,
         storePhone,
         storeQualityUrl,
-        tradeStoreDetectionAddress
       } = this.storeData.tradeStore;
       this.formData.storeLogo = storeLogo;
       this.formData.storeName = storeName;
       this.formData.storeQualityUrl=storeQualityUrl;
       this.formData.storeDescription = storeDescription;
       this.formData.storeType = storeType;
-      this.formData.tradeStoreDetectionAddress = this.storeData.tradeStoreDetectionAddress
+      this.formData.tradeStoreDetectionAddress = this.storeData.tradeStoreDetectionAddress || {}
       if (storeType == 1) {
         this.formData.compainName = storeOwner;
         this.formData.phoneNum = storePhone;