From 2ba42ae90c03cd1c0ce4ee37cb480f34c5bba543 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 18 Mar 2026 11:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package1/address/addressList.vue   |  18 ++--
 package1/buyFood/buyFood.vue       | 131 +++++++++++++++++++++++++----
 package1/group/groupBuyList.vue    |   8 +-
 package1/index/CheckCourier‌.vue |  12 +++
 4 files changed, 139 insertions(+), 30 deletions(-)
 create mode 100644 package1/index/CheckCourier‌.vue

diff --git a/package1/address/addressList.vue b/package1/address/addressList.vue
index cea568f..d6a39d2 100644
--- a/package1/address/addressList.vue
+++ b/package1/address/addressList.vue
@@ -1,9 +1,9 @@
 <template>
-	<view class="address-box">
+	<view class="address-popup-box">
 		<view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;">
 			收货地址
 		</view>
-		<view class="box1"
+		<view 
 			style="margin-bottom: 10px;display: flex;padding: 10px 20px 20px;background: #eee;border-radius: 10px;">
 			<view style="flex: 1;">
 				<view style="height: 35px;line-height: 35px;display: flex;">
@@ -23,23 +23,23 @@
 		</view>
 		<!-- 新增地址弹出层 -->
 		<uni-popup ref="addBookPopup" background-color="#fff">
-			<view class="book-popup-content" style="height: 325px;">
+			<view class="book-popup-content" style="height: 335px;">
 				<view style="height: 60px;line-height: 60px;font-size: 18px;font-weight: 700;text-align: center;">
 					填写地址
 				</view>
-				<view class="box1"
-					style="margin-bottom: 10px;background: #eee;border-radius: 10px;">
+				<view 
+					style="margin-bottom: 10px;background: #eee;border-radius: 10px;overflow: hidden;">
 					<uni-data-select v-model="value" :localdata="range" @change="change"></uni-data-select>
 				</view>
-				<view class="box1"
+				<view 
 					style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
 					<input type="text" placeholder="请填写详细地址" />
 				</view>
-				<view class="box1"
+				<view 
 					style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
 					<input type="text" placeholder="收货人名字" />
 				</view>
-				<view class="box1"
+				<view 
 					style="margin-bottom: 10px;display: flex;padding: 10px;background: #eee;border-radius: 10px;">
 					<input type="text" placeholder="联系电话" />
 				</view>
@@ -78,7 +78,7 @@
 </script>
 
 <style lang="scss">
-	.address-box {
+	.address-popup-box {
 		height: 600px;
 	}
 
diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index f323c8e..319d0b5 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -10,18 +10,18 @@
 		</view>
 		<view style="position: absolute;top: 100px;width: 100%;">
 			<view class="tab1" v-if="isPaotui">
-				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f1356c4db9b5488bb46140e2cdd2b4ee.png" alt=""
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6b3a4d4c61ee42feb29e69d6fcfd2c1e.png" alt=""
 					style="position: absolute;" />
-				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e380fd14442c476bb6d3f5ec471af515.png" alt="" />
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/1cbed0734a154a70b75cb84a811bd0b7.png" alt="" />
 				<view style="width: 100%;height: 80px;position: absolute;top:0;left: 0;display: flex;">
 					<view style="width: 50%;height: 80px;"></view>
 					<view style="width: 50%;height: 80px;" @tap="isPaotui=!isPaotui"></view>
 				</view>
 			</view>
 			<view class="tab1" v-else>
-				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/3aea88803cb446139aa80ff5a606645a.png" alt=""
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/3b98dfb370eb4ddcb942b7942dedced2.png" alt=""
 					style="position: absolute;" />
-				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/2cdff43ecdd4409a8bd1f5f46a6ad38d.png" alt=""
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/82627e6cedcf409a932d6afaafa19a4b.png" alt=""
 					style="position: absolute;" />
 				<view style="width: 100%;height: 80px;position: absolute;top:0;left: 0;display: flex;">
 					<view style="width: 50%;height: 80px;" @tap="isPaotui=!isPaotui"></view>
@@ -29,15 +29,42 @@
 				</view>
 			</view>
 		</view>
-		<view class="address-box">
-			<view v-if="formData.address == ''">
+		<view class="ziqu-box" v-if="isPaotui==false">
+			<view class="ziqu-xuanfu">
+				取餐信息
+			</view>
+			<view class="ziqu-address">
+				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/e13c675ffd4547d0b271900902ffea66.png" alt="" />
+				<view class="ziqu-text">
+					北校区1食堂3楼12号窗口杨国福麻辣烫
+				</view>
+			</view>
+			<view class="ziqu-time-box">
+				<view style="flex: 1;">
+					自取时间
+				</view>
+				<view style="color: red;">
+					19:00
+				</view>
+			</view>
+			<view class="ziqu-call-box">
+				<view class="ziqu-call">
+					预留电话
+				</view>
+				<view class="ziqu-call-input">
+					<input type="text" placeholder="请输入预留电话" style="height: 35px;line-height: 35px;text-align: right;" />
+				</view>
+			</view>
+		</view>
+		<view class="address-box" v-if="isPaotui">
+			<view v-if="formData.address == ''" @tap="openAddressBook">
 				请选择收货地址 <uni-icons type="right" size="16"></uni-icons>
 			</view>
 			<view v-else>
 				男生宿舍楼2楼211
 			</view>
 		</view>
-		<view class="time-box">
+		<view class="time-box" v-if="isPaotui">
 			<view class="time1" @tap="checkTime(true)" :style="{'background':formData.isImmediately?'linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))':'#eee'}">
 				<view style="font-weight: 700;">
 					立即送出
@@ -60,7 +87,7 @@
 				</view>
 			</view>
 		</view>
-		<view style='background: #fff;border-bottom: 1px solid #eee;'>
+		<view v-if="isPaotui" style='background: #fff;border-bottom: 1px solid #eee;'>
 			<view style="height: 45px;line-height: 20px;padding: 0 20px;font-size: 14px;font-weight: 700;padding-top: 10px;">
 				<view class="">
 					配送员
@@ -165,6 +192,12 @@
 				</view>
 			</view>
 		</view>
+		<!-- 地址簿弹出层 -->
+		<uni-popup ref="bookPopup" background-color="#fff">
+			<view class="book-popup-content">
+				<address-list></address-list>
+			</view>
+		</uni-popup>
 		<delivery-time-op @timeCallback="timeCallback" :dodge="true" ref='model'
 			:content="content" :barHidth='600' title="选择送达时间">
 			> </delivery-time-op>
@@ -173,21 +206,25 @@
 
 <script>
 	import deliveryTimeOp from '@/components/delivery-time-op/delivery-time-op.vue'
+	import addressList from '@/package1/address/addressList.vue'
 	export default {
 		data() {
 			return {
+				isPaotui: true,
 				menuButtonInfo: {},
 				formData:{
 					address:'',
 					isImmediately:true,
-					deliveryTime:''
+					deliveryTime:'',
+					peisongyuan:''
 				},
 				content: [],
 				selected: 'buzhiding',
 			}
 		},
 		components: {
-			deliveryTimeOp
+			deliveryTimeOp,
+			addressList
 		},
 		onLoad(option) {
 			
@@ -196,6 +233,10 @@
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 		},
 		methods: {
+			openAddressBook(){
+				this.$refs.bookPopup.open('bottom')
+				
+			},
 			checkTime(type){
 				if(type == this.formData.isImmediately){
 					
@@ -209,12 +250,9 @@
 			checkVoucher(type) {
 				if (type == this.selected) return;
 				this.selected = type;
-			
-				this.addFormData.phone = '',
-					this.addFormData.codeList = [{
-						code: ''
-					}]
-				this.addFormData.picture = []
+				if(this.selected == 'buzhiding'){
+					this.formData.peisongyuan = ""
+				}
 			},
 			//时间选择器获取时间数据
 			generateDeliveryTimes() {
@@ -310,12 +348,13 @@
 		height: 100%;
 		font-size: 24rpx;
 		position: relative;
+		background: #fff;
 	}
 
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
-		height: 20%;
+		height: 22%;
 	}
 
 	.title-sreach {
@@ -463,4 +502,62 @@
 		border-radius: 50px;
 		margin: 10px auto;
 	}
+	.ziqu-box{
+		background: #eee;
+		    width: 90%;
+		    margin: 0 auto;
+		    border-radius: 10px;
+		    position: relative;
+		    overflow: hidden;
+	}
+	.ziqu-xuanfu{
+		position: absolute;
+		    top: 0;
+		    right: 0;
+		    padding: 5px 10px;
+		    background: rgba(166, 255, 234, 1);
+		    border-top-right-radius: 10px;
+		    border-bottom-left-radius: 10px;
+		    font-weight: 700;
+		    font-size: 10px;
+	}
+	.ziqu-address{
+		    display: flex;
+		    height: 50px;
+		    background: #fff;
+		    width: 90%;
+		    border-radius: 10px;
+		    font-size: 13px;
+		    margin: 30px auto 0;
+		    font-weight: bold;
+		    line-height: 50px;
+			img{
+				width: 20px;
+				    height: 20px;
+				    margin: 15px 10px 0 15px;
+			}
+	}
+	.ziqu-time-box{
+		    width: 90%;
+		    margin: 10px auto;
+		    display: flex;
+		    font-weight: 700;
+	}
+	.ziqu-call-box{
+		width: 90%;
+		display: flex;
+		height: 35px;
+		line-height: 35px;
+		margin: 0 auto 10px;
+	}
+	.ziqu-call{
+		    flex: 1;
+	}
+	.book-popup-content{
+		position: relative;
+		height: 600px;
+		width: 100%;
+		padding: 10px;
+		overflow: scroll;
+	}
 </style>
\ No newline at end of file
diff --git a/package1/group/groupBuyList.vue b/package1/group/groupBuyList.vue
index 2a065ee..1886ce0 100644
--- a/package1/group/groupBuyList.vue
+++ b/package1/group/groupBuyList.vue
@@ -238,10 +238,10 @@
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			uni.showLoading({
-				title: '加载中...',
-				mask: true
-			})
+			// uni.showLoading({
+			// 	title: '加载中...',
+			// 	mask: true
+			// })
 		},
 		methods: {
 			searchShop(type,value){
diff --git a/package1/index/CheckCourier‌.vue b/package1/index/CheckCourier‌.vue
new file mode 100644
index 0000000..0fc1d2c
--- /dev/null
+++ b/package1/index/CheckCourier‌.vue
@@ -0,0 +1,12 @@
+<template>
+	<!-- 选择配送员 -->
+	<view class="page1">
+		
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file