From b6c46c8de57e32f406743f79a61d4cbdc42ce485 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 25 Jun 2026 16:12:01 +0800
Subject: [PATCH] 1

---
 package2/group/groupBuyList.vue          | 126 ++++--
 package2/group/groupPendingList.vue      |  79 ++--
 package2/group/shopEvaluate.vue          |  45 +-
 package2/group/studentStoreList.vue      | 133 +++---
 package2/partTimeJob/workerOrderList.vue |  53 ++-
 package2/shop/afterService.vue           | 265 +++++++----
 package2/shop/merchantCenter.vue         |   4 +-
 package2/shop/orderDetail.vue            | 252 ++++++++++-
 package2/shop/shopOrderList.vue          | 531 +++++++++++++++++------
 9 files changed, 1115 insertions(+), 373 deletions(-)

diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue
index fa26454..29575f5 100644
--- a/package2/group/groupBuyList.vue
+++ b/package2/group/groupBuyList.vue
@@ -2,49 +2,52 @@
 	<!-- 拼团页 -->
 	<view class="page1">
 		<view class="title">
-			<view class="title-sreach">
-				<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}">
-					<uni-icons type="left" size="28"></uni-icons>
-				</view>
-				<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
-					饭团
-					<text>宿舍拼饭局</text>
-				</view>
-				<view class="title-search" :style="{'margin-top': menuButtonInfo.top +'px'}" @tap="goDetail('search')">
-					<uni-icons type="search" size="16" color="#08735d"></uni-icons>
-					<swiper class="search-word-swiper" vertical circular :autoplay="false" :interval="2200" :duration="500">
-						<swiper-item v-for="(word,index) in searchHotWords" :key="index">
-							<view class="search-hot-word">{{word}}</view>
-						</swiper-item>
-					</swiper>
-					<view class="search-trend">热搜↑</view>
+			<view class="title-fixed">
+				<view class="title-sreach">
+					<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top +'px'}">
+						<uni-icons type="left" size="28"></uni-icons>
+					</view>
+					<view class="title-name" :style="{'padding-top': menuButtonInfo.top +'px'}">
+						饭团
+						<text>宿舍拼饭局</text>
+					</view>
+					<view class="title-search" :style="{'margin-top': menuButtonInfo.top +'px'}" @tap="goDetail('search')">
+						<uni-icons type="search" size="16" color="#08735d"></uni-icons>
+						<swiper class="search-word-swiper" vertical circular :autoplay="false" :interval="2200" :duration="500">
+							<swiper-item v-for="(word,index) in searchHotWords" :key="index">
+								<view class="search-hot-word">{{word}}</view>
+							</swiper-item>
+						</swiper>
+						<view class="search-trend">热搜↑</view>
+					</view>
 				</view>
-			</view>
-			<view class="title-tab">
-				<view class="campus-banner" @tap="goPendingGroup">
-					<view class="banner-glow"></view>
-					<view class="steam steam-one"></view>
-					<view class="steam steam-two"></view>
-					<view class="steam steam-three"></view>
-					<!-- <view class="food-float float-one">🍜</view>
+				<view class="title-tab" style="margin-top: 2rpx;">
+					<view class="campus-banner" @tap="goPendingGroup">
+						<view class="banner-glow"></view>
+						<view class="steam steam-one"></view>
+						<view class="steam steam-two"></view>
+						<view class="steam steam-three"></view>
+						<!-- <view class="food-float float-one">🍜</view>
 					<view class="food-float float-two">🥤</view>
 					<view class="food-float float-three">🍢</view>
 					<view class="food-float float-four">🥟</view> -->
-					<view class="banner-copy">
-						<view class="banner-sticker">大家正在拼</view>
-						<view class="banner-title">快来加入成团</view>
-						<!-- <view class="banner-desc">楼下热乎的那口，凑个饭搭子就出发。</view> -->
-						<view class="banner-bubbles">
-							<text>拼团局开了</text>
-							<text>刚刚有人拼成功</text>
+						<view class="banner-copy">
+							<view class="banner-sticker">大家正在拼</view>
+							<view class="banner-title">快来加入成团</view>
+							<!-- <view class="banner-desc">楼下热乎的那口，凑个饭搭子就出发。</view> -->
+							<view class="banner-bubbles">
+								<text>拼团局开了</text>
+								<text>刚刚有人拼成功</text>
+							</view>
+						</view>
+						<view class="banner-food-card">
+							<img src="/static/images/img/loading.gif" alt="" />
+							<!-- <view class="food-card-tag">刚刚有人拼成功</view> -->
 						</view>
-					</view>
-					<view class="banner-food-card">
-						<img src="/static/images/img/loading.gif" alt="" />
-						<!-- <view class="food-card-tag">刚刚有人拼成功</view> -->
 					</view>
 				</view>
 			</view>
+			<view class="title-fixed-holder"></view>
 			<view class="campus-live">
 				<!-- <view class="live-title">
 					<text v-for="(text,index) in liveSlogans" :key="index">{{text}}</text>
@@ -111,9 +114,8 @@
 			</view>
 		</view>
 		<view class="shop-list">
-			<view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)">
-				<view @tap.stop="buyingye" v-if="item.status != 1"
-					style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.1);z-index: 999;border-radius: 20rpx;">
+			<view class="shop-member" :class="{'shop-member-disabled': item.status != 1}" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)">
+				<view class="shop-disabled-mask" @tap.stop="buyingye" v-if="item.status != 1">
 				</view>
 				<view class="shop-card-bg"></view>
 				<view class="shop-top">
@@ -669,7 +671,26 @@
 		z-index: 10;
 	}
 
-	.title::before {
+	.title-fixed {
+		width: 100%;
+		padding-bottom: 22rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		overflow: hidden;
+		background:
+			radial-gradient(circle at 12% 8%, rgba(197, 255, 153, 0.5), transparent 34%),
+			radial-gradient(circle at 90% 18%, rgba(175, 255, 231, 0.48), transparent 36%),
+			linear-gradient(180deg, #f6ffea 0%, #f7fff9 100%);
+	}
+
+	.title-fixed-holder {
+		height: 466rpx;
+	}
+
+	.title-fixed::before {
 		content: '';
 		position: absolute;
 		top: -140rpx;
@@ -772,7 +793,7 @@
 		background:
 			linear-gradient(135deg, rgba(224, 255, 174, 0.98), rgba(179, 255, 225, 0.96) 52%, rgba(255, 246, 221, 0.96)),
 			linear-gradient(180deg, #f9fff1, #eaffd7);
-		box-shadow: 0 24rpx 54rpx rgba(22, 126, 93, 0.18);
+		box-shadow: none;
 		border: 2rpx solid rgba(255, 255, 255, 0.8);
 	}
 
@@ -1172,6 +1193,8 @@
 		width: 94%;
 		height: auto;
 		margin: 10rpx auto 0;
+		position: relative;
+		z-index: 1;
 	}
 
 	.shop-member {
@@ -1181,11 +1204,34 @@
 		background: rgba(255, 255, 255, 0.62);
 		margin-bottom: 24rpx;
 		position: relative;
+		z-index: 1;
 		overflow: hidden;
 		box-shadow: 0 18rpx 44rpx rgba(19, 91, 70, 0.12);
 		border: 1rpx solid rgba(255, 255, 255, 0.86);
 	}
 
+	.shop-disabled-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 20;
+		border-radius: inherit;
+		background: rgba(255, 255, 255, 0.58);
+	}
+
+	.shop-member-disabled {
+		box-shadow: none;
+	}
+
+	.shop-member-disabled .shop-img,
+	.shop-member-disabled .menu-img,
+	.shop-member-disabled .shop-live-row text:last-child,
+	.shop-member-disabled .shop-menu-purchase {
+		box-shadow: none;
+	}
+
 	.shop-card-bg {
 		position: absolute;
 		top: -120rpx;
diff --git a/package2/group/groupPendingList.vue b/package2/group/groupPendingList.vue
index 01ade16..f686eb9 100644
--- a/package2/group/groupPendingList.vue
+++ b/package2/group/groupPendingList.vue
@@ -1,30 +1,34 @@
 <template>
 	<view class="pending-page" :class="{'store-scene': isStoreScene}">
-		<view class="hero">
-			<view class="top-bar" @tap="back">
-				<view class="back-btn" :style="navPaddingStyle">
-					<uni-icons type="left" size="27" color="#fff"></uni-icons>
+		<view class="pending-fixed">
+			<view class="hero">
+				<view class="top-bar">
+					<view class="back-btn" @tap="back"
+						:style="{'top': menuButtonInfo.top + 'px','width': menuButtonInfo.height + 'px','height': menuButtonInfo.height + 'px'}">
+						<uni-icons type="left" size="28" color="#08735d"></uni-icons>
+					</view>
+				</view>
+				<view class="hero-copy">
+					<!-- <view class="hero-kicker" style="padding-left: 80rpx;">{{isStoreScene ? '校园团购' : '校园外卖'}}</view> -->
+					<view class="hero-title">{{isStoreScene ? '正在等你来拼团' : '附近饭搭子开团中'}}</view>
+					<view class="hero-sub">{{isStoreScene ? '同学们发起的团购拼团，凑齐就一起省' : '公开拼饭局都在这里，点进店铺直接参团'}}</view>
+				</view>
+				<view class="hero-badge">
+					<image src="/static/images/img/loading.gif" mode="aspectFit"></image>
+					<text>待成团</text>
 				</view>
 			</view>
-			<view class="hero-copy">
-				<view class="hero-kicker">{{isStoreScene ? '校园团购' : '校园外卖'}}</view>
-				<view class="hero-title">{{isStoreScene ? '正在等你来拼团' : '附近饭搭子开团中'}}</view>
-				<view class="hero-sub">{{isStoreScene ? '同学们发起的到店团，凑齐就一起省' : '公开拼饭局都在这里，点进店铺直接参团'}}</view>
-			</view>
-			<view class="hero-badge">
-				<image src="/static/images/img/loading.gif" mode="aspectFit"></image>
-				<text>待成团</text>
-			</view>
-		</view>
 
-		<view class="search-card">
-			<view class="search-box">
-				<uni-icons type="search" size="18" :color="searchIconColor"></uni-icons>
-				<input type="text" v-model="query.keyWord" confirm-type="search" placeholder="搜索商品或商家"
-					@confirm="searchGroup" />
-				<view class="search-btn" @tap="searchGroup">搜索</view>
+			<view class="search-card">
+				<view class="search-box">
+					<uni-icons type="search" size="18" :color="searchIconColor"></uni-icons>
+					<input type="text" v-model="query.keyWord" confirm-type="search" placeholder="搜索商品或商家"
+						@confirm="searchGroup" />
+					<view class="search-btn" @tap="searchGroup">搜索</view>
+				</view>
 			</view>
 		</view>
+		<view class="hero-holder"></view>
 
 		<view class="list-wrap">
 			<view class="empty-card" v-if="groupList.length === 0 && loadStatus !== 'loading'">
@@ -82,7 +86,8 @@
 			return {
 				scene: 'takeaway',
 				menuButtonInfo: {
-					top: 0
+					top: 0,
+					height: 32
 				},
 				loadStatus: 'more',
 				navPaddingStyle: '',
@@ -114,7 +119,6 @@
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
-			this.navPaddingStyle = 'padding-top: ' + this.menuButtonInfo.top + 'px;'
 		},
 		onReachBottom() {
 			if (this.loadStatus === 'loading' || this.query.pageNumber >= this.totalPages) return
@@ -260,7 +264,17 @@
 		color: #3f2618;
 	}
 
+	.pending-fixed {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+	}
+
 	.hero {
+		width: 100%;
 		min-height: 360rpx;
 		padding: 0 26rpx 36rpx;
 		box-sizing: border-box;
@@ -270,6 +284,10 @@
 		color: #fff;
 	}
 
+	.hero-holder {
+		height: 454rpx;
+	}
+
 	.store-scene .hero {
 		background: linear-gradient(115deg, rgba(255, 132, 80, 0.98) 0%, rgba(255, 185, 113, 0.94) 56%, rgba(255, 236, 218, 0.9) 100%);
 	}
@@ -288,15 +306,22 @@
 	.top-bar {
 		height: 98rpx;
 		position: relative;
-		z-index: 2;
+		z-index: 20;
+		pointer-events: none;
 	}
 
 	.back-btn {
-		width: 68rpx;
-		height: 68rpx;
+		position: absolute;
+		left: 0;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.96);
+		border: 1rpx solid rgba(255, 255, 255, 0.82);
+		box-shadow: 0 8rpx 18rpx rgba(0, 45, 29, 0.08);
+		box-sizing: border-box;
+		pointer-events: auto;
 	}
 
 	.hero-copy {
@@ -316,7 +341,7 @@
 	}
 
 	.hero-title {
-		margin-top: 18rpx;
+		margin-top: 48rpx;
 		font-size: 48rpx;
 		line-height: 58rpx;
 		font-weight: 900;
@@ -410,6 +435,8 @@
 	.list-wrap {
 		width: 94%;
 		margin: 0 auto;
+		position: relative;
+		z-index: 1;
 	}
 
 	.empty-card,
diff --git a/package2/group/shopEvaluate.vue b/package2/group/shopEvaluate.vue
index 7b1f463..2132ae0 100644
--- a/package2/group/shopEvaluate.vue
+++ b/package2/group/shopEvaluate.vue
@@ -1,16 +1,16 @@
 <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="{'padding-top': menuButtonInfo.top +'px'}">
-					商家评价
+		<view class="evaluate-fixed">
+			<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="{'padding-top': menuButtonInfo.top +'px'}">
+						商家评价
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="content">
 			<view class="shop-rate">
 				<view class="rate-left">
 					<view class="rate-num">
@@ -34,6 +34,9 @@
 					</view>
 				</view>
 			</view>
+		</view>
+		<view class="evaluate-fixed-holder"></view>
+		<view class="content">
 			<scroll-view scroll-y @scrolltolower="onReachPage" style="width:100%;height: 540px;overflow: scroll;">
 				<view v-for="(item,index) in shopComments" :key="index">
 					<view class="eval-title">
@@ -380,10 +383,24 @@
 		position: relative;
 	}
 
+	.evaluate-fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		background: #F5F8F5;
+	}
+
+	.evaluate-fixed-holder {
+		height: 390rpx;
+	}
+
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
-		height: 54%;
+		height: 200rpx;
+		background-size: 100% 100%;
 	}
 
 	.title-sreach {
@@ -408,8 +425,12 @@
 	}
 
 	.content {
-		position: absolute;
-		top: 200rpx;
+		width: 95%;
+		margin-left: 2.5%;
+	}
+
+	.evaluate-fixed .shop-rate,
+	.evaluate-fixed .menu-list {
 		width: 95%;
 		margin-left: 2.5%;
 	}
diff --git a/package2/group/studentStoreList.vue b/package2/group/studentStoreList.vue
index 308223f..e341a92 100644
--- a/package2/group/studentStoreList.vue
+++ b/package2/group/studentStoreList.vue
@@ -1,57 +1,61 @@
 <template>
 	<view class="student-store-page">
-		<view class="hero">
-			<!-- <view class="hero-glow hero-glow-a"></view>
+		<view class="student-fixed">
+			<view class="hero">
+				<!-- <view class="hero-glow hero-glow-a"></view>
 			<view class="hero-glow hero-glow-b"></view>
 			<view class="hero-sticker sticker-near">附近正在拼</view> -->
-			<view class="top-bar">
-				<view class="back-btn" @tap="back" :style="{'padding-top': menuButtonInfo.top + 'px'}">
-					<uni-icons type="left" size="26" color="#fff"></uni-icons>
+				<view class="top-bar">
+					<view class="back-btn" @tap="back"
+						:style="{'top': menuButtonInfo.top + 'px','width': menuButtonInfo.height + 'px','height': menuButtonInfo.height + 'px'}">
+						<uni-icons type="left" size="30" color="#8b4324"></uni-icons>
+					</view>
+					<view class="page-title"></view>
+					
 				</view>
-				<view class="page-title"></view>
-				
-			</view>
 
-			<view class="hero-community" @tap="goPendingGroup">
-				<view class="hero-left">
-					<view class="hand-tag">Campus walk</view>
-					<view class="hero-title">万能杂货铺
-						<view class="brand-chip" style="width: 340rpx;">半径里# 有拼团在等你</view>
-					</view>
-					<view class="pending-entry">
-						<view class="pending-copy">
-							<view class="pending-title">查看待成团列表</view>
-							<view class="pending-sub">看看同校还有哪些拼团差人</view>
+				<view class="hero-community" @tap="goPendingGroup">
+					<view class="hero-left">
+						<view class="hand-tag">Campus walk</view>
+						<view class="hero-title">万能杂货铺
+							<view class="brand-chip" style="width: 340rpx;">半径里# 有拼团在等你</view>
+						</view>
+						<view class="pending-entry">
+							<view class="pending-copy">
+								<view class="pending-title">查看待成团列表</view>
+								<view class="pending-sub">看看同校还有哪些拼团差人</view>
+							</view>
+							<view class="pending-arrow">去看看</view>
 						</view>
-						<view class="pending-arrow">去看看</view>
 					</view>
-				</view>
-				<view class="squirrel-card">
-					<image class="squirrel-img" src="/static/images/img/songshu.png" mode="aspectFit"></image>
-					<view class="squirrel-dialog">待成团入口</view>
-					<view class="group-pop">拼</view>
+					<view class="squirrel-card">
+						<image class="squirrel-img" src="/static/images/img/songshu.png" mode="aspectFit"></image>
+						<view class="squirrel-dialog">待成团入口</view>
+						<view class="group-pop">拼</view>
+					</view>
 				</view>
 			</view>
-		</view>
-		
-		<view class="search-strip-wrap">
-			<view class="hot-search-card">
-				<view class="hot-search-main" @tap="focusSearch">
-					<view class="hot-search-icon">🔎</view>
-					<view class="hot-search-copy">
-						<view class="hot-search-title">大家都在搜</view>
-						<swiper class="hot-word-swiper" vertical circular autoplay :interval="2300" :duration="420">
-							<swiper-item v-for="word in hotWords" :key="word">
-								<view class="hot-word">{{word}}</view>
-							</swiper-item>
-						</swiper>
+
+			<view class="search-strip-wrap">
+				<view class="hot-search-card">
+					<view class="hot-search-main" @tap="focusSearch">
+						<view class="hot-search-icon">🔎</view>
+						<view class="hot-search-copy">
+							<view class="hot-search-title">大家都在搜</view>
+							<swiper class="hot-word-swiper" vertical circular autoplay :interval="2300" :duration="420">
+								<swiper-item v-for="word in hotWords" :key="word">
+									<view class="hot-word">{{word}}</view>
+								</swiper-item>
+							</swiper>
+						</view>
+						<input class="hot-search-input" type="text" placeholder="输入你想拼的校园快乐" v-model="searchForm.keyWord"
+							confirm-type="search" @confirm="goSearch" />
+						<view class="trend-badge" @tap.stop="goSearch">搜索</view>
 					</view>
-					<input class="hot-search-input" type="text" placeholder="输入你想拼的校园快乐" v-model="searchForm.keyWord"
-						confirm-type="search" @confirm="goSearch" />
-					<view class="trend-badge" @tap.stop="goSearch">搜索</view>
 				</view>
 			</view>
 		</view>
+		<view class="hero-holder"></view>
 
 		<view class="interest-scroll">
 			<view class="interest-list">
@@ -150,7 +154,8 @@
 		data() {
 			return {
 				menuButtonInfo: {
-					top: 0
+					top: 0,
+					height: 32
 				},
 				loadStatus: 'more',
 				isArea: false,
@@ -553,18 +558,36 @@
 		color: #3f2618;
 	}
 
+	.student-fixed {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+	}
+
 	.hero {
+		width: 100%;
 		min-height: 452rpx;
 		padding: 0 24rpx 20rpx;
 		box-sizing: border-box;
 		color: #fff;
 		position: relative;
 		overflow: hidden;
+		background:
+			radial-gradient(circle at 82% 120rpx, rgba(255, 241, 210, 0.86) 0, rgba(255, 241, 210, 0) 260rpx),
+			radial-gradient(circle at 10% 260rpx, rgba(255, 190, 185, 0.3) 0, rgba(255, 190, 185, 0) 240rpx),
+			linear-gradient(180deg, #ffd0b8 0%, #ffe6d6 260rpx, #fff7ef 100%);
 		/* background:
 			linear-gradient(180deg, rgba(255, 190, 156, 0.96) 0%, rgba(255, 210, 176, 0.9) 66%, rgba(255, 247, 239, 0.08) 100%),
 			linear-gradient(115deg, rgba(255, 190, 156, 0.88) 0%, rgba(255, 211, 177, 0.82) 46%, rgba(255, 236, 218, 0.72) 100%); */
 	}
 
+	.hero-holder {
+		height: 576rpx;
+	}
+
 	.hero::after {
 		content: '';
 		width: 520rpx;
@@ -648,19 +671,26 @@
 	}
 
 	.top-bar {
-		height: 82rpx;
-		display: flex;
-		align-items: center;
-		position: relative;
-		z-index: 2;
+		position: absolute;
+		top: 0;
+		left: 24rpx;
+		right: 24rpx;
+		z-index: 20;
+		pointer-events: none;
 	}
 
 	.back-btn {
-		width: 60rpx;
-		height: 60rpx;
+		position: absolute;
+		left: 0;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.96);
+		border: 1rpx solid rgba(255, 255, 255, 0.82);
+		box-shadow: 0 8rpx 18rpx rgba(154, 82, 42, 0.08);
+		box-sizing: border-box;
+		pointer-events: auto;
 	}
 
 	.page-title {
@@ -687,7 +717,7 @@
 	}
 
 	.hero-community {
-		margin-top: 36rpx;
+		margin-top: 112rpx;
 		padding: 22rpx 22rpx 20rpx;
 		display: flex;
 		align-items: center;
@@ -697,7 +727,7 @@
 		border-radius: 40rpx;
 		background: linear-gradient(135deg, rgba(255, 255, 255, 0.34), rgba(255, 246, 232, 0.2));
 		border: 1rpx solid rgba(255, 255, 255, 0.58);
-		box-shadow: 0 24rpx 54rpx rgba(166, 87, 39, 0.16);
+		box-shadow: none;
 		backdrop-filter: blur(18rpx);
 		overflow: hidden;
 	}
@@ -1470,6 +1500,8 @@
 	.shop-list {
 		width: 94%;
 		margin: 0 auto;
+		position: relative;
+		z-index: 1;
 	}
 
 	.empty-card {
@@ -1517,6 +1549,7 @@
 		border: 1rpx solid rgba(255, 221, 188, 0.72);
 		box-shadow: 0 16rpx 34rpx rgba(178, 102, 48, 0.12);
 		position: relative;
+		z-index: 1;
 		overflow: hidden;
 		box-sizing: border-box;
 	}
diff --git a/package2/partTimeJob/workerOrderList.vue b/package2/partTimeJob/workerOrderList.vue
index ae50b82..e8ffa39 100644
--- a/package2/partTimeJob/workerOrderList.vue
+++ b/package2/partTimeJob/workerOrderList.vue
@@ -1,28 +1,31 @@
 <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="{'padding-top': menuButtonInfo.top +'px'}">
-					已完成订单
+		<view class="worker-order-fixed">
+			<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="{'padding-top': menuButtonInfo.top +'px'}">
+						已完成订单
+					</view>
 				</view>
 			</view>
-		</view>
 
-		<view class="summary-card">
-			<view class="summary-label">共计送达</view>
-			<view class="summary-count">{{totalCount}}<text>单</text></view>
-		</view>
+			<view class="summary-card">
+				<view class="summary-label">共计送达</view>
+				<view class="summary-count">{{totalCount}}<text>单</text></view>
+			</view>
 
-		<view class="search-card">
-			<view class="date-picker-wrap">
-				<uni-datetime-picker :clear-icon="false" v-model="range" type="daterange" @change="searchList" />
+			<view class="search-card">
+				<view class="date-picker-wrap">
+					<uni-datetime-picker :clear-icon="false" v-model="range" type="daterange" @change="searchList" />
+				</view>
+				<view class="reset-btn" @tap="resetDateRange">重置</view>
 			</view>
-			<view class="reset-btn" @tap="resetDateRange">重置</view>
 		</view>
+		<view class="worker-order-fixed-holder"></view>
 
 		<view class="list-wrap">
 			<view class="box1" @tap="goDetail(item)" v-for="(item,index) in orderList" :key="index">
@@ -96,7 +99,7 @@
 				<view class="fee-row">
 					<view class="big-tag" v-if="item.isBig != null && item.isBig == 1">超大/超重</view>
 					<view class="fee-text">
-						配送佣金 <text>￥{{item.deliveryFee || 0}}</text>
+						配送佣金 <text>￥{{(item.deliveryFee + item.deliveryFeeMarketplace).toFixed(2)}}</text>
 					</view>
 					<view class="market-fee" v-if="item.deliveryFeeMarketplace != null">
 						含平台￥{{item.deliveryFeeMarketplace}}
@@ -368,6 +371,20 @@
 		padding-bottom: 40rpx;
 	}
 
+	.worker-order-fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		padding-bottom: 12rpx;
+		background: #F5F8F5;
+	}
+
+	.worker-order-fixed-holder {
+		height: 462rpx;
+	}
+
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
@@ -435,6 +452,8 @@
 	.list-wrap {
 		width: 92%;
 		margin: 0 auto;
+		position: relative;
+		z-index: 1;
 	}
 
 	.search-card {
diff --git a/package2/shop/afterService.vue b/package2/shop/afterService.vue
index f5bf37c..57bd737 100644
--- a/package2/shop/afterService.vue
+++ b/package2/shop/afterService.vue
@@ -1,15 +1,18 @@
 <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="{'padding-top': menuButtonInfo.top +'px'}">
-					待退款/售后{{returnCount}}
+		<view class="after-service-fixed">
+			<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="{'padding-top': menuButtonInfo.top +'px'}">
+						待退款/售后{{returnCount}}
+					</view>
 				</view>
 			</view>
 		</view>
+		<view class="after-service-fixed-holder"></view>
 		<view class="content">
 			<!-- <view class="box1" style="display: flex;">
 				<view class="">
@@ -61,6 +64,9 @@
 						<view class="btn" @tap="orderDetailOpen(item)" style="display: inline-block;">
 							查看订单
 						</view>
+						<view class="btn group-detail-btn" v-if="item.mallOrder && item.mallOrder.orderType != 1" @tap.stop="getGroupOrders(item.mallOrder.id || item.orderId)" style="display: inline-block;">
+							拼团详情
+						</view>
 					</view>
 					<view class="btn" :class="{'btn-disabled': isSubmittingRefund(item)}" @tap="returnAmountAllow(item,0)" style="background: rgba(0, 35, 28, 1);color: rgba(166, 255, 234, 1);">
 						{{isSubmittingRefund(item) ? '处理中' : '不同意'}}
@@ -72,66 +78,43 @@
 			</view>
 			
 			<!-- 拼团详情弹窗 -->
-			<uni-popup ref="pintuanPopup" background-color="#fff">
-				<view class="guize-list">
-					<view v-for="(item,index) in tuanzhangOrder" :key="index">
-						<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;">
-							订单-{{item.numberCode}}
+			<uni-popup ref="pintuanPopup" background-color="transparent">
+				<view class="group-popup">
+					<view class="group-popup-header">
+						<view>
+							<view class="group-popup-title">拼团详情</view>
+							<view class="group-popup-subtitle">共{{tuanzhangOrder.length}}个订单，请核对退款关联订单</view>
 						</view>
-						<view class="">
-							<view class="dingdan">
-								<view style="display:flex">
-									<view style="width:300rpx;">
-										订单状态：
-									</view>
-									<view class="pituan-text">
-										{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
-									</view>
-								</view>
-								<view style="display:flex">
-									<view style="width:300rpx;">
-										订单号：
-									</view>
-									<view class="pituan-text">
-										{{item.id}}
-									</view>
-									
-								</view>
-								<view style="display:flex">
-									<view style="width:300rpx;">
-										订单时间：
-									</view>
-									<view class="pituan-text">
-										{{item.createTime | formatISOTime}}
-									</view>
-								</view>
+						<view class="group-popup-close" @tap="$refs.pintuanPopup.close()">×</view>
+					</view>
+					<scroll-view scroll-y class="group-popup-scroll">
+						<view class="group-order-card" v-for="(item,index) in tuanzhangOrder" :key="index">
+							<view class="group-order-head">
+								<view class="group-order-code">订单-{{item.numberCode || item.id}}</view>
+								<view class="group-order-status">{{getStatusText(item)}}</view>
 							</view>
-							<view class="dingdan" v-for="(item1,index1) in item.goodsList" :key="index1">
-								<view class="pt-title">
-									商品信息
-								</view>
-								<view style="display: flex;font-weight: 700;">
-									<view style="flex:1">
-										商品名：{{item1.productName}}
-									</view>
-									<view style="width:100rpx;">
-										X{{item1.quantity}}
-									</view>
-									<view style="width:220rpx;text-align: right;padding-right:20rpx;">
-										￥{{item1.price}}
-									</view>
-								</view>
+							<view class="group-info-row">
+								<text>订单号</text>
+								<text>{{item.id}}</text>
 							</view>
-							<view class="dingdan">
-								<view style="text-align: right;padding-right: 20rpx;color: #777;">
-									餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
-								</view>
-								<view style="text-align: right;padding-right: 20rpx;font-size: 28rpx;font-weight: 700;color: red;">
-									总计：￥{{item.totalAmount}}
+							<view class="group-info-row">
+								<text>订单时间</text>
+								<text>{{item.createTime | formatISOTime}}</text>
+							</view>
+							<view class="group-goods-list">
+								<view class="group-goods-row" v-for="(item1,index1) in item.goodsList" :key="index1">
+									<view class="group-goods-name">{{item1.productName}}</view>
+									<view class="group-goods-num">X{{item1.quantity}}</view>
+									<view class="group-goods-price">￥{{item1.price}}</view>
 								</view>
 							</view>
+							<view class="group-fee-row">
+								餐盒费：￥{{item.packageFee || 0}}　配送费：￥{{item.deliveryFee || 0}}
+							</view>
+							<view class="group-total-row">总计：￥{{item.totalAmount || 0}}</view>
 						</view>
-					</view>
+						<view class="group-popup-empty" v-if="tuanzhangOrder.length == 0">暂无拼团订单</view>
+					</scroll-view>
 				</view>
 			</uni-popup>
 			<uni-popup ref="orderPopup" background-color="transparent">
@@ -261,14 +244,18 @@
 				this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
 					if (res.code == 200) {
 						this.tuanzhangOrder = res.result;
-						this.$refs.pintuanPopup.open('bottom')
+						this.$refs.pintuanPopup.open('center')
 					} else {
-						that.tui.toast(res.message)
+						this.tui.toast(res.message)
 						return
 					}
 					uni.hideLoading()
 				}).catch((res) => {})
 			},
+			getStatusText(item) {
+				if (!item) return ''
+				return item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':''
+			},
 			orderDetailOpen(item){
 				this.returnFormData.id = item.id;
 				this.returnFormData.linkId = item.linkId;
@@ -461,10 +448,24 @@
 		box-sizing: border-box;
 	}
 
+	.after-service-fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		background: #F5F8F5;
+	}
+
+	.after-service-fixed-holder {
+		height: 260rpx;
+	}
+
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
 		height: 260rpx;
+		background-size: 100% 100%;
 	}
 
 	.title-sreach {
@@ -488,7 +489,7 @@
 		text-align: center;
 	}
 	.content{
-		margin: -100rpx auto 0;
+		margin: 20rpx auto 0;
 		padding-bottom: 60rpx;
 	}
 	.box1 {
@@ -602,6 +603,11 @@
 		opacity: 0.6;
 		pointer-events: none;
 	}
+	.group-detail-btn {
+		margin-left: 14rpx;
+		background: linear-gradient(90deg, #FF4500, #FFA07A);
+		color: #fff;
+	}
 	.popup-area-title {
 		font-size: 36rpx;
 		font-weight: bold;
@@ -654,24 +660,127 @@
 		margin: 16rpx 0;
 		color: #777;
 	}
-	.guize-list {
-		width: 100%;
-		padding: 20rpx;
-		overflow: scroll;
+	.group-popup {
+		width: 660rpx;
+		max-height: 880rpx;
+		padding: 28rpx 24rpx 32rpx;
+		box-sizing: border-box;
+		border-radius: 32rpx;
+		background: #f7faf8;
+		box-shadow: 0 24rpx 60rpx rgba(0, 35, 28, 0.22);
+	}
+	.group-popup-header {
+		display: flex;
+		align-items: center;
+		padding-bottom: 22rpx;
+	}
+	.group-popup-title {
+		color: #00231C;
+		font-size: 36rpx;
+		font-weight: 900;
+		line-height: 48rpx;
+	}
+	.group-popup-subtitle {
+		margin-top: 6rpx;
+		color: #7a8582;
+		font-size: 24rpx;
+	}
+	.group-popup-close {
+		width: 56rpx;
+		height: 56rpx;
+		margin-left: auto;
+		border-radius: 56rpx;
 		background: #fff;
-		max-height: 1000rpx;
-		line-height: 25px;
+		color: #7a8582;
+		font-size: 42rpx;
+		line-height: 50rpx;
+		text-align: center;
 	}
-	.pt-title{
-		font-size: 28rpx;
-		    font-weight: 700;
-		    color: #777;
+	.group-popup-scroll {
+		max-height: 690rpx;
+		height: 690rpx;
+	}
+	.group-order-card {
+		margin-bottom: 18rpx;
+		padding: 22rpx;
+		border-radius: 24rpx;
+		background: #fff;
+		box-shadow: 0 10rpx 26rpx rgba(0, 35, 28, 0.08);
+	}
+	.group-order-head {
+		display: flex;
+		align-items: center;
+		padding-bottom: 16rpx;
+		border-bottom: 1px solid #eef2ef;
+	}
+	.group-order-code {
+		flex: 1;
+		color: #00231C;
+		font-size: 32rpx;
+		font-weight: 900;
+	}
+	.group-order-status {
+		padding: 6rpx 14rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 107, 53, 0.1);
+		color: #ff6b35;
+		font-size: 24rpx;
+		font-weight: 800;
+	}
+	.group-info-row {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 14rpx;
+		color: #6b7773;
+		font-size: 24rpx;
+		line-height: 34rpx;
+	}
+	.group-info-row text:last-child {
+		color: #00231C;
+		font-weight: 700;
+	}
+	.group-goods-list {
+		margin-top: 16rpx;
+		padding: 12rpx 0;
+		border-top: 1px dashed #e4ebe7;
+		border-bottom: 1px dashed #e4ebe7;
 	}
-	.dingdan{
-		    border-top: 1px solid #eee;
+	.group-goods-row {
+		display: flex;
+		align-items: center;
+		min-height: 46rpx;
+		color: #00231C;
+		font-size: 26rpx;
+		font-weight: 700;
+	}
+	.group-goods-name {
+		flex: 1;
+		padding-right: 12rpx;
+	}
+	.group-goods-num {
+		width: 80rpx;
+		text-align: center;
 	}
-	.uni-popup__wrapper{
-		border-radius: 20rpx !important;
+	.group-goods-price {
+		width: 120rpx;
+		text-align: right;
+	}
+	.group-fee-row {
+		margin-top: 14rpx;
+		color: #7a8582;
+		text-align: right;
+	}
+	.group-total-row {
+		margin-top: 8rpx;
+		color: red;
+		font-size: 30rpx;
+		font-weight: 900;
+		text-align: right;
+	}
+	.group-popup-empty {
+		padding: 80rpx 20rpx;
+		color: #7a8582;
+		text-align: center;
 	}
 	.pituan-text{
 		flex:1;
diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue
index 9e61b39..c846f3c 100644
--- a/package2/shop/merchantCenter.vue
+++ b/package2/shop/merchantCenter.vue
@@ -108,10 +108,10 @@
 				<view style="flex: 1;">
 					今日实时数据
 				</view>
-				<view @tap="goDetail('tj')">
+				<!-- <view @tap="goDetail('tj')">
 					更多
 					<uni-icons type="right" size="12"></uni-icons>
-				</view>
+				</view> -->
 			</view>
 			<view class="data2">
 				<view class="data22">
diff --git a/package2/shop/orderDetail.vue b/package2/shop/orderDetail.vue
index c3c997d..05f162b 100644
--- a/package2/shop/orderDetail.vue
+++ b/package2/shop/orderDetail.vue
@@ -13,9 +13,9 @@
 		</view>
 		<view class="content">
 			<view class="box1" style="display: flex;font-size: 28rpx;font-weight: 700;">
-				<text v-if="item.numberCode" style="margin-left: 20rpx;">{{'#'+data.numberCode}}</text>
-				<text style="margin-right: 20rpx;">期望送达</text>
-				<text>明天 06:30</text>
+				<text v-if="data.numberCode" style="margin-right: 20rpx;">{{'#'+data.numberCode}}</text>
+				<text style="margin-right: 20rpx;">{{getHeaderTimeLabel(data)}}</text>
+				<text>{{getHeaderTimeText(data)}}</text>
 				<text style="flex: 1;text-align: right;color: red;">
 					{{data.status == 0?'待支付':data.status == 2?'待配送员接单':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime == null) || (data.status == 3 && data.deliveryType == 2 && data.userRequireMake == 1)?'待出餐':(data.status == 3 && data.deliveryType == 1 && data.shopMakeTime != null)?'待取货':(data.status == 3 && data.deliveryType == 2)?'待消费':data.status == 4?'待送达':data.status == 5?'已完成':data.status == 7?'待同意退款':data.status == 8?'已退款':data.status == 6?'已取消':data.status == 11?'售后中':data.status == 12?'已售后':""}}
 				</text>
@@ -25,39 +25,47 @@
 					{{data.deliveryType == 1?'配送订单':data.isPack == 1?'自取-打包':data.isPack == 0?'自取-堂食':'自取'}}
 				</view>
 				<view v-if="data.deliveryType == 1" style="display: flex;flex: 1;padding-left: 20rpx;">
-					<text style="flex: 1;">配送员：{{(data.deliveryInfo.workerName == 'null' || !data.deliveryInfo.workerName) ?"":data.deliveryInfo.workerName}}</text>
-					<view class="" v-if="data.deliveryInfo">
+					<text style="flex: 1;">{{data.shopDelivery == 1 ? '商家配送员' : '配送员'}}：{{getWorkerName(data)}}</text>
+					<view class="" v-if="data.deliveryInfo && data.deliveryInfo.workerPhone">
 						<img @tap="makeCall(data.deliveryInfo.workerPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 20rpx;" />
 					</view>
 				</view>
 			</view>
-			<view class="box1" v-if="data.deliveryType == 1" style="display: flex;">
+			<view class="box1 delivery-card" v-if="data.deliveryType == 1 && data.deliveryInfo" style="display: flex;">
 				<view style="flex: 1;">
 					<view style="font-weight: 700;height: 50rpx;">
 						收货人：{{data.deliveryInfo.receiverName}}
 					</view>
-					<view style="color: #777;height: 70rpx;">
+					<view style="color: #777;line-height: 36rpx;">
 						{{data.deliveryInfo.receiverAddress}}
 					</view>
+					<view class="delivery-time" v-if="data.deliveryInfo.mustFinishTime">
+						预计{{data.deliveryInfo.mustFinishTime | formatHourMinute}}送达
+					</view>
 				</view>
-				<view class="">
+				<view class="" v-if="data.deliveryInfo.receiverPhone">
 					<img @tap="makeCall(data.deliveryInfo.receiverPhone)" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png" alt="" style="width: 60rpx;height: 60rpx;margin-top: 28rpx;" />
 				</view>
 			</view>
+			<view class="box1 remark-box" v-if="data.remark">
+				<view class="remark-label">用户备注</view>
+				<view class="remark-text">{{data.remark}}</view>
+			</view>
 			<view class="box1">
 				<view style="border-bottom: 1px solid #eee;padding-bottom: 20rpx;">
 					<view style="font-size: 32rpx;height: 60rpx;">
 						商品 <text style="font-size: 28rpx;color: #777;">共{{data.goodsNum}}件</text>
 					</view>
-					<view v-for="(item,index) in data.goodsList" :key="index" style="display: flex;height: 40rpx;line-height: 40rpx;">
+					<view v-for="(item,index) in data.goodsList" :key="index" style="display: flex;min-height: 48rpx;line-height: 40rpx;">
 						<view style="flex: 1;">
-							{{item.productName}}
+							<view>{{item.productName}}</view>
+							<view class="goods-spec" v-if="item.specs">{{item.specs | delNode}}</view>
 						</view>
 						<view style="width: 60rpx;">
 							{{'x'+ item.quantity}}
 						</view>
 						<view style="width: 100rpx;text-align: right;">
-							{{'￥'+ item.price == undefined ? 0:item.price}}
+							￥{{formatAmount(item.price)}}
 						</view>
 					</view>
 				</view>
@@ -67,7 +75,15 @@
 							商品金额
 						</view>
 						<view class="">
-							{{'￥' + data.goodsAmount == undefined ? 0:data.goodsAmount}}
+							￥{{formatAmount(data.goodsAmount)}}
+						</view>
+					</view>
+					<view style="display: flex;height: 60rpx;line-height: 60rpx;" v-if="data.packageFee != null && data.packageFee > 0">
+						<view style="flex: 1;">
+							打包/餐盒费
+						</view>
+						<view class="">
+							￥{{formatAmount(data.packageFee)}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
@@ -75,7 +91,23 @@
 							配送费
 						</view>
 						<view class="">
-							{{'￥' + data.deliveryFee == undefined ? 0:data.deliveryFee}}
+							￥{{formatAmount(data.deliveryFee)}}
+						</view>
+					</view>
+					<view style="display: flex;height: 60rpx;line-height: 60rpx;" v-if="data.freeAmount != null && data.freeAmount > 0">
+						<view style="flex: 1;color: #ff6f2c;font-weight: 700;">
+							锦鲤免单
+						</view>
+						<view style="color: #ff6f2c;font-weight: 700;">
+							￥{{formatAmount(data.freeAmount)}}
+						</view>
+					</view>
+					<view style="display: flex;height: 60rpx;line-height: 60rpx;" v-if="data.userCouponNum != null && data.userCouponNum > 0">
+						<view style="flex: 1;">
+							优惠券
+						</view>
+						<view class="">
+							-￥{{formatAmount(data.userCouponNum)}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
@@ -83,7 +115,7 @@
 							客户实际支付
 						</view>
 						<view class="">
-							{{'￥'+ data.totalAmount == undefined ? 0:data.totalAmount}}
+							￥{{formatAmount(data.totalAmount)}}
 						</view>
 					</view>
 					<view style="display: flex;height: 60rpx;line-height: 60rpx;">
@@ -114,6 +146,86 @@
 							{{data.createTime | formatISOTime}}
 						</view>
 					</view>
+					<view v-if="data.payTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 140rpx;">
+							支付时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.payTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.groupInfo && data.groupInfo.successTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 140rpx;">
+							成团时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.groupInfo.successTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryType == 2 && data.shopMakeTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 140rpx;">
+							核销时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.shopMakeTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryType == 1 && data.deliveryInfo.acceptTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							接单时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.deliveryInfo.acceptTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryType == 1 && data.shopMakeTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							商家出餐时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.shopMakeTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryType == 1 && data.deliveryInfo.arriveTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							到店时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.deliveryInfo.arriveTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryType == 1 && data.deliveryInfo.getTime" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							取货时间
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.deliveryInfo.getTime | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryType == 1" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							{{data.deliveryInfo.finishTime ? '送达时间' : '预计送达'}}
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{(data.deliveryInfo.finishTime || data.deliveryInfo.mustFinishTime || '尽快送达') | formatISOTime}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryInfo.transferDelivery == 1" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							中转配送
+						</view>
+						<view style="flex: 1;text-align: right;color: #ff6f2c;font-weight: 700;">
+							{{data.deliveryInfo.transferAddressName || data.transferAddressName || '是'}}
+						</view>
+					</view>
+					<view v-if="data.deliveryInfo && data.deliveryInfo.transferDelivery == 1" style="display: flex;height: 60rpx;line-height: 60rpx;">
+						<view style="width: 180rpx;">
+							送达中转点
+						</view>
+						<view style="flex: 1;text-align: right;">
+							{{data.deliveryInfo.transferArriveTime ? formatTimeText(data.deliveryInfo.transferArriveTime) : '未送达'}}
+						</view>
+					</view>
 					<view v-if="data.receiverPhone" style="display: flex;height: 60rpx;line-height: 60rpx;">
 						<view style="width: 140rpx;">
 							用户账号
@@ -150,12 +262,12 @@
 		</view>
 		<!-- 拼团信息弹出层 -->
 		<uni-popup ref="groupPopup" background-color="#fff">
-			<view class="group-content">
+			<view class="group-content" v-if="data.groupInfo">
 				<view style="height: 100rpx;text-align: center;line-height: 100rpx;font-size: 36rpx;font-weight: 700;">
 					<text>{{data.groupInfo.targetMembers}}人团/</text><text>已拼{{data.groupInfo.currentMembers}}人</text>
 				</view>
 				<view class="kaituan2">
-					<view class="kaituan22" style="display: flex;" v-if="data.groupInfo">
+					<view class="kaituan22" style="display: flex;" v-if="data.groupInfo.groupIdList">
 						<view class="" @tap="goDetail(item)" v-for="(item,index) in data.groupInfo.groupIdList" :key="index" style="width: 90rpx;height: 90rpx;margin: 0 auto;position: relative;">
 							<view style="z-index: 99;position: absolute;top:0;width: 90rpx;height: 90rpx;border-radius: 90rpx;border:4rpx solid #48D1CC"></view>
 							<view style="">
@@ -191,8 +303,20 @@
 			}
 		},
 		filters:{
+			formatHourMinute(value) {
+				if (!value) return '';
+				if (value == '尽快送达') return '尽快送达';
+				const date = new Date(value);
+				if (isNaN(date.getTime())) return value;
+				const hour = String(date.getHours()).padStart(2, '0');
+				const minute = String(date.getMinutes()).padStart(2, '0');
+				return `${hour}:${minute}`;
+			},
 			formatISOTime(isoString) {
+				if (!isoString) return '';
+				if (isoString == '尽快送达') return '尽快送达';
 			  const date = new Date(isoString);
+				if (isNaN(date.getTime())) return isoString;
 			  const year = date.getFullYear();
 			  const month = (date.getMonth() + 1).toString().padStart(2, '0');
 			  const day = date.getDate().toString().padStart(2, '0');
@@ -201,8 +325,19 @@
 			  const seconds = date.getSeconds().toString().padStart(2, '0');
 			  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 			},
+			delNode(data) {
+				if (data == null || data === '') return '';
+				let str = '';
+				if (typeof data === 'object') {
+					str = JSON.stringify(data);
+				} else {
+					str = String(data);
+				}
+				return str.replace(/[{}"]/g, '');
+			},
 			lastFour(str){
-				return str.slice(-4);
+				if (str == null) return '';
+				return String(str).slice(-4);
 			}
 		},
 		onShow() {
@@ -213,6 +348,31 @@
 			this.getDetail()
 		},
 		methods: {
+			formatTimeText(value) {
+				return this.$options.filters.formatISOTime(value);
+			},
+			formatAmount(value) {
+				if (value === undefined || value === null || value === '') return '0';
+				return value;
+			},
+			getHeaderTimeLabel(item) {
+				if (item && item.deliveryType == 1) return item.deliveryInfo && item.deliveryInfo.finishTime ? '送达时间' : '预计送达'
+				if (item && item.payTime) return '支付时间'
+				return '下单时间'
+			},
+			getHeaderTimeText(item) {
+				if (!item) return ''
+				if (item.deliveryType == 1 && item.deliveryInfo) {
+					return this.$options.filters.formatHourMinute(item.deliveryInfo.finishTime || item.deliveryInfo.mustFinishTime || '尽快送达')
+				}
+				return this.$options.filters.formatISOTime(item.payTime || item.createTime)
+			},
+			getWorkerName(item) {
+				if (!item || !item.deliveryInfo) return '未指定等待接单中'
+				const name = item.deliveryInfo.workerName
+				if (!name || name == 'null') return '未指定等待接单中'
+				return name
+			},
 			getDetail(){
 				let that = this
 				that.tui.request("/mall/order/detail/"+ this.shopId, "get", {}, false, false).then((res) => {
@@ -220,19 +380,23 @@
 						that.data = res.result
 						
 						//商家预计收入的计算
-						let price = that.data.goodsAmount+that.data.packageFee
+						let price = Number(that.data.goodsAmount || 0) + Number(that.data.packageFee || 0)
+						let shopTakeaway = uni.getStorageSync('shopTakeaway') || {}
 						if(that.data.orderType == 1){
-							that.data.chouyong = (price/100 * uni.getStorageSync('shopTakeaway').commissionRateOne).toFixed(2)
+							that.data.chouyong = (price/100 * Number(shopTakeaway.commissionRateOne || 0)).toFixed(2)
 							that.data.yujishouru = (price - that.data.chouyong).toFixed(2)
 						}else{
-							that.data.chouyong = (price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore).toFixed(2)
+							that.data.chouyong = (price/100 * Number(shopTakeaway.commissionRateMore || 0)).toFixed(2)
 							that.data.yujishouru = (price - that.data.chouyong).toFixed(2)
 						}
-						if(that.data.groupInfo != null && that.data.groupInfo != undefined){
+						if(that.data.groupInfo != null && that.data.groupInfo != undefined && that.data.groupInfo.groupOrderIds){
 							that.data.groupInfo.groupIdList = that.data.groupInfo.groupOrderIds.split(',');
 						}
 						
 						that.data.goodsNum = 0
+						if (!that.data.goodsList) {
+							that.data.goodsList = []
+						}
 						for(let m=0;m<that.data.goodsList.length;m++){
 							that.data.goodsNum += that.data.goodsList[m].quantity
 						}
@@ -270,7 +434,8 @@
 								orderId:item.id
 							}, false, true).then((res) => {
 								if (res.code == 200) {
-									this.back()
+									uni.setStorageSync('refreshShopOrderList', true)
+									that.back()
 								} else {
 									that.tui.toast(res.message);
 									return;
@@ -337,6 +502,7 @@
 	}
 	.content{
 		margin: -140rpx auto;
+		padding-bottom: 220rpx;
 	}
 	.box1 {
 		width: 95%;
@@ -364,6 +530,48 @@
 		float: right;
 		margin-left: 20rpx;
 	}
+	.delivery-card {
+		align-items: center;
+	}
+	.delivery-time {
+		display: inline-block;
+		margin-top: 12rpx;
+		padding: 6rpx 14rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 107, 53, 0.1);
+		color: #ff6b35;
+		font-weight: 700;
+	}
+	.remark-box {
+		display: flex;
+		border: 1px solid rgba(255, 107, 53, 0.22);
+		background: linear-gradient(90deg, #fff6eb, #fffbf3);
+	}
+	.remark-label {
+		flex-shrink: 0;
+		height: 40rpx;
+		line-height: 40rpx;
+		margin-right: 14rpx;
+		padding: 0 12rpx;
+		border-radius: 10rpx;
+		background: #ff6b35;
+		color: #fff;
+		font-weight: 700;
+	}
+	.remark-text {
+		flex: 1;
+		color: #9a3d00;
+		font-size: 28rpx;
+		font-weight: 700;
+		line-height: 40rpx;
+		word-break: break-all;
+	}
+	.goods-spec {
+		margin-top: 4rpx;
+		color: #777;
+		font-size: 22rpx;
+		line-height: 30rpx;
+	}
 	.group-content{
 		background: #fff;
 		width: 300px;
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index bff0fda..f115296 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -1,133 +1,115 @@
 <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="{'padding-top': menuButtonInfo.top +'px'}">
-					商家订单
+		<view class="shop-order-fixed">
+			<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="{'padding-top': menuButtonInfo.top +'px'}">
+						商家订单
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="title-tab">
-			<scroll-view class="status-scroll-view" scroll-x enable-flex :show-scrollbar="false"
-				:scroll-with-animation="true">
-				<view class="status-list">
-					<view v-for="(item, index) in statusList" :key="index" class="status-item"
-						:class="{ 'active': currentIndex == item.value }"
-						:style="{'width':item.name == '全部'?'14vw':'20vw'}"
-						@click="handleStatusClick(item.value)">
-						<text class="status-text">{{ item.name }}</text>
+			<view class="title-tab">
+				<scroll-view class="status-scroll-view" scroll-x enable-flex :show-scrollbar="false"
+					:scroll-with-animation="true">
+					<view class="status-list">
+						<view v-for="(item, index) in statusList" :key="index" class="status-item"
+							:class="{ 'active': currentIndex == item.value }"
+							:style="{'width':item.name == '全部'?'14vw':'20vw'}"
+							@click="handleStatusClick(item.value)"> 
+							<text class="status-text">{{ item.name }}</text>
+						</view>
 					</view>
-				</view>
-			</scroll-view>
+				</scroll-view>
+			</view>
 		</view>
+		<view class="shop-order-fixed-holder"></view>
 		<view class="box1" @tap="goDetail(item)" v-for="(item,index) in orderList" :key="index">
-			<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;">
-				<view style="display: flex;padding-right: 20rpx;" v-if="item.numberCode">
-					{{'#' + item.numberCode}}
-				</view>
-				<view style="flex: 1;display: flex;">
-					{{item.createTime | formatISOTime}}
-					<!-- <text>已退款</text> -->
+			<view class="order-head">
+				<view class="order-main">
+					<view class="order-code" v-if="item.numberCode">{{'#' + item.numberCode}}</view>
+					<view class="order-time">{{item.createTime | formatISOTime}}</view>
 				</view>
-				<view>
+				<view class="order-status">
 					{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake != 1)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
 				</view>
 			</view>
-			<view style="height: 120rpx;padding-top: 20rpx;">
-				<view style="height: 50rpx;line-height: 50rpx;font-size: 28rpx;font-weight: 700;display: flex;">
-					商品 <text>共<text>{{item.goodsNum}}</text>件</text>
+			<view class="goods-box">
+				<view class="goods-title">
+					<text>商品</text>
+					<text class="goods-count" :class="{ 'goods-count-important': item.goodsNum > 1 }">共{{item.goodsNum}}件</text>
 				</view>
-				<view style="display: flex;" v-for="(item1,index1) in item.goodsList" :key="index">
-					<view style="flex: 1;">
+				<view class="goods-row" v-for="(item1,index1) in item.goodsList" :key="index1">
+					<view class="goods-name">
 						{{item1.productName}}
 					</view>
-					<view style="width: 100rpx;">
+					<view class="goods-quantity" :class="{ 'goods-quantity-important': item1.quantity > 1 }">
 						{{'X' + item1.quantity}}
 					</view>
-					<view>
+					<view class="goods-price">
 						{{'￥'+ item1.price}}
 					</view>
 				</view>
 			</view>
-			<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
-				<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:auto;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));padding:0 12rpx;">
+			<view class="remark-box" v-if="getOrderRemark(item)">
+				<view class="remark-label">备注</view>
+				<view class="remark-content">{{getOrderRemark(item)}}</view>
+			</view>
+			<view class="order-footer">
+				<view class="delivery-tag" @tap.stop="tanchuang(item.deliveryType)">
 					{{item.deliveryType == 1?'配送':item.isPack == 1?'自取-打包':item.isPack == 0?'自取-堂食':'自取'}}
 				</view>
-				<view v-if="item.orderType != 1 && item.groupInfo != null" @tap.stop="getGroupOrders(item.id)" class="pinzi">
-					拼
+				<view v-if="item.orderType != 1" @tap.stop="getGroupOrders(item.id)" class="pinzi btn meal-btn">
+					拼团详情
 				</view>
-				<view style="flex: 1;"></view>
-				<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn" style="margin: 10rpx 0 0 20rpx;">
-					已出餐
+				<view class="footer-space"></view>
+				<view @tap.stop="mealServing(item)" v-if="currentIndex == 13" class="btn meal-btn">
+					出餐
 				</view>
 			</view>
 		</view>
 		<view style="width:100%;height:60rpx;"></view>
 		<!-- 拼团详情弹窗 -->
-		<uni-popup ref="pintuanPopup" background-color="#fff">
-			<view class="guize-list">
-				<view v-for="(item,index) in tuanzhangOrder" :key="index">
-					<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;">
-						订单-{{item.numberCode}}
+		<uni-popup ref="pintuanPopup" background-color="transparent">
+			<view class="group-popup">
+				<view class="group-popup-header">
+					<view>
+						<view class="group-popup-title">拼团详情</view>
+						<view class="group-popup-subtitle">共{{tuanzhangOrder.length}}个订单，请核对出餐信息</view>
 					</view>
-					<view class="">
-						<view class="dingdan">
-							<view style="display:flex">
-								<view style="width:300rpx;">
-									订单状态：
-								</view>
-								<view class="pituan-text">
-									{{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
-								</view>
-							</view>
-							<view style="display:flex">
-								<view style="width:300rpx;">
-									订单号：
-								</view>
-								<view class="pituan-text">
-									{{item.id}}
-								</view>
-								
-							</view>
-							<view style="display:flex">
-								<view style="width:300rpx;">
-									订单时间：
-								</view>
-								<view class="pituan-text">
-									{{item.createTime | formatISOTime}}
-								</view>
-							</view>
+					<view class="group-popup-close" @tap="$refs.pintuanPopup.close()">×</view>
+				</view>
+				<scroll-view scroll-y class="group-popup-scroll">
+					<view class="group-order-card" v-for="(item,index) in tuanzhangOrder" :key="index">
+						<view class="group-order-head">
+							<view class="group-order-code">订单-{{item.numberCode || item.id}}</view>
+							<view class="group-order-status">{{getStatusText(item)}}</view>
 						</view>
-						<view class="dingdan" v-for="(item1,index1) in item.goodsList" :key="index1">
-							<view class="pt-title">
-								商品信息
-							</view>
-							<view style="display: flex;font-weight: 700;">
-								<view style="flex:1">
-									商品名：{{item1.productName}}
-								</view>
-								<view style="width:100rpx;">
-									X{{item1.quantity}}
-								</view>
-								<view style="width:220rpx;text-align: right;padding-right:20rpx;">
-									￥{{item1.price}}
-								</view>
-							</view>
+						<view class="group-info-row">
+							<text>订单号</text>
+							<text>{{item.id}}</text>
 						</view>
-						<view class="dingdan">
-							<view style="text-align: right;padding-right: 20rpx;color: #777;">
-								餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
-							</view>
-							<view style="text-align: right;padding-right: 20rpx;font-size: 28rpx;font-weight: 700;color: red;">
-								总计：￥{{item.totalAmount}}
+						<view class="group-info-row">
+							<text>订单时间</text>
+							<text>{{item.createTime | formatISOTime}}</text>
+						</view>
+						<view class="group-goods-list">
+							<view class="group-goods-row" v-for="(item1,index1) in item.goodsList" :key="index1">
+								<view class="group-goods-name">{{item1.productName}}</view>
+								<view class="group-goods-num">X{{item1.quantity}}</view>
+								<view class="group-goods-price">￥{{item1.price}}</view>
 							</view>
 						</view>
+						<view class="group-fee-row">
+							餐盒费：￥{{item.packageFee || 0}}　配送费：￥{{item.deliveryFee || 0}}
+						</view>
+						<view class="group-total-row">总计：￥{{item.totalAmount || 0}}</view>
 					</view>
-				</view>
+					<view class="group-popup-empty" v-if="tuanzhangOrder.length == 0">暂无拼团订单</view>
+				</scroll-view>
 			</view>
 		</uni-popup>
 	</view>
@@ -161,11 +143,6 @@
 						value: 13,
 						checked: false
 					},
-					{
-						name: '待退/售后',
-						value: 7,
-						checked: false
-					},
 					{
 						name: '待取货',
 						value: 4,
@@ -221,6 +198,11 @@
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
 			this.searchForm.shopId = uni.getStorageSync('shopId')
 			this.regionId = JSON.parse(uni.getStorageSync('area')).id
+			if (uni.getStorageSync('refreshShopOrderList')) {
+				uni.removeStorageSync('refreshShopOrderList')
+				this.searchForm.pageNum = 1
+				this.getList()
+			}
 		},
 		onLoad(option) {
 			if (option.index) {
@@ -281,7 +263,7 @@
 				this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
 					if (res.code == 200) {
 						this.tuanzhangOrder = res.result;
-						this.$refs.pintuanPopup.open('bottom')
+						this.$refs.pintuanPopup.open('center')
 					} else {
 						that.tui.toast(res.message)
 						return
@@ -292,6 +274,19 @@
 			openPopup(){
 				this.$refs.groupPopup.open()
 			},
+			getOrderRemark(item) {
+				if (!item) return ''
+				return item.remark || (item.mallOrder && item.mallOrder.remark) || ''
+			},
+			getOrderId(item) {
+				if (!item) return ''
+				if (item.mallOrder && item.mallOrder.id) return item.mallOrder.id
+				return item.orderId || item.mallOrderId || item.id || ''
+			},
+			getStatusText(item) {
+				if (!item) return ''
+				return item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':''
+			},
 			mealServing(item){
 				let that = this
 				uni.showModal({
@@ -322,11 +317,10 @@
 				});
 			},
 			goDetail(item) {
-				let id = ""
-				if(this.currentIndex == 7){
-					id = item.mallOrder.id
-				}else{
-					id = item.id
+				let id = this.getOrderId(item)
+				if (!id) {
+					this.tui.toast('未找到订单信息')
+					return
 				}
 				uni.navigateTo({
 					url: '/package2/shop/orderDetail?id=' + id
@@ -362,10 +356,24 @@
 		position: relative;
 	}
 
+	.shop-order-fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 1000;
+		background: #F5F8F5;
+	}
+
+	.shop-order-fixed-holder {
+		height: 288rpx;
+	}
+
 	.title {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat;
 		width: 100%;
-		height: 20%;
+		height: 200rpx;
+		background-size: 100% 100%;
 	}
 
 	.title-sreach {
@@ -391,7 +399,8 @@
 
 	.title-tab {
 		display: flex;
-		margin: -120rpx auto 0;
+		margin: 0 auto;
+		background: #F5F8F5;
 	}
 
 	.status-scroll-view {
@@ -455,11 +464,178 @@
 	}
 
 	.box1 {
-		width: 95%;
+		width: 92%;
 		margin: 20rpx auto;
 		background: #fff;
-		border-radius: 20rpx;
-		    padding: 20rpx 20rpx 0;
+		border-radius: 24rpx;
+		padding: 24rpx 24rpx 0;
+		box-shadow: 0 12rpx 32rpx rgba(0, 35, 28, 0.08);
+		overflow: hidden;
+	}
+
+	.order-head {
+		display: flex;
+		align-items: flex-start;
+		padding-bottom: 18rpx;
+		border-bottom: 1px solid #eef2ef;
+	}
+
+	.order-main {
+		flex: 1;
+		min-width: 0;
+	}
+
+	.order-code {
+		display: inline-block;
+		height: 42rpx;
+		line-height: 42rpx;
+		padding: 0 16rpx;
+		margin-bottom: 8rpx;
+		border-radius: 999rpx;
+		background: #00231C;
+		color: #E3FF96;
+		font-size: 28rpx;
+		font-weight: 700;
+	}
+
+	.order-time {
+		color: #7a8582;
+		font-size: 24rpx;
+	}
+
+	.order-status {
+		margin-left: 20rpx;
+		padding: 8rpx 16rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 107, 53, 0.1);
+		color: #ff6b35;
+		font-size: 26rpx;
+		font-weight: 700;
+		white-space: nowrap;
+	}
+
+	.goods-box {
+		padding: 22rpx 0 16rpx;
+	}
+
+	.goods-title {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 12rpx;
+		font-size: 30rpx;
+		font-weight: 700;
+	}
+
+	.goods-count {
+		padding: 4rpx 14rpx;
+		border-radius: 999rpx;
+		background: #f1f5f2;
+		color: #52736b;
+		font-size: 24rpx;
+		font-weight: 700;
+	}
+
+	.goods-count-important {
+		background: linear-gradient(90deg, #FFE8D6, #FFF5E9);
+		color: #ff4d00;
+	}
+
+	.goods-row {
+		display: flex;
+		align-items: center;
+		min-height: 46rpx;
+		line-height: 1.35;
+		color: #253b35;
+	}
+
+	.goods-name {
+		flex: 1;
+		padding-right: 16rpx;
+		font-size: 26rpx;
+	}
+
+	.goods-quantity {
+		width: 92rpx;
+		text-align: center;
+		color: #52736b;
+		font-weight: 700;
+	}
+
+	.goods-quantity-important {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 42rpx;
+		border-radius: 14rpx;
+		background: linear-gradient(90deg, #FF4500, #FFA07A);
+		color: #fff;
+		font-size: 28rpx;
+	}
+
+	.goods-price {
+		width: 120rpx;
+		text-align: right;
+		color: #00231C;
+		font-weight: 700;
+	}
+
+	.remark-box {
+		display: flex;
+		margin: 0 0 18rpx;
+		padding: 18rpx;
+		border: 1px solid rgba(255, 107, 53, 0.22);
+		border-radius: 18rpx;
+		background: linear-gradient(90deg, rgba(255, 246, 235, 1), rgba(255, 251, 243, 1));
+	}
+
+	.remark-label {
+		flex-shrink: 0;
+		height: 40rpx;
+		line-height: 40rpx;
+		margin-right: 14rpx;
+		padding: 0 12rpx;
+		border-radius: 10rpx;
+		background: #ff6b35;
+		color: #fff;
+		font-size: 24rpx;
+		font-weight: 700;
+	}
+
+	.remark-content {
+		flex: 1;
+		color: #9a3d00;
+		font-size: 28rpx;
+		font-weight: 700;
+		line-height: 40rpx;
+		word-break: break-all;
+	}
+
+	.order-footer {
+		display: flex;
+		align-items: center;
+		min-height: 80rpx;
+		border-top: 1px solid #eef2ef;
+	}
+
+	.delivery-tag {
+		width: auto;
+		height: 44rpx;
+		line-height: 44rpx;
+		margin-right: 20rpx;
+		padding: 0 14rpx;
+		border-radius: 12rpx;
+		background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+		color: #00231C;
+		font-weight: 700;
+	}
+
+	.footer-space {
+		flex: 1;
+	}
+
+	.meal-btn {
+		margin: 0 0 0 20rpx;
 	}
 	.btn{
 		background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
@@ -474,31 +650,134 @@
 	.pinzi{
 		margin: 20rpx 0;
 		background: linear-gradient(90deg, #FF4500, #FFA07A);
-		width: 40rpx;
+		width: 120rpx;
 		height: 40rpx;
 		line-height: 40rpx;
 		text-align: center;
 		border-radius: 10rpx;
 		color: #fff;
 	}
-	.guize-list {
-		width: 100%;
-		padding: 20rpx;
-		overflow: scroll;
+	.group-popup {
+		width: 660rpx;
+		max-height: 880rpx;
+		padding: 28rpx 24rpx 32rpx;
+		box-sizing: border-box;
+		border-radius: 32rpx;
+		background: #f7faf8;
+		box-shadow: 0 24rpx 60rpx rgba(0, 35, 28, 0.22);
+	}
+	.group-popup-header {
+		display: flex;
+		align-items: center;
+		padding-bottom: 22rpx;
+	}
+	.group-popup-title {
+		color: #00231C;
+		font-size: 36rpx;
+		font-weight: 900;
+		line-height: 48rpx;
+	}
+	.group-popup-subtitle {
+		margin-top: 6rpx;
+		color: #7a8582;
+		font-size: 24rpx;
+	}
+	.group-popup-close {
+		width: 56rpx;
+		height: 56rpx;
+		margin-left: auto;
+		border-radius: 56rpx;
 		background: #fff;
-		max-height: 1000rpx;
-		line-height: 25px;
+		color: #7a8582;
+		font-size: 42rpx;
+		line-height: 50rpx;
+		text-align: center;
 	}
-	.pt-title{
-		font-size: 28rpx;
-		    font-weight: 700;
-		    color: #777;
+	.group-popup-scroll {
+		max-height: 690rpx;
+		height: 690rpx;
+	}
+	.group-order-card {
+		margin-bottom: 18rpx;
+		padding: 22rpx;
+		border-radius: 24rpx;
+		background: #fff;
+		box-shadow: 0 10rpx 26rpx rgba(0, 35, 28, 0.08);
+	}
+	.group-order-head {
+		display: flex;
+		align-items: center;
+		padding-bottom: 16rpx;
+		border-bottom: 1px solid #eef2ef;
+	}
+	.group-order-code {
+		flex: 1;
+		color: #00231C;
+		font-size: 32rpx;
+		font-weight: 900;
+	}
+	.group-order-status {
+		padding: 6rpx 14rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 107, 53, 0.1);
+		color: #ff6b35;
+		font-size: 24rpx;
+		font-weight: 800;
 	}
-	.dingdan{
-		    border-top: 1px solid #eee;
+	.group-info-row {
+		display: flex;
+		justify-content: space-between;
+		padding-top: 14rpx;
+		color: #6b7773;
+		font-size: 24rpx;
+		line-height: 34rpx;
 	}
-	.uni-popup__wrapper{
-		border-radius: 20rpx !important;
+	.group-info-row text:last-child {
+		color: #00231C;
+		font-weight: 700;
+	}
+	.group-goods-list {
+		margin-top: 16rpx;
+		padding: 12rpx 0;
+		border-top: 1px dashed #e4ebe7;
+		border-bottom: 1px dashed #e4ebe7;
+	}
+	.group-goods-row {
+		display: flex;
+		align-items: center;
+		min-height: 46rpx;
+		color: #00231C;
+		font-size: 26rpx;
+		font-weight: 700;
+	}
+	.group-goods-name {
+		flex: 1;
+		padding-right: 12rpx;
+	}
+	.group-goods-num {
+		width: 80rpx;
+		text-align: center;
+	}
+	.group-goods-price {
+		width: 120rpx;
+		text-align: right;
+	}
+	.group-fee-row {
+		margin-top: 14rpx;
+		color: #7a8582;
+		text-align: right;
+	}
+	.group-total-row {
+		margin-top: 8rpx;
+		color: red;
+		font-size: 30rpx;
+		font-weight: 900;
+		text-align: right;
+	}
+	.group-popup-empty {
+		padding: 80rpx 20rpx;
+		color: #7a8582;
+		text-align: center;
 	}
 	.pituan-text{
 		flex:1;