From 0e0beaeab46358bbc6947cd0ac01a8e847746ddb Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Tue, 12 May 2026 16:48:09 +0800
Subject: [PATCH 1/3] 1

---
 components/tab-bar/delivery.vue | 144 ++++++++++++++++++--------------
 components/tab-bar/tab-bar.vue  |   2 +-
 2 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue
index aeefd31..53631ff 100644
--- a/components/tab-bar/delivery.vue
+++ b/components/tab-bar/delivery.vue
@@ -211,78 +211,85 @@
 								style="transform: scale(0.7);text-align: right;" />
 						</view>
 					</view>
-					<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
-						外卖规则
-						<view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
-							全选
+					<scroll-view scroll-y="true" style="max-height: 660rpx;">
+						<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
+							外卖规则
+							<view @tap="allCheck('waimai')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
+								全选
+							</view>
 						</view>
-					</view>
-					<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index"
-						style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
-						
-						<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
-						<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'waimai')">
-							<view class="guize1-qusong">
-								<view class="qusong1">
-									取
-								</view>
-								<view class="qusong2">
-									{{item.getAreaName}}
+						<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index"
+							style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
+							
+							<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
+							<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'waimai')">
+								<view class="guize1-qusong">
+									<view class="qusong1">
+										取
+									</view>
+									<view class="qusong2">
+										{{item.getAreaName}}
+									</view>
 								</view>
-							</view>
-							<view class="guize1-qusong">
-								<view class="qusong1">
-									送
+								<view class="guize1-qusong">
+									<view class="qusong1">
+										送
+									</view>
+									<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
+										{{item.putAreaName}}
+									</view>
 								</view>
-								<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
-									{{item.putAreaName}}
+								<view class="radio-check" v-if="item.isChecked">
+									<uni-icons type="checkmarkempty" size="12"></uni-icons>
 								</view>
+								<view class="radio-no-check" v-else></view>
+								<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
+									style="margin-left:5px;"></uni-icons> -->
 							</view>
-							<view class="radio-check" v-if="item.isChecked">
-								<uni-icons type="checkmarkempty" size="12"></uni-icons>
-							</view>
-							<view class="radio-no-check" v-else></view>
-							<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
-								style="margin-left:5px;"></uni-icons> -->
 						</view>
-					</view>
-					<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
-						跑腿规则
-						<view @tap="allCheck('paotui')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
-							全选
+						<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;display: flex;">
+							跑腿规则
+							<view @tap="allCheck('paotui')" v-if="zhipaiCheck" style="color: #1E90FF;flex:1;text-align: right;padding-right: 20rpx;">
+								全选
+							</view>
 						</view>
-					</view>
-					<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index"
-						style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
-						
-						<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
-						<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'paotui')">
-							<view class="guize1-qusong">
-								<view class="qusong1">
-									取
-								</view>
-								<view class="qusong2">
-									{{item.getAreaName}}
+						<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index"
+							style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;position: relative;">
+							
+							<view v-if="!zhipaiCheck" style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;background: rgba(255, 255, 255, 0.5);"></view>
+							<view style="display: flex; width: 100%;" @tap="checkVoucher(index,'paotui')">
+								<view class="guize1-qusong">
+									<view class="qusong1">
+										取
+									</view>
+									<view class="qusong2">
+										{{item.getAreaName}}
+									</view>
 								</view>
-							</view>
-							<view class="guize1-qusong">
-								<view class="qusong1">
-									送
+								<view class="guize1-qusong">
+									<view class="qusong1">
+										送
+									</view>
+									<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
+										{{item.putAreaName}}
+									</view>
 								</view>
-								<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
-									{{item.putAreaName}}
+								<view class="radio-check" v-if="item.isChecked">
+									<uni-icons type="checkmarkempty" size="12"></uni-icons>
 								</view>
+								<view class="radio-no-check" v-else></view>
+								<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
+									style="margin-left:5px;"></uni-icons> -->
 							</view>
-							<view class="radio-check" v-if="item.isChecked">
-								<uni-icons type="checkmarkempty" size="12"></uni-icons>
-							</view>
-							<view class="radio-no-check" v-else></view>
-							<!-- <uni-icons type="closeempty" size="20" @click="selectRule(item)" color="#ff0000"
-								style="margin-left:5px;"></uni-icons> -->
 						</view>
-					</view>
-					<view class="btn" @tap="selectRule">
-						确认修改
+					</scroll-view>
+					<view style="display: flex;position: absolute;bottom: 0;width: 93%;">
+						<view class="btn" @tap="selectRule">
+							确认规则
+						</view>
+						<view class="btn" @tap="buchong">
+							补充规则
+						</view>
 					</view>
 				</view>
 			</uni-popup>
@@ -509,6 +516,13 @@
 				this.productData = item.goodsList;
 				this.$refs.productPopup.open()
 			},
+			buchong(){
+				this.$refs.carPopup.close()
+				uni.navigateTo({
+					url:'/package1/myCenter/partTimeJobRegister'
+				})
+				
+			},
 			selectRule(item) {
 				//TODO 这里应该改成 复选，选中的遍历再放进来
 				// let rule = {
@@ -907,11 +921,12 @@
 
 	.guize-list {
 		width: 600rpx;
-		padding: 20rpx;
-		overflow: scroll;
+		    padding: 20rpx 20rpx 0;
 		background: #fff;
 		border-radius: 20rpx;
-		max-height: 1000rpx;
+		    max-height: 1000rpx;
+		    min-height: 640rpx;
+			position: relative;
 	}
 
 	.zhipai-box {
@@ -995,7 +1010,8 @@
 		border-radius: 100rpx;
 		line-height: 100rpx;
 		text-align: center;
-		margin: 40rpx auto;
+		    margin: 20rpx 20rpx;
+			flex: 1;
 	}
 	.code-box{
 		display: inline-block;
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index c7f6bf7..41f60b3 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -197,7 +197,7 @@
 		background: rgba(255, 255, 255, 1);
 		margin: 0 auto;
 		display: flex;
-		z-index: 999;
+		z-index: 9;
 		border-top: 1px solid #eee;
 		border-top-left-radius: 60rpx;
 		border-top-right-radius: 60rpx;

From f73f34cbea86440892901c441a1856b6b592f6e5 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Tue, 12 May 2026 16:48:15 +0800
Subject: [PATCH 2/3] 1

---
 package1/group/groupBuySingle.vue | 6 +++---
 package1/runErrand/runErrand.vue  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index 4471739..fef6e8c 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -1501,9 +1501,9 @@
 			},
 			goDetail(type) {
 				if (type == 'goodsDetail') {
-					uni.navigateTo({
-						url: '/package1/goods/goodsDetail'
-					})
+					// uni.navigateTo({
+					// 	url: '/package1/goods/goodsDetail'
+					// })
 				} else if (type == 'shopDetail') {
 					uni.navigateTo({
 						url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem)
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index 9b45345..5aa761d 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -242,7 +242,7 @@
 				<view>￥{{totalAmountCalc.toFixed(2)}}</view>
 			</view>
 			
-			<view style="width: 100%;height: 400rpx;"></view>
+			<view style="width: 100%;height: 520rpx;"></view>
 		</view>
 		
 		<view class="buy-bottom">

From d14c056c7f0d2d68bc1b07ab045c901a402853c7 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Tue, 12 May 2026 16:48:21 +0800
Subject: [PATCH 3/3] 1

---
 pages/index/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index e843ca7..e5052f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -458,7 +458,7 @@
 			</view>
 		</view>
 		<!-- 弹出区域选择 -->
-		<uni-popup ref="areaPopup" background-color="#fff">
+		<uni-popup ref="areaPopup" :is-mask-click="false" background-color="#fff">
 			<view class="popup-area-content">
 				<view class="popup-area-title">
 					<text>请选择 所属区域</text>
@@ -2333,6 +2333,8 @@
 		justify-content: center;
 		height: auto;
 		background-color: #fff;
+		    padding: 10px 20px;
+		    border-radius: 10px;
 	}
 
 	.popup-area-title {
@@ -2353,6 +2355,7 @@
 		border-bottom: 1px solid #eee;
 		border-top: 1px solid #eee;
 		color: #fff;
+		    padding: 0 10px;
 	}
 
 	.chaoda {