Merge branch 'feature/order_edit' into release

src/views/jiedao/profile/delivery.vue

@@ -38,7 +38,7 @@
       </section-title>
 
       <!--收货人-->
-      <el-row :gutter="20" style="margin-top: 30px">
+      <el-row :gutter="20" style="margin-top: 30px" v-if="hasConsignee">
         <el-col :span="12">
           <el-form-item
             :label="$t('名称')"
@@ -93,7 +93,7 @@
         </el-col>
       </el-row>
 
-      <el-row :gutter="5" v-if="showFullConsignee">
+      <el-row :gutter="5" v-if="showFullConsignee && hasConsignee">
         <el-col :span="6">
           <el-form-item
               :label="$t('orderdetail.consigneeNameEn')"
@@ -139,7 +139,7 @@
         </el-col>
       </el-row>
 
-      <el-card>
+      <el-card style="margin-top:20px;">
         <template #header>
           <section-title :title="$t('运输')"></section-title>
         </template>