优化订单详情

src/views/jiedao/profile/orderdetail.vue

@@ -39,23 +39,28 @@
             <span style="color:#409EFF;margin-left:100px;font-size:16px" @click="consigneeChange">{{ consigneeText }}</span>
           </div>
           <el-descriptions class="margin-top" border :column="2" :content-style="{width:'130px'}">
-            <el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:150px">{{ order.consigneeVO.name }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:150px">+{{ order.consigneeVO.countryCode }} {{ order.consigneeVO.phone }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:150px">{{ consigneeVO.name }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:150px">
+              <template v-if="consigneeVO.countryCode">
+                +{{ consigneeVO.countryCode }}
+              </template>
+              {{ consigneeVO.phone }}
+            </el-descriptions-item>
           </el-descriptions>
           <el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}">
-            <el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:150px">{{order.consigneeVO?(order.consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:150px">{{consigneeVO?(consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item>
             <el-descriptions-item :label="$t('delivery.deliveryaddress')" label-style="width:150px">{{ addressName }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{order.consigneeVO?order.consigneeVO.address:''}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{consigneeVO?consigneeVO.address:''}}</el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="showMore" border :column="3" :content-style="{width:'130px'}">
-            <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ order.consigneeVO.nameEn }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ consigneeVO.nameEn }}</el-descriptions-item>
             <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px">
-              {{ order.consigneeVO.company }}
+              {{ consigneeVO.company }}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px">
-              {{ order.consigneeVO.companyEn }}
+              {{ consigneeVO.companyEn }}
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ order.consigneeVO.email }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ consigneeVO.email }}</el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>
@@ -395,51 +400,9 @@ export default {
     getTime() {
       return (value) => parseTime(value) || ''
     },
-    /* getProSum(){
-      let data = {
-        num:0,
-        volume:0,
-        weight:0,
-        quantity:0,
-        worth:0,
-        washouseNum:0,
-        washouseVolume:0,
-        washouseWeight:0,
-        washouseQuantity:0
-      }
-      if(this.order&&this.order.orderItemVOList.length>0){
-        this.order.orderItemVOList.forEach(item=>{
-            if(item.num){
-              data.num += item.num
-            }
-            if(item.volume){
-              data.volume += item.volume
-            }
-            if(item.weight){
-              data.weight += item.weight
-            }
-            if(item.quantity){
-              data.quantity += item.quantity
-            }
-            if(item.worth){
-              data.worth += item.worth
-            }
-            if(item.warehouseInInfoVO&&item.warehouseInInfoVO.cartonsNum){
-              data.washouseNum += item.washouseNum
-            }
-            if(item.warehouseInInfoVO&&item.warehouseInInfoVO.volume){
-              data.washouseVolume += item.washouseVolume
-            }
-            if(item.warehouseInInfoVO&&item.warehouseInInfoVO.weight){
-              data.washouseWeight += item.washouseWeight
-            }
-            if(item.warehouseInInfoVO&&item.warehouseInInfoVO.quantityAll){
-              data.washouseQuantity += item.washouseQuantity
-            }
-        })
+    consigneeVO(){
+      return this.order.consigneeVO || {}
     }
-      return data
-    } */
   },
   created() {
     getCurrencyList().then(res => {