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

src/views/ecw/order/detail.vue

@@ -43,7 +43,7 @@
       </el-row>
       <el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('付款人')">
-         
+
           <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">自定义</el-link>
           <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
         </el-descriptions-item>
@@ -273,7 +273,7 @@
         <el-col :span="12">
           <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
           <div v-for="item in feeDetail.freight">
-            {{item.label}}: {{item.value}} 
+            {{item.label}}: {{item.value}}
             <template v-if="item.currency">
               {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
             </template>
@@ -425,7 +425,8 @@ export default {
         {field: 'liquidFreightPrice', label: this.$t('液体加价')},
         {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
         {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
-        {field: 'plainCommission', label: this.$t('明佣')}
+        {field: 'plainCommission', label: this.$t('明佣')},
+        {field: 'hiddenCommission', label: this.$t('暗佣')}
       ]
 
       // 品牌加价
@@ -477,7 +478,7 @@ export default {
           })
         }
       })
-    
+
 
       freight.push({
         label: '价格更新时间',