Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/prepayDeal.vue

@@ -114,7 +114,15 @@
         </el-row>
         <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'||orderExceptionData.orderExceptionType!='goods_add_exception'">
           <el-form-item :label="$t('收费参数')+':'">
-            <span>{{shopData.num||0}}{{$t('箱')}} {{shopData.wvolume||0}}m³  {{shopData.vweight||0}}Kg  {{shopData.warehouseInInfoVO ? shopData.warehouseInInfoVO.quantityAll : shopData.quantity}}{{$t('个')}}</span>
+            <div v-if="shopData">
+              {{$t('{num}箱 {volume}m³ {weight}kg {quantity}个', {
+                num: shopData.num || 0,
+                volume: shopData.wvolume || 0,
+                weight: shopData.vweight || 0,
+                quantity: shopData.quantity || 0
+              })}}
+            </div>
+            <span v-else>{{orderData.sumNum||0}}{{$t('箱')}} {{orderData.wvolume||0}}m³  {{orderData.vweight||0}}Kg  {{orderData.warehouseInInfoVO ? orderData.warehouseInInfoVO.quantityAll : orderData.sumQuantity}}{{$t('个')}}</span>
           </el-form-item>
         </el-row>
         <el-row>

src/views/ecw/order/weightDeal.vue

@@ -59,7 +59,7 @@
               <span style="margin-right:10px">{{(orderData.sumWeight||0)+'kg  '}}</span>
               <span>{{(orderData.sumQuantity||0) +$t('个')}}</span>
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('收费参数')">
+            <el-descriptions-item :label="$t('收费数据')">
               <span style="margin-right:10px">{{(orderData.sumNum||0)+$t('箱')}}</span>
               <span style="margin-right:10px">{{(orderData.wvolume||0)+'m³  '}}</span>
               <span style="margin-right:10px">{{(orderData.vweight||0)+'kg  '}}</span>