1

mer_uniapp/pages/goods/order_confirm/index.vue

@@ -99,12 +99,12 @@
 						<view class='item acea-row row-between-wrapper'>
 							<view>配送方式</view>
 							<view v-if="item.deliveryMethodMer && item.deliveryMethodMer.length===3 && item.takeTheirSwitch" class='discount acea-row row-middle'>
-								<text @tap="openShowBox(item,index)">{{item.shippingType === 1 ? '配送' : item.shippingType === 2 ? '自提' : '骑手配送'}}</text>
+								<text @tap="openShowBox(item,index)">{{item.shippingType === 1 ? '商家配送' : item.shippingType === 2 ? '到店自提' : '骑手配送'}}</text>
 
 								<text @tap="openShowBox(item,index)" class='iconfont icon-jiantou'></text>
 							</view>
 							<view v-else class='discount'>
-								{{item.shippingType === 1 ? '配送' : item.shippingType === 2 ? '自提' : '骑手配送'}}
+								{{item.shippingType === 1 ? '商家配送' : item.shippingType === 2 ? '到店自提' : '骑手配送'}}
 							</view>
 						</view>
 						<view v-if="item.shippingType == 2 && item.takeTheirSwitch" class="store-address acea-row">
@@ -118,14 +118,14 @@
 							</view>
 						</view>
 					</view>
-					<view v-show="(item.shippingType === 1 || item.shippingType === 3) && !orderType" class='item acea-row row-between-wrapper'>
-						<view>打包费</view>
-						<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免打包费</view>
+					<view v-show="(item.shippingType === 1 || item.shippingType === 3|| item.shippingType === 4) && !orderType" class='item acea-row row-between-wrapper'>
+						<view><text v-if="item.shippingType === 4 || item.shippingType === 1">打包费</text></view>
+						<view v-if='(!item.packingFee || item.packingFee == 0)&& (item.shippingType === 4 || item.shippingType === 1)' class="noCoupon">免打包费</view>
 						<view v-else class='money'>￥{{item.packingFee}}</view>
 					</view>
-					<view v-show="item.shippingType === 3" class='item acea-row row-between-wrapper'>
-						<view>配送费</view>
-						<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免配送费</view>
+					<view v-show="item.shippingType === 3 || item.shippingType === 4" class='item acea-row row-between-wrapper'>
+						<view><text v-if="item.shippingType === 3">运输费</text><text v-else>配送费</text></view>
+						<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon"><text v-if="item.shippingType === 3">免运输费</text><text v-else>免配送费</text></view>
 						<view v-else class='money'>￥{{item.freightFee}}</view>
 					</view>
 					<view v-show="item.shippingType === 1 && Number(orderInfoVo.secondType)===0" class='item acea-row row-between-wrapper'>
@@ -165,7 +165,7 @@
 					</view>
 					<view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFee) > 0">
 						<view>运费：</view>
-						<view class='money'>+￥{{orderInfoVo.freightFee}}</view>
+						<view class='money'>￥{{orderInfoVo.freightFee}}</view>
 					</view>
 					<view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2 && !orderType" class='item acea-row row-between-wrapper'>
 						<view>会员优惠</view>

mer_uniapp/pages/goods/order_details/index.vue

@@ -20,7 +20,7 @@
 			</view>
 
 			<view class="borderPad" style="margin: -100rpx auto 0 auto;">
-				<view v-if="orderInfo.status!==9 && (shippingType ===1 || shippingType ===3) && orderInfo.refundStatus !== 3" class='nav'>
+				<view v-if="orderInfo.status!==9 && (shippingType ===1 || shippingType ===3|| shippingType ===4) && orderInfo.refundStatus !== 3" class='nav'>
 					<view class='navCon acea-row row-between-wrapper'>
 						<view :class="orderInfo.status == 0 ?'on':''">待付款</view>
 						<view :class="orderInfo.status == 1 ? 'on':''"><text v-if="!orderType">待取餐</text><text v-else>待发货</text></view>
@@ -137,7 +137,7 @@
 								<view>配送方式：</view>
 								<view v-if="Number(orderInfo.secondType) > 4" class='conter'>自动发货</view>
 								<view v-else-if="Number(orderInfo.secondType) === 2" class='conter'>虚拟发货</view>
-								<view v-else class='conter'>{{item.shippingType ==1 ? '配送': '自提'}}</view>
+								<view v-else class='conter'>{{item.shippingType ==1 ? '商家配送':(item.shippingType ==4?'骑手配送':'自提') }}</view>
 							</view>
 						</view>
 						<view class='flex justify-between userRemarkBox'>
@@ -249,7 +249,7 @@
 						<view v-else class='conter'>￥{{orderInfo.proTotalPrice || 0}}</view>
 					</view>
 					<view class='item acea-row row-between' v-if="orderInfo.payPostage > 0">
-						<view>运费：</view>
+						<view><text v-if="shippingType==4">配送费：</text><text v-else>运费：</text></view>
 						<view class='conter'>￥{{orderInfo.payPostage || 0}}</view>
 					</view>
 					<view class='item acea-row row-between' v-if='orderInfo.svipDiscountPrice > 0'>
@@ -438,7 +438,7 @@
 				theme: app.globalData.theme,
 				bgColor: '#e93323',
 				userAddress: [],
-				shippingType: 1,
+				shippingType: 4,
 				statusPic: '',
 				isUserAddress: false, //是否只显示一次收货地址
 				ProductMarketingTypeEnum: ProductMarketingTypeEnum,

mer_uniapp/pages/goods/send_record/index.vue

@@ -22,17 +22,17 @@
 			<view class="info-box">
 				<view class="item acea-row row-between">
 					<view>发货方式</view>
-					<view>{{deliveryInfo.deliveryType=='merchant'?'商家送货':'无需发货'}}</view>
+					<view>{{deliveryInfo.deliveryType=='merchant'?'商家送货':(deliveryInfo.deliveryType=='takeout'?'骑手配送':'无需发货')}}</view>
 				</view>
 				<view class="item acea-row row-between" v-if="deliveryInfo.deliveryType=='noNeed'">
 					<view>发货备注</view>
 					<view class="text-width wrap-normal">{{deliveryInfo.deliveryMark}}</view>
 				</view>
-				<view class="item acea-row row-between" v-if="deliveryInfo.deliveryType=='merchant'">
+				<view class="item acea-row row-between" v-if="deliveryInfo.deliveryType=='merchant' || deliveryInfo.deliveryType=='takeout'">
 					<view>配送人员</view>
 					<view>{{deliveryInfo.deliveryCarrier}}</view>
 				</view>
-				<view class="item acea-row row-between" v-if="deliveryInfo.deliveryType=='merchant'">
+				<view class="item acea-row row-between" v-if="deliveryInfo.deliveryType=='merchant' || deliveryInfo.deliveryType=='takeout'">
 					<view>手机号码</view>
 					<view>{{deliveryInfo.carrierPhone}}</view>
 				</view>

mer_uniapp/pages/rider_index/order/detail.vue

@@ -12,10 +12,10 @@
 		<view class="order-detail pos-order-details">
 			<view class="header">
 				<view class="state">{{ info.refundStatus != 3?orderStatus[info.status]:'已退款' }}</view>
-				<view v-if="[1,2].includes(info.status)&&info.refundStatus != 3" class="data">用户已下单，请及时发货哦～</view>
-				<view v-if="info.refundStatus != 3&&info.status == 4" class="data">货物正在运输中，等待用户确认收货！</view>
-				<view v-if="info.refundStatus != 3&&info.status == 3" class="data">用户已下单，您可以联系用户到店自提！</view>
-				<view v-if="info.refundStatus != 3&&info.status == 5" class="data">用户已经确认收货啦，您可以联系用户索要好评呦！</view>
+				<view v-if="[1,2].includes(info.status)&&info.refundStatus != 3" class="data">您已接单，请及时到店取货哦～</view>
+<!-- 				<view v-if="info.refundStatus != 3&&info.status == 3" class="data">用户已下单，您可以联系用户到店自提！</view>
+ -->				<view v-if="info.refundStatus != 3&&info.status == 4" class="data">订单配送中，正在努力赶往用户所在地！</view>
+				<view v-if="info.refundStatus != 3&&info.status == 5" class="data">订单已送达，等待用户收货确认！</view>
 				<view v-if="info.refundStatus != 3&&info.status == 6" class="data">订单已经完成，您可以提现啦～</view>
 				<view v-if="info.refundStatus == 3" class="data">此订单退款已原路返回！</view>
 			</view>
@@ -251,7 +251,7 @@
 					'alipay': '支付宝支付',
 					'alipayApp': '支付宝App支付'
 				},
-				orderStatus: ['待支付', '待发货', '部分发货', '待核销', '待收货', '已收货', '已完成', '已取消'],
+				orderStatus: ['待支付', '待取餐', '部分发货', '待核销', '配送中', '已送达', '已完成', '已取消'],
 				openErp: false,
 				giveData: {
 					give_integral: 0,

mer_uniapp/pages/rider_index/order/index.vue

@@ -127,14 +127,15 @@
 						</view>
 						<view class="acea-row row-middle">
 							<view v-if="item.status==1 || item.status==2"  @click="cancel(item)" class="bnt on acea-row row-center-wrapper">取消订单</view>
-							<view v-if="item.status==1 && item.merPhone !=null" @click="makePhoneCall(item.merPhone )"  class="bnt on acea-row row-center-wrapper">联系驿站</view>
+							<view v-if="item.status==1 && item.merPhone !=null" @click="makePhoneCall(item.merPhone )"  class="bnt on acea-row row-center-wrapper">
+								<text v-if="searchListData.type==1">联系驿站</text><text v-if="searchListData.type==0">联系商家</text></view>
 							<view v-if="item.status==2 && item.userPhone!=null"  @click="makePhoneCall(item.userPhone )" class="bnt on acea-row row-center-wrapper">联系客户</view>
 							<view class="bnt primary" v-if="item.status==0" 
 								@click="receiving(item)">接单
 							</view>
 							<view class="bnt primary" v-if="item.status==1"
-								@click="pickUp(item)">取件配送
-							</view>
+								@click="pickUp(item)"><text v-if="searchListData.type==1">取件配送</text><text v-if="searchListData.type==0">取货配送</text>
+							</view> 
 							<view class="bnt primary" v-if="item.status==2"
 								@click="complete(item)">送达完成
 							</view>

mer_uniapp/pages/user/index.vue

@@ -506,10 +506,10 @@
 							case '待付款':
 								item.num = res.data.awaitPayCount
 								break
-							case '待发货':
+							case '待取餐':
 								item.num = res.data.awaitShippedCount
 								break
-							case '待收货':
+							case '配送中':
 								item.num = res.data.receiptCount
 								break
 							case '待核销':