1

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

@@ -513,7 +513,7 @@
               <ul class="list">
                 <li class="item">
                   <div class="lang">配送方式：</div>
-                  <div class="value">{{ refundInfo.orderInfoVo.shippingType === 1 ? '商家配送' : '到店自提' }}</div>
+                   <div class="value">{{ refundInfo.orderInfoVo.shippingType === 1 ? '商家配送' :(refundInfo.orderInfoVo.shippingType === 2? '到店自提':'外卖配送' ) }}</div>
                 </li>
                 <li class="item">
                   <div class="lang">收货电话：</div>

mer_mer_admin/src/views/order/orderSend.vue

@@ -13,6 +13,7 @@
           <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>

mer_mer_admin/src/views/product/creatProduct/index.vue

@@ -406,6 +406,7 @@
             <el-checkbox-group v-model="formValidate.deliveryMethodList" :disabled="isDisabled">
               <el-checkbox label="1">商家配送</el-checkbox>
               <el-checkbox label="2">到店自提</el-checkbox>
+			  <el-checkbox label="3">外卖配送</el-checkbox>
             </el-checkbox-group>
             <div class="from-tips mb5">
               请先配置店铺地址之后，再开启到店自提；若店铺统一关闭到店自提功能，商品配送方式选中到店自提，用户购买不支持到店自提！