From 8286bd7f5a575053f076dc649ff6a108bed70727 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 18 Mar 2026 15:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package1/buyFood/buyFood.vue          |  23 +-
 package1/index/deliveryPersonList.vue | 312 +++++++++++++++++++++++++-
 package1/order/pendGroup.vue          |  12 +
 3 files changed, 343 insertions(+), 4 deletions(-)
 create mode 100644 package1/order/pendGroup.vue

diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index 319d0b5..61226c1 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -112,7 +112,7 @@
 						<view class="radio-no-check" @tap="checkVoucher('zhiding')" v-else></view>
 						指定配送员
 					</view>
-					<view style="width: 50%;color: #777;text-align: right;">
+					<view style="width: 50%;color: #777;text-align: right;" @tap="goDetail">
 						配送员
 						<uni-icons type="right" size="12"></uni-icons>
 					</view>
@@ -187,7 +187,7 @@
 			</view>
 			<view style="height:80px;"></view>
 			<view class="buy-bottom">
-				<view class="bottom-btn">
+				<view class="bottom-btn" @tap="submitPay">
 					立即支付
 				</view>
 			</view>
@@ -198,6 +198,14 @@
 				<address-list></address-list>
 			</view>
 		</uni-popup>
+		<!-- 警告弹出层 -->
+		<uni-popup ref="warnPopup" background-color="#fff">
+			<view class="warnImg">
+				<img v-if="warnPopup == 'shdz'" @tap="$refs.warnPopup.close()" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4996043b3987401794b974d359429b8e.png" alt="填写收货地址" style="width:300px;height:370px;" />
+				<img v-if="warnPopup == 'psyj'" @tap="$refs.warnPopup.close()" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/001cf760048b4718bdccd55085bef601.png" alt="填写配送佣金" style="width:300px;height:370px;" />
+				<img v-if="warnPopup == 'psy'" @tap="$refs.warnPopup.close()" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e10ad77ca478413a9c53918750ecb932.png" alt="指定配送员" style="width:300px;height:370px;" />
+			</view>
+		</uni-popup>
 		<delivery-time-op @timeCallback="timeCallback" :dodge="true" ref='model'
 			:content="content" :barHidth='600' title="选择送达时间">
 			> </delivery-time-op>
@@ -210,6 +218,7 @@
 	export default {
 		data() {
 			return {
+				warnPopup:'shdz',
 				isPaotui: true,
 				menuButtonInfo: {},
 				formData:{
@@ -233,6 +242,14 @@
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 		},
 		methods: {
+			submitPay(){
+				this.$refs.warnPopup.open()
+			},
+			goDetail(){
+				uni.navigateTo({
+					url:'/package1/index/deliveryPersonList'
+				})
+			},
 			openAddressBook(){
 				this.$refs.bookPopup.open('bottom')
 				
@@ -354,7 +371,7 @@
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
-		height: 22%;
+		height: 20%;
 	}
 
 	.title-sreach {
diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue
index ec45192..5521c71 100644
--- a/package1/index/deliveryPersonList.vue
+++ b/package1/index/deliveryPersonList.vue
@@ -1,9 +1,319 @@
 <template>
 	<!-- 配送员列表 -->
+	<view class="page1">
+		<view class="title">
+			<view class="title-sreach">
+				<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
+					<uni-icons type="left" size="28"></uni-icons>
+				</view>
+				<view class="title-name" :style="{'top': menuButtonInfo.top +'px'}">
+					选择配送员
+				</view>
+			</view>
+		</view>
+		<map id="map" :latitude="latitude" :longitude="longitude" :markers="markers" :polyline="polyline"
+			style="width: 95%;height: 150px;margin: 0 auto;border-radius: 10px;overflow: hidden;position: absolute;top: 110px;left: 2.5%;"></map>
+		<view class="title-sort">
+			<view class="sort-member">
+				<view @tap="searchShop('all','')">
+					交易保障 <text style="font-size: 20rpx;">▼</text>
+				</view>
+			</view>
+			<view class="sort-member">
+				<view @tap="searchShop('sale','')">
+					相同地址 <text style="font-size: 20rpx;">▼</text>
+				</view>
+			</view>
+			<view class="sort-member">
+				<view @tap="searchShop('score','')">
+					4星以上 <text style="font-size: 20rpx;">▼</text>
+				</view>
+			</view>
+			<view class="sort-member" style="position: relative;">
+				<view @tap="checkArea">
+					区域选择 <text style="font-size: 20rpx;">▼</text>
+				</view>
+				<view class="sort-value" v-if="isArea">
+					<view class="sort-value1" v-for="(item,index) in shopArea" :key="index"
+						@tap="searchShop('area',item.id)">{{item.title}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="man-box">
+			<view class="man-title">
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/801c569079da4540990c1cc634186fdd.png" alt=""
+					style="width: 60px;height: 60px;" />
+				<view class="man-title1">
+					<view class="man-title2">
+						<view class="man-name">
+							潘潘安
+						</view>
+						<view style="flex:1;">
+							<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d27fa14c6bb7426482ed7821919d3aa7.png"
+								alt="" style="width: 70px;height: 16px;margin-top: 9px;" />
+						</view>
+						<view class="man-type">
+							接单类型:跑腿单
+						</view>
+					</view>
+					<view class="man-rate">
+						<view class="shop-rate">
+							<view class="shop-rate-num">5</view>
+							<uni-rate :disabled="true" size="16" disabledColor="rgba(255, 184, 84, 1)" value="5" />
+						</view>
+						<view class="man-num">
+							平均配送时长 <text style="font-size: 15px;font-weight: 700;color: #000;">32</text>分钟
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="man-dingdan">
+				<view class="man-dingdan1">
+					当前待取 <text style="font-size:18px;font-weight:700;color: #000;">5</text>
+				</view>
+				<view class="man-dingdan1">
+					当前待送 <text style="font-size:18px;font-weight:700;color: #000;">2</text>
+				</view>
+				<view class="man-dingdan1">
+					当接单数 <text style="font-size:18px;font-weight:700;color: #000;">1</text>
+				</view>
+			</view>
+			<view class="man-mank">
+				备注:<text style="color: #000;">可接校外美食街；可代取快递，一件1元，3件2.5元，多取多优惠</text>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				isArea: false,
+				latitude: 39.909, // 默认纬度，可以设为用户当前位置或配送员位置
+				longitude: 116.39742, // 默认经度
+				markers: [], // 标记点，可以包括配送员位置和用户位置
+				polyline: [], // 路线，如果需要显示配送员路线
+				menuButtonInfo: {},
+				shopArea: [{
+					id: 0,
+					title: '跑腿单'
+				}, {
+					id: 0,
+					title: '外卖单'
+				}],
+			}
+		},
+		onLoad(option) {
+
+		},
+		onShow() {
+			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+		},
+		methods: {
+			searchShop(type, value) {
+				if (type == 'area') {
+					this.searchForm.shopArea = value
+				} else if (type == 'score') {
+					this.searchScore = !this.searchScore
+					this.searchSale = false
+					this.searchForm.sort = 'shopScore'
+				} else if (type == 'sale') {
+					this.searchSale = !this.searchSale
+					this.searchScore = false
+					this.searchForm.sort = 'saleCount'
+				} else if (type == 'all') {
+					this.searchForm.sortOrder = 'shoprank'
+					this.searchForm.orderOrder = 'desc'
+					this.searchForm.shopArea = ''
+					this.searchForm.sort = 'shoprank'
+					this.searchScore = false
+					this.searchScore = false
+					this.searchSale = false
+				} else if (type == 'typeUp') {
+					//TODO跳转新页面
+				}
+				this.getShopList();
+			},
+			checkArea() {
+				this.isArea = !this.isArea
+			},
+			back() {
+				uni.navigateBack()
+			}
+		}
+
+	}
 </script>
 
-<style>
+<style lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		background: #F5F8F5;
+		color: #00231C;
+	}
+
+	.page1 {
+		width: 100%;
+		height: 100%;
+		font-size: 24rpx;
+		position: relative;
+	}
+
+	.title {
+		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
+		width: 100%;
+		height: 30%;
+	}
+
+	.title-sreach {
+		width: 100%;
+		display: flex;
+		height: 200rpx;
+		position: relative;
+	}
+
+	.back-btn {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+	}
+
+	.title-name {
+		padding-top: 55px;
+		font-size: 36rpx;
+		font-weight: 700;
+		flex: 1;
+		text-align: center;
+	}
+
+	.title-sort {
+		height: 60rpx;
+		display: flex;
+		margin-top: 30rpx;
+	}
+
+	.sort-member {
+		line-height: 60rpx;
+		text-align: center;
+		background: #fff;
+		width: 20%;
+		margin-left: 4%;
+		border-radius: 10rpx;
+	}
+
+	.sort-value {
+		width: 160rpx;
+		height: auto;
+		max-height: 300rpx;
+		overflow: scroll;
+		background: rgba(0, 0, 0, 0.7);
+		position: absolute;
+		top: 80rpx;
+		right: 0;
+		border-radius: 20rpx;
+		color: #fff;
+		font-size: 22rpx;
+	}
+
+	.sort-value1 {
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.shop-rate {
+		background: rgba(249, 212, 157, 0.34);
+		height: 40rpx;
+		display: flex;
+		border-radius: 20rpx;
+		margin: 0 10px;
+	}
+
+	.shop-rate-num {
+		width: 50rpx;
+		height: 100%;
+		text-align: center;
+		background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));
+		color: #fff;
+		line-height: 40rpx;
+		font-size: 22rpx;
+		border-bottom-left-radius: 20rpx;
+		border-top-left-radius: 20rpx;
+		border-bottom-right-radius: 10rpx;
+		border-top-right-radius: 10rpx;
+	}
+
+	.man-box {
+		height: 190px;
+		border-radius: 10px;
+		width: 95%;
+		margin: 10px auto;
+		background: #fff;
+		    padding: 10px;
+	}
+
+	.man-title1 {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.man-title2 {
+		display: flex;
+		height: 35px;
+		line-height: 35px;
+		    padding-right: 10px;
+	}
+
+	.man-name {
+		font-size: 15px;
+		font-weight: 700;
+		margin: 0 10px;
+	}
+
+	.man-type {
+		height: 16px;
+		line-height: 16px;
+		background: rgba(166, 255, 234, 1);
+		padding: 0 10px;
+		font-size: 10px;
+		color: #777;
+		margin-top: 9px;
+	}
+
+	.man-rate {
+		display: flex;
+		    padding-right: 10px;
+	}
+
+	.man-num {
+		color: #777;
+		    flex: 1;
+		    text-align: right;
+	}
+
+	.man-title {
+		display: flex;
+	}
+	.man-dingdan{
+		width: 100%;
+		height: 50px;
+		display: flex;
+		line-height: 50px;
+		background: rgba(166, 255, 234, 0.16);
+		border-radius: 10px;
+		margin: 10px auto;
+		border: 1px solid rgba(166, 255, 234, 1);
+	}
+	.man-dingdan1{
+		flex: 1;
+		text-align: center;
+		color:#777;
+	}
+	.man-mank{
+		    line-height: 20px;
+		    color: #777;
+		    font-weight: 700;
+	}
 </style>
\ No newline at end of file
diff --git a/package1/order/pendGroup.vue b/package1/order/pendGroup.vue
new file mode 100644
index 0000000..c17edce
--- /dev/null
+++ b/package1/order/pendGroup.vue
@@ -0,0 +1,12 @@
+<template>
+	<!-- 拼团待成团页 -->
+	<view class="page1">
+		
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file