1

mer_mer_admin/src/filters/order.js

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

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

@@ -249,6 +249,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_mer_admin/src/views/order/orderSend.vue

@@ -10,10 +10,10 @@
     <el-form v-if="modals" ref="formItem" :model="formItem" label-width="95px" @submit.native.prevent :rules="rules">
       <el-form-item v-show="secondType !== OrderSecondTypeEnum.Fictitious" label="配送方式：" prop="deliveryType">
         <el-radio-group v-model="formItem.deliveryType" @change="changeRadio(formItem.deliveryType)" v-removeAriaHidden>
+		  <el-radio label="takeout">外卖配送</el-radio>
+		  <el-radio label="merchant">商家送货</el-radio>
           <el-radio label="express">快递配送</el-radio>
           <el-radio label="noNeed">无需发货</el-radio>
-          <el-radio label="merchant">商家送货</el-radio>
-		  <el-radio label="takeout">外卖配送</el-radio>
         </el-radio-group>
       </el-form-item>
       <SendFrom :formItem="formItem" :isShowBtn="true"></SendFrom>
@@ -111,7 +111,7 @@ import { useLogistics } from '@/hooks/use-order';
 import { postRules } from '@/views/order/default';
 import { OrderSecondTypeEnum } from '@/enums/productEnums';
 const defaultObj = {
-  deliveryType: 'express',
+  deliveryType: 'takeout',
   isSplit: false,
   deliveryMark: '',
   carrierPhone: '',