1

mer_plat_admin/src/components/OrderDetail/index.vue

@@ -106,9 +106,13 @@
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">{{ orderDatalist.payPostage }}</div>
                 </li>
+				<li class="item">
+				  <div class="lang">支付打包费：</div>
+				  <div class="value">{{ orderDatalist.packingFee }}</div>
+				</li>
                 <li class="item">
                   <div class="lang">赠送积分：</div>
                   <div class="value">{{ orderDatalist.gainIntegral }}</div>
@@ -251,6 +255,11 @@
                         <span>{{ item.deliveryCarrier + '：' + item.carrierPhone }}</span>
                         <span class="ml30">{{ item.createTime }}</span>
                       </template>
+					  <template v-else-if="item.deliveryType === 'takeout'">
+					    <span class="font-color">【骑手配送】</span>
+					    <span>{{ item.deliveryCarrier + '：' + item.carrierPhone }}</span>
+					    <span class="ml30">{{ item.createTime }}</span>
+					  </template>
                       <template v-else>
                         <span class="font-color"
                           >【{{

mer_plat_admin/src/components/productInfo/index.vue

@@ -129,13 +129,13 @@
                   <template v-else>
                     <div v-show="formValidate.deliveryMethod.includes('1')" style="color: #303133">商家配送</div>
                     <div
-                      v-show="formValidate.deliveryMethod.includes('1') && formValidate.deliveryMethod.includes('2')"
+                      v-show="formValidate.deliveryMethod.includes('1') && formValidate.deliveryMethod.includes('2')&& formValidate.deliveryMethod.includes('4')"
                       style="color: #303133"
                     >
                       、
                     </div>
                     <div v-show="formValidate.deliveryMethod.includes('2')" style="color: #303133">到店自提</div>
-					<div v-show="formValidate.deliveryMethod.includes('3')" style="color: #303133">外卖配送</div>
+					<div v-show="formValidate.deliveryMethod.includes('4')" style="color: #303133">骑手配送</div>
                   </template>
                 </li>
               </ul>

mer_plat_admin/src/filters/order.js

@@ -119,6 +119,7 @@ export function shippingTypeFilter(status) {
     1: '商家配送',
     2: '到店自提',
     3: '虚拟发货',
+	4: '骑手配送',
   };
   return statusMap[status];
 }

mer_plat_admin/src/views/express/components/orderDetail.vue

@@ -109,7 +109,7 @@
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">{{ orderDatalist.payPostage }}</div>
                 </li>
                 <li class="item">

mer_plat_admin/src/views/finance/statement/index.vue

@@ -145,6 +145,12 @@
                         <span class="cost_num">{{ accountDetails.payNum }}笔</span>
                       </el-col>
                     </el-row>
+					<!-- <el-row class="item mb20">
+					  <el-col :span="13" class="name">打包费</el-col>
+					  <el-col :span="11" class="cost">
+					    <span class="cost_price">￥{{ accountDetails.platCouponPrice }}</span>
+					  </el-col>
+					</el-row> -->
                     <el-row class="item mb20">
                       <el-col :span="13" class="name">平台优惠券补贴</el-col>
                       <el-col :span="11" class="cost">
@@ -187,6 +193,7 @@
                     </el-col>
                   </el-row>
                 </el-card>
+				
               </div>
             </div>
             <el-divider direction="vertical" />
@@ -260,20 +267,20 @@
                 </el-card>
                 <el-card body-style="background-color: #F9F9F9;padding: 20px 15px;" shadow="never" :bordered="false">
                   <div slot="header" class="acea-row row-between-wrapper">
-                    <span class="header_title">运费</span>
+                    <span class="header_title">骑手配送费</span>
                     <div class="card_title">
                       {{ Number(accountDetails.freight) >= 0 ? '' : '-' }}
                       ￥{{ Math.abs(accountDetails.freight) }}
                     </div>
                   </div>
                   <el-row class="item mb20">
-                    <el-col :span="13" class="name">支付运费</el-col>
+                    <el-col :span="13" class="name">支付配送费</el-col>
                     <el-col :span="11" class="cost">
                       <span class="cost_price">￥{{ accountDetails.freightFee }}</span>
                     </el-col>
                   </el-row>
                   <el-row class="item">
-                    <el-col :span="13" class="name">退还运费</el-col>
+                    <el-col :span="13" class="name">退还配送费</el-col>
                     <el-col :span="11" class="cost">
                       <span class="cost_price">-￥{{ accountDetails.refundFreightFee }}</span>
                     </el-col>

mer_plat_admin/src/views/order/components/refundOrderDetail.vue

@@ -573,9 +573,13 @@
                   <div class="value">￥{{ refundInfo.orderInfoVo.svipDiscountPrice || 0 }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">￥{{ refundInfo.orderInfoVo.payPostage }}</div>
                 </li>
+				<li class="item">
+				  <div class="lang">支付打包费：</div>
+				  <div class="value">￥{{ refundInfo.orderInfoVo.packingFee }}</div>
+				</li>
                 <li class="item">
                   <div class="lang">积分抵扣金额：</div>
                   <div class="value">￥{{ refundInfo.orderInfoVo.integralPrice }}</div>

mer_plat_admin/src/views/secondhand/order/components/orderDetail.vue

@@ -106,7 +106,7 @@
                   <div class="value">{{ orderDatalist.svipDiscountPrice || '0.0' }}</div>
                 </li>
                 <li class="item">
-                  <div class="lang">支付邮费：</div>
+                  <div class="lang">支付配送费：</div>
                   <div class="value">{{ orderDatalist.payPostage }}</div>
                 </li>
                 <li class="item">

mer_plat_admin/src/views/systemSetting/prefernMeasure/basicSettings/index.vue

@@ -206,7 +206,7 @@ export default {
     },
     handlerOpenDel(rowData) {
       this.$modalSure('删除优惠措施吗？').then(() => {
-        measure.prefernTypeDeleteApi(rowData.id).then((data) => {
+        measure.merchantMeasuresDeleteApi(rowData.id).then((data) => {
           this.$message.success('删除优惠措施成功');
           this.getList();
           //this.$store.commit('product/SET_MerchantMeasures', []);