1

mer_mer_admin/src/views/order/components/orderDetail.vue

@@ -99,13 +99,17 @@
                   <div class="lang">商户优惠金额：</div>
                   <div class="value">{{ orderDatalist.merCouponPrice || '0.0' }}</div>
                 </li>
+				<li class="item" v-show="orderDatalist.firstDeducPrice>0">
+				  <div class="lang">首单立减：</div>
+				  <div class="value">{{ orderDatalist.firstDeducPrice || '0.0' }}</div>
+				</li>						
                 <li class="item">
                   <div class="lang">会员抵扣金额：</div>
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
                   <div class="lang">支付配送费：</div>
-                  <div class="value">{{ orderDatalist.payPostage }}</div>
+                  <div class="value">{{ orderDatalist.payPostage==0?'商家承担('+(0.8)+')':orderDatalist.payPostage }}</div>
                 </li>
 				<li class="item">
 				  <div class="lang">支付打包费：</div>

mer_plat_admin/src/components/OrderDetail/index.vue

@@ -105,14 +105,18 @@
                   <div class="lang">会员抵扣金额：</div>
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
+				<li class="item" v-show="orderDatalist.firstDeducPrice>0">
+				  <div class="lang">首单立减：</div>
+				  <div class="value">{{ orderDatalist.firstDeducPrice || '0.0' }}</div>
+				</li>							
                 <li class="item">
                   <div class="lang">支付配送费：</div>
-                  <div class="value">{{ orderDatalist.payPostage }}</div>
+                  <div class="value">{{ orderDatalist.payPostage==0?'商家承担('+(0.8)+')':orderDatalist.payPostage }}</div>
                 </li>
 				<li class="item">
-				  <div class="lang">支付打包费：</div>
-				  <div class="value">{{ orderDatalist.packingFee }}</div>
-				</li>
+					<div class="lang">支付打包费：</div>
+					<div class="value">{{ orderDatalist.packingFee }}</div>
+				</li>				
                 <li class="item">
                   <div class="lang">赠送积分：</div>
                   <div class="value">{{ orderDatalist.gainIntegral }}</div>