From a2184136606856e2baf4bbd05d3073e1372ef2c8 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 14 May 2026 18:09:30 +0800
Subject: [PATCH 1/4] 1

---
 package2/group/groupBuySingle.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index a9d2f18..399dcde 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -826,6 +826,12 @@
 			this.navBarHeight = info.statusBarHeight + 40;
 		},
 		onPullDownRefresh() {
+			this.menuList = [{
+				categoryName: '推荐',
+				id: 'tuijian',
+				checked: true
+			}]
+			this.productItem = []
 		    this.getCategory(this.shopItem.id);
 		    this.getProduct('');
 		},

From c17b91e251c7745297824539c09da6d21b7bccae Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 14 May 2026 18:09:37 +0800
Subject: [PATCH 2/4] 1

---
 pages/index/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c40fe0d..9122731 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -228,7 +228,6 @@
 						</view>
 					</view>
 					<view class="daimai-box" style="padding-bottom:180rpx;">
-						<view style="width:100%;height:100rpx;" v-if="lastScrollTop>583"></view>
 						<view class="daimai-tab" id="menuList" :class="{'daimai-tab--sticky': lastScrollTop>583}"
 							:style="{'top': (navBarHeight+46) + 'px'}">
 							<view class="daimai-tab-item" :class="{'active': checked == 'waimai'}"
@@ -331,7 +330,8 @@
 							</view>
 						</view>
 						
-						<scroll-view  @scrolltolower="onReachPage" :scroll-y="lastScrollTop>583" class="delivery-list-wrap">
+						<scroll-view  @scrolltolower="onReachPage" :upper-threshold="30" @scrolltoupper="gundongTop" :scroll-y="lastScrollTop>583" class="delivery-list-wrap">
+							
 							<view class="empty-delivery" v-if="deliveryItem.length <= 0">
 								<view class="empty-delivery-icon">校园</view>
 								<view class="empty-delivery-title">暂时没有可抢订单</view>
@@ -339,6 +339,7 @@
 							</view>
 							<view class="list-1" v-for="(item,index) in deliveryItem" :key="index"
 								@tap="productDetail(item)">
+								<view style="width:100%;height:70rpx;" v-if="lastScrollTop>560 && index == 0"></view>
 								<view class="daoda-time">
 									送达时间：{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}
 								</view>
@@ -1220,6 +1221,9 @@
 				this.searchForm.pageNum++;
 				this.getDelivery();
 			},
+			gundongTop(){
+				console.log("00000000000000000000000")
+			},
 			searchOrder(type, value) {
 				if (type == 'getarea') {
 					if (this.searchForm.getAreaId == value.id) {

From 25298e809e3a17ad9a7f743766ef07346cb94419 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 14 May 2026 18:09:43 +0800
Subject: [PATCH 3/4] 1

---
 App.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index 9cfb1c9..adf49c0 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,8 @@
+
 <script>
+	
 	export default {
+		
 		onLaunch: function() {
 			uni.authorize({
 				scope: 'scope.userLocation',
@@ -55,13 +58,13 @@
 	 * 注意只有当你需要某元素的单位要根据屏幕宽度（小范围）大小变化时，才需要rpx这类动态宽度单位。
 	 * 一般情况下高度和字体大小是不应该根据屏幕宽度（等比）变化的。所以高度和字体统一都使用px
 	 */
-	
+
 	page {
 		background: $u-bg-color;
 		color: $u-main-color;
 		font-size: 14px;
 	}
-	
+
 
 	.u-page {
 		padding: 15px 15px 40px 15px;

From 751573f16ad31c861bce5b1d398b79efc7cda34e Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 14 May 2026 18:09:50 +0800
Subject: [PATCH 4/4] 1

---
 manifest.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index d83c745..65cee0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -108,9 +108,9 @@
             "scope.writePhotosAlbum" : {
                 "desc" : "你的图片将保存到手机相册"
             },
-			"scope.writePhoneNumber": {
-			  "desc": "你的手机号码将用于账号安全及订单通知"
-			}
+            "scope.writePhoneNumber" : {
+                "desc" : "你的手机号码将用于账号安全及订单通知"
+            }
         },
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },