Merge branch 'feature/6月迭代-抖音' into test

src/components/allCustomers/customerDetail.vue

@@ -515,19 +515,19 @@
                   </el-tooltip>
                 </el-descriptions-item>
                 <el-descriptions-item label="协管门店">
-                  <div class="assist-store-list">
+                  <!-- <div class="assist-store-list"> -->
                     <template v-for="(item,index) in member.shopNames">
                       <span v-if="index>0" :key="item" class="vertical-line" />
-                      <p :key="item" class="store-name">
+                      <span :key="item">
                         {{ item.storeName }}
-                      </p>
+                      </span>
                     </template>
                     <el-tooltip v-if="$getButtonLimit($buttonCode.memberEditStore)" class="item" effect="dark" open-delay="200" content="修改协管门店"
                       placement="top-start">
                       <span :limit-code="$buttonCode.memberEditStore" class="edit-span" @click="subStoreDialogVisible=true"><i
                           class="el-icon-edit" /></span>
                     </el-tooltip>
-                  </div>
+                  <!-- </div> -->
                 </el-descriptions-item>
               </el-descriptions>
             </div>

src/components/allCustomers/order-list/order-table.vue

@@ -150,13 +150,13 @@
                 <div class="order-descript-label">
                   <div class="order-descript-label-text">收件人</div>：
                 </div>
-                <div class="order-descript-content">{{ el.receiverName }}</div>
+                <div class="order-descript-content">{{ el.receiverName || '--' }}</div>
               </div>
               <div class="order-descript-item">
                 <div class="order-descript-label">
                   <div class="order-descript-label-text">手机号</div>：
                 </div>
-                <div class="order-descript-content">{{ el.phoneNumber }}</div>
+                <div class="order-descript-content">{{ el.phoneNumber || '--' }}</div>
               </div>
               <div class="order-descript-item">
                 <div class="order-descript-label">
@@ -278,8 +278,12 @@ export default {
     },
     getSKU(data) {
       if (typeof data != 'string') return '';
-      const sku = JSON.parse(data);
-      return sku.map(el => el.value).join('；')
+      let result = data;
+      try {
+        const sku = JSON.parse(data);
+        result = sku.map(el => el.value).join('；');
+      } catch (e) {}
+      return result;
     },
     getTableData() {
       const { memberId, pageSize, currentPage, orderType, channelType, dateRange, orderNumber } = this.params;