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 ? '商家配送' :(refundInfo.orderInfoVo.shippingType === 2? '到店自提':'外卖配送' ) }}</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/product/creatProduct/index.vue

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