1

mer_uniapp/filters/commFilter.js

@@ -163,7 +163,7 @@ export function orderExpressTipsStatusFilter(status) {
 		0: '待支付，若有异议，请联系平台处理。',
 		1: '等待快递员接单，请耐心等待',
 		2: '快递员已接单，正在为您配送',
-		3: '递员正在为您配送，若您已收到快递请您尽快确认!',
+		3: '快递员正在为您配送，若您已收到快递请您尽快确认!',
 		4: '配送完成，若对此订单存在疑问，请联系平台协商处理!',
 	}
 	return statusMap[status]

mer_uniapp/pages/rider_index/components/footerPage/index.vue

@@ -53,7 +53,7 @@
 						iconPath: require("../../static/shh.png"),
 						selectedIconPath: require("../../static/shl.png"),
 						text: "提现",
-						role: '3'
+						role: '2'
 					}
 					// {
 					// 	pagePath: "/pages/admin/goods/index",

mer_uniapp/pages/rider_index/express/detail.vue

@@ -68,7 +68,7 @@
 								</view>
 							</view>
 							<view>
-								<!-- <view class="fast-yz">134m</view> -->
+								<view class="fast-yz">配送费</view>
 								<view class="bg-color-cash">￥<text class="fast-cash">{{value.price}}</text></view>
 							</view>
 						</view>
@@ -76,7 +76,8 @@
 							<view v-if="value.remark">备注：{{value.remark}}</view>
 							<view class="flex-y-center" v-if="value.image" @tap="lookImg(value.image)">
 								<text>附图：</text>
-								<image style="width: 38rpx; height: 38rpx;" src="/static/img/ic-figure.png"></image>
+								<!-- <image style="width: 38rpx; height: 38rpx;" src="/static/img/ic-figure.png"></image> -->
+								<image :src="value.image" style="width: 58rpx; height: 58rpx;"></image>
 							</view>
 						</view>
 					</view>
@@ -244,6 +245,12 @@
 			// #endif
 		},
 		methods: {
+			lookImg(url) {
+				uni.previewImage({
+					current: url, //  传 Number H5端出现不兼容
+					urls: [url]
+				});
+			},
 			hsPopupClose() {
 				this.$refs.hs_popup.close()
 			},

mer_uniapp/pages/rider_index/order/index.vue

@@ -76,14 +76,14 @@
 						</view>
 					</view>
 					<view class="pos-order-goods">
-						<view class="goods acea-row" @click="toDetail(item)">
+						<view class="goods acea-row">
 							<!-- <scroll-view class="picTxt scroll-view" scroll-x="true"
 								v-if="item.infoResponseList.length > 1">
 								<view class="pictrue" v-for="(val, key) in item.infoResponseList" :key="key">
 									<image :src="val.image" />
 								</view>
 							</scroll-view> -->
-							<view class="picTxt">
+							<view class="picTxt"  @click="toDetail(item)">
 								<view class="acea-row" >
 									 <view class="order-content">
 									 	<view class="bold-size flex-y-center" style="padding: 10rpx 0;">
@@ -127,13 +127,13 @@
 						</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"  class="bnt on acea-row row-center-wrapper">联系商家</view>
-							<view v-if="item.status==2"  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==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)">取货配送
+								@click="pickUp(item)">取件配送
 							</view>
 							<view class="bnt primary" v-if="item.status==2"
 								@click="complete(item)">送达完成
@@ -336,6 +336,19 @@
 			}
 		},
 		methods: {
+			// 拨打电话
+			makePhoneCall(phone) {
+				const phoneNumber = phone; // 替换为的电话号码
+				uni.makePhoneCall({
+					phoneNumber: phoneNumber,
+					success() {
+						console.log('拨打电话成功');
+					},
+					fail() {
+						console.log('拨打电话失败');
+					}
+				});
+			},
 			//订单表头数量
 			statusHeader() {
 				orderStatusNum(this.searchListData).then(res => {
@@ -370,7 +383,7 @@
 			},
 			toDetail(item) {
 				uni.navigateTo({
-					url: this.searchListData.type==1?`/pages/rider_index/express/detail?orderInfo=${JSON.stringify(item)}`:`/pages/rider_index/order/detail?orderInfo=${JSON.stringify(item)}`
+					url: (this.searchListData.type==1 || item.orderType==1)?`/pages/rider_index/express/detail?orderInfo=${JSON.stringify(item)}`:`/pages/rider_index/order/detail?orderInfo=${JSON.stringify(item)}`
 				})
 				
 				
@@ -471,7 +484,7 @@
 						 	this.getInitList();
 						 }, 50)
 						 return this.$util.Tips({
-						 	title: '取货完成，请尽快安排配送'
+						 	title: '取件完成，请尽快安排配送'
 						 })
 					 } else {
 					 	self.$util.Tips({

mer_uniapp/pages/rider_index/work/index.vue

@@ -174,7 +174,7 @@
 			 	 				</view>
 			 	 			</view>
 			 	 		</view>
-			 	 		<view class="">待取货</view>
+			 	 		<view class="">待取件</view>
 			 	 	</navigator>
 			 	 	<navigator url="/pages/rider_index/order/index?type=delivery&orderType=1" hover-class="none" class="item" >
 			 	 		<view class="img-box">

mer_uniapp/pages/substitute_fast_mail/my_fast_mail/index.vue

@@ -72,7 +72,7 @@
 									</view>
 								</view>
 								<view>
-									<!-- <view class="fast-yz">134m</view> -->
+									<view class="fast-yz">配送费</view>
 									<view class="bg-color-cash">￥<text class="fast-cash">{{value.price}}</text></view>
 								</view>
 							</view>
@@ -80,7 +80,7 @@
 								<view v-if="value.remark">备注：{{value.remark}}</view>
 								<view class="flex-y-center" v-if="value.image" @tap="lookImg(value.image)">
 									<text>附图：</text>
-									<image style="width: 38rpx; height: 38rpx;" src="/static/img/ic-figure.png"></image>
+									<image :src="value.image" style="width: 58rpx; height: 58rpx;"></image>
 								</view>
 							</view>
 						</view>
@@ -164,7 +164,7 @@
 		},
 		data() {
 			return {
-				orderStatus: ['待付款','待接单', '待收件', '配送中','已收件','已完成'],
+				orderStatus: ['待付款','待接单', '待取件', '配送中','待收件','已收件','已完成'],
 				urlDomain: this.$Cache.get("imgHost"),
 				theme: app.globalData.theme,
 				winHeight: 0,