From 6a9bb9f28c18de9f3bd493933e25de9bbb8de169 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 23 Jun 2026 18:28:29 +0800
Subject: [PATCH] 1

---
 package2/group/groupBuySingle.vue          |   4 +-
 package2/myCenter/partTimeJobRegister.vue  | 821 ++++++++++++++++++---
 package2/partTimeJob/partTimeJobCenter.vue |   4 +-
 package2/shop/afterService.vue             | 134 +++-
 4 files changed, 831 insertions(+), 132 deletions(-)

diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index d4c67cd..04c5a22 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -2133,7 +2133,7 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		width: 75%;
+		width: 100%;
 		display: flex;
 		align-items: center;
 		z-index: 100;
@@ -2179,6 +2179,7 @@
 	.title-search {
 		display: flex;
 		flex: 1;
+		width: 60%;
 		background: rgba(255, 255, 255, 0.9);
 		height: 54rpx;
 		margin-left: 20rpx;
@@ -2186,6 +2187,7 @@
 
 		input {
 			height: 54rpx;
+			width: 60%;
 			line-height: 54rpx;
 		}
 	}
diff --git a/package2/myCenter/partTimeJobRegister.vue b/package2/myCenter/partTimeJobRegister.vue
index ff8c41a..58f23f9 100644
--- a/package2/myCenter/partTimeJobRegister.vue
+++ b/package2/myCenter/partTimeJobRegister.vue
@@ -1,5 +1,6 @@
 <template>
 	<!-- 兼职注册 -->
+	<page-meta :page-style="routePopupVisible ? 'overflow: hidden;' : 'overflow: visible;'"></page-meta>
 	<view class="page1">
 		<view class="title">
 			<view class="title-sreach">
@@ -37,7 +38,9 @@
 					<text style="color:red;">*</text> 超出3楼以上额外收费
 				</view>
 				<view class="reg-value">
-					<input type="number" v-model="formData.highFloorFee" placeholder="可设置金额"
+					<input type="digit" v-model="formData.highFloorFee" placeholder="可设置金额"
+						:adjust-position="false"
+						@input="onHighFloorFeeInput"
 						style="background: rgba(247, 248, 248, 0.6);height: 80rpx;line-height: 80rpx;padding: 18rpx 20rpx;border-radius: 20rpx;">
 				</view>
 			</view>
@@ -81,52 +84,51 @@
 				</view>
 			</view>
 			<view class="box1" v-if="formData.waima != false || formData.paotui != false">
-				<view class="reg-name">
-					<text style="color:red;">*</text> 规则配置
+				<view class="reg-name rule-section-title">
+					<text style="color:red;">*</text> 我的赚钱地盘
 				</view>
+				<view class="rule-section-desc">选择你愿意配送的取货点和楼栋，再设置最低配送费。系统只会按这些范围给你派单。</view>
 				<view class="reg-value">
 					<view class="value1" v-if="formData.waima">
 						<view class="value-title">
 							<view class="title-1">
-								外卖规则
+								外卖赚钱地盘
+								<text class="rule-summary">{{getRuleSummary(waimaRuleList)}}</text>
 							</view>
 							<view class="title-2" @tap="checkAddress('waima')">
-								配置规则
+								选择路线
 								<uni-icons type="right" size="12"></uni-icons>
 							</view>
 						</view>
+						<view class="rule-empty-card" v-if="waimaRuleList.length == 0" @tap="checkAddress('waima')">
+							<view class="rule-empty-icon">地盘</view>
+							<view class="rule-empty-title">你还没有划定外卖赚钱地盘</view>
+							<view class="rule-empty-desc">点这里选择食堂和宿舍楼，设置后才能收到对应区域的指派单。</view>
+						</view>
 						<view class="guize-list">
-							<view class="guize1" v-for="(item, index) in waimaRuleList" :key="index"
-								style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;">
-								<view style="display: flex; width: 100%;">
-									<view class="guize1-qusong">
-										<view class="qusong1">
-											取
-										</view>
-										<view class="qusong2">
-											{{item.getAreaName}}
-										</view>
-									</view>
-									<view class="guize1-qusong">
-										<view class="qusong1">
-											送
+							<view class="guize1 route-card" v-for="(item, index) in waimaRuleList" :key="index">
+								<view class="route-main">
+									<view class="route-points">
+										<view class="route-point">
+											<text class="route-badge">取</text>
+											<text class="route-name">{{item.getAreaName}}</text>
 										</view>
-										<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
-											{{item.putAreaName}}
+										<view class="route-point">
+											<text class="route-badge route-badge--send">送</text>
+											<text class="route-name route-name--send">{{item.putAreaName}}</text>
 										</view>
 									</view>
-									<view class="qusong3" style="display:flex; align-items:center;">
-										<input type="digit" :value="item.orderBkge" placeholder="填写配送费"
-											@input="onOrderBkgeInput($event, item)" style="flex:1;">
-										<uni-icons type="closeempty" size="20" @click="removeRule('waima', index)"
-											color="#ff0000" style="margin-left:10rpx;"></uni-icons>
+									<view class="route-price">
+										<text>￥</text>
+										<input type="digit" :value="item.orderBkge" placeholder="最低价"
+											:adjust-position="false"
+											@input="onOrderBkgeInput($event, item)">
 									</view>
+									<view class="route-delete" @tap="removeRule('waima', index)">×</view>
 								</view>
-								<view style="display: flex; width: 100%; margin-top: 20rpx; align-items: center;">
-									<text
-										style="margin: 0 20rpx 0 10rpx; color: #777; font-size: 26rpx; font-weight: bold;">备注：</text>
-									<input type="text" v-model="item.remark" placeholder="填写备注，如：限时/大件加钱"
-										style="flex:1; background: #fff; border-radius: 10rpx; padding: 0 20rpx; height: 60rpx; line-height: 60rpx;">
+								<view class="route-remark">
+									<text>备注(选填)</text>
+									<input type="text" v-model="item.remark" placeholder="如：大件/限时可加钱">
 								</view>
 							</view>
 						</view>
@@ -134,58 +136,64 @@
 					<view class="value1" v-if="formData.paotui">
 						<view class="value-title">
 							<view class="title-1">
-								快递规则
+								快递赚钱地盘
+								<text class="rule-summary">{{getRuleSummary(paotuiRuleList)}}</text>
 							</view>
 							<view class="title-2" @tap="checkAddress('paotui')">
-								配置规则
+								选择路线
 								<uni-icons type="right" size="12"></uni-icons>
 							</view>
 						</view>
+						<view class="rule-empty-card" v-if="paotuiRuleList.length == 0" @tap="checkAddress('paotui')">
+							<view class="rule-empty-icon">地盘</view>
+							<view class="rule-empty-title">你还没有划定快递赚钱地盘</view>
+							<view class="rule-empty-desc">选择快递站和宿舍楼，系统才会把符合范围的快递单派给你。</view>
+						</view>
 						<view class="guize-list">
-							<view class="guize1" v-for="(item, index) in paotuiRuleList" :key="index"
-								style="flex-direction: column; padding-bottom: 20rpx; border-bottom: 1px solid #ddd;">
-								<view style="display: flex; width: 100%;">
-									<view class="guize1-qusong">
-										<view class="qusong1">
-											取
-										</view>
-										<view class="qusong2">
-											{{item.getAreaName}}
-										</view>
-									</view>
-									<view class="guize1-qusong">
-										<view class="qusong1">
-											送
+							<view class="guize1 route-card" v-for="(item, index) in paotuiRuleList" :key="index">
+								<view class="route-main">
+									<view class="route-points">
+										<view class="route-point">
+											<text class="route-badge">取</text>
+											<text class="route-name">{{item.getAreaName}}</text>
 										</view>
-										<view class="qusong2" style="background: rgba(209, 206, 255, 1);">
-											{{item.putAreaName}}
+										<view class="route-point">
+											<text class="route-badge route-badge--send">送</text>
+											<text class="route-name route-name--send">{{item.putAreaName}}</text>
 										</view>
 									</view>
-									<view class="qusong3" style="display:flex; align-items:center;">
-										<input type="digit" :value="item.orderBkge" placeholder="填写配送费"
-											@input="onOrderBkgeInput($event, item)" style="flex:1;">
-										<uni-icons type="closeempty" size="20" @click="removeRule('paotui', index)"
-											color="#ff0000" style="margin-left:10rpx;"></uni-icons>
+									<view class="route-price">
+										<text>￥</text>
+										<input type="digit" :value="item.orderBkge" placeholder="最低价"
+											:adjust-position="false"
+											@input="onOrderBkgeInput($event, item)">
 									</view>
+									<view class="route-delete" @tap="removeRule('paotui', index)">×</view>
 								</view>
-								<view style="display: flex; width: 100%; margin-top: 20rpx; align-items: center;">
-									<text
-										style="margin: 0 20rpx 0 10rpx; color: #777; font-size: 26rpx; font-weight: bold;">备注：</text>
-									<input type="text" v-model="item.remark" placeholder="填写备注，如：限时/大件加钱"
-										style="flex:1; background: #fff; border-radius: 10rpx; padding: 0 20rpx; height: 60rpx; line-height: 60rpx;">
+								<view class="route-remark">
+									<text>备注(选填)</text>
+									<input type="text" v-model="item.remark" placeholder="如：大件/限时可加钱">
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
+				<view class="earning-simulator">
+					<view class="earning-title">收益模拟</view>
+					<view class="earning-main">按当前设置，预计今日可接 {{earningEstimate.orderRange}} 单</view>
+					<view class="earning-money">预估收入 {{earningEstimate.incomeRange}}</view>
+					<view class="earning-tip">预估值仅供参考，实际以当天订单为准。</view>
+				</view>
 			</view>
 
-			<view
-				style="width: 240rpx;height: 280rpx;background: rgba(166, 255, 234, 1);margin: 20rpx auto;border-radius: 40rpx;text-align: center;">
+			<view class="official-card">
 				<img show-menu-by-longpress
 					src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d23a9043a8c24731831ec4db909fe3b4.jpg" alt=""
-					style="width: 180rpx;height: 180rpx;margin-top: 20rpx;" />
-				<view style="height: 50rpx;line-height: 50rpx;font-weight: 700;">关注公众号</view>
+					class="official-qr" />
+				<view class="official-info">
+					<view class="official-title">长按 关注公众号</view>
+					<view class="official-desc">关注后可提现佣金，有新订单会及时通知你。</view>
+				</view>
 			</view>
 			<view class="btn" @click="submit">
 				提交注册
@@ -211,39 +219,92 @@
 				</view>
 			</view>
 		</uni-popup>
-		<!-- 规则选择弹出层 -->
-		<uni-popup ref="guizePopup" background-color="#fff">
-			<view class="guize-popup-content">
-				<view style="margin-top: 20rpx;">
-					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/f06433fa1bd34b31948eaefe5338c357.png"
-						alt="" style="width: 204rpx;height: 50rpx;" />
+		<!-- 新手引导弹窗 -->
+		<uni-popup ref="onboardingPopup" background-color="#fff">
+			<view class="onboarding-popup">
+				<view class="onboarding-title">三步开始接赚钱单</view>
+				<view class="onboarding-step">
+					<view class="onboarding-num">1</view>
+					<view>
+						<view class="onboarding-step-title">圈地盘</view>
+						<view class="onboarding-step-desc">选择你想送货的楼栋/区域。</view>
+					</view>
 				</view>
-				<view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;">
-					<view class="box-check-btn" @tap="qucanOrsongcan('qucan',index)" v-for="(item,index) in qucan"
-						:key="index" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
-						:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
-						{{item.title}}
+				<view class="onboarding-step">
+					<view class="onboarding-num">2</view>
+					<view>
+						<view class="onboarding-step-title">定价格</view>
+						<view class="onboarding-step-desc">设置你愿意接受的最低配送费。</view>
 					</view>
-					<view v-if="qucan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可选取货区域</view>
 				</view>
-				<view style="margin-top: 130rpx;">
-					<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/32fd9d723fbf4d778f2631277d316940.png"
-						alt="" style="width: 204rpx;height: 50rpx;" />
+				<view class="onboarding-step">
+					<view class="onboarding-num">3</view>
+					<view>
+						<view class="onboarding-step-title">自动接单</view>
+						<view class="onboarding-step-desc">上线并开启派单后，只接符合要求的订单。</view>
+					</view>
 				</view>
-				<view style="margin-top: 20rpx;height: auto;overflow:hidden;min-height: 90rpx;">
-					<view class="box-check-btn" @tap="qucanOrsongcan('songcan',index)" v-for="(item,index) in songcan"
-						:key="index" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
-						:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
-						{{item.title}}
+				<view class="onboarding-btn" @tap="closeOnboarding">去划定赚钱地盘</view>
+			</view>
+		</uni-popup>
+		<!-- 规则选择弹出层 -->
+		<uni-popup ref="guizePopup" type="bottom" background-color="transparent" @change="onRoutePopupChange">
+			<view class="guize-popup-content">
+				<view class="area-popup-title">{{currentConfigType == 'waima' ? '生成外卖接单路线' : '生成快递接单路线'}}</view>
+				<view class="area-popup-scroll">
+					<view class="area-popup-desc">选中的取货点和送达区域会两两组合生成路线，新路线默认使用本弹窗填写的最低配送费和备注。</view>
+					<view class="route-default-card">
+						<view class="route-default-row">
+							<view class="route-default-label">本次最低配送费</view>
+							<view class="route-default-input">
+								<text>￥</text>
+								<input type="digit" v-model="defaultRoutePrice" placeholder="如 1"
+									:adjust-position="false"
+									@input="onDefaultRoutePriceInput">
+							</view>
+						</view>
+						<view class="route-default-row route-default-row--remark">
+							<view class="route-default-label">统一备注</view>
+							<input class="route-default-remark" type="text" v-model="defaultRouteRemark"
+								placeholder="选填，如：大件不接/限时加钱">
+						</view>
+					</view>
+					<view class="area-section-title">
+						<text>选择取货点</text>
+						<view>
+							<text @tap="toggleAreaCheck('qucan', true)">全选</text>
+							<text class="area-action" @tap="toggleAreaCheck('qucan', false)">清空</text>
+						</view>
+					</view>
+					<view class="area-options">
+						<view class="box-check-btn" @tap="qucanOrsongcan('qucan',index)" v-for="(item,index) in qucan"
+							:key="index" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
+							:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
+							{{item.title}}
+						</view>
+						<view v-if="qucan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可选取货区域</view>
+					</view>
+					<view class="area-section-title area-section-title--second">
+						<text>选择送达区域</text>
+						<view>
+							<text @tap="toggleAreaCheck('songcan', true)">全选</text>
+							<text class="area-action" @tap="toggleAreaCheck('songcan', false)">清空</text>
+						</view>
+					</view>
+					<view class="area-options">
+						<view class="box-check-btn" @tap="qucanOrsongcan('songcan',index)" v-for="(item,index) in songcan"
+							:key="index" style="float: left;padding: 0 20rpx;width: auto;margin-bottom:20rpx;"
+							:style="{background:item.checked?'rgba(180, 255, 238, 0.27)':'rgba(247, 248, 248, 0.6)',border:item.checked?'1px solid rgba(180, 255, 238, 1)':'1px solid #777'}">
+							{{item.title}}
+						</view>
+						<view v-if="songcan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可送货区域</view>
 					</view>
-					<view v-if="songcan.length==0" style="color:#999;font-size:24rpx;margin:20rpx 0;">暂无可送货区域</view>
 				</view>
-				<view class="guize-btn" @tap="closeGuize">
-					确定
+				<view class="guize-btn area-fixed-btn" @tap="closeGuize">
+					生成接单路线
 				</view>
-				<view style="position: absolute;bottom: -100rpx;left: 50%;transform:translateX(-50%);"
-					@tap.stop="$refs.guizePopup.close()">
-					<uni-icons type="close" size="40" color="#fff"></uni-icons>
+				<view class="area-close" @tap.stop="$refs.guizePopup.close()">
+					<uni-icons type="close" size="26" color="#00231C"></uni-icons>
 				</view>
 			</view>
 		</uni-popup>
@@ -271,15 +332,39 @@
 				shopArea: [],
 				waimaRuleList: [],
 				paotuiRuleList: [],
-				currentConfigType: ''
+				currentConfigType: '',
+				defaultRoutePrice: '1',
+				defaultRouteRemark: '',
+				routePopupVisible: false
 			}
 		},
 		components: {
 
+		},
+		computed: {
+			earningEstimate() {
+				const count = this.waimaRuleList.length + this.paotuiRuleList.length
+				const commissionPerOrder = 2
+				if (count == 0) {
+					return {
+						orderRange: '0',
+						incomeRange: '￥0'
+					}
+				}
+				const lowOrders = Math.max(1, Math.ceil(count * 0.25))
+				const highOrders = Math.max(lowOrders, Math.ceil(count * 0.6))
+				const lowIncome = Math.floor(lowOrders * commissionPerOrder * 100) / 100
+				const highIncome = Math.floor(highOrders * commissionPerOrder * 100) / 100
+				return {
+					orderRange: lowOrders + '-' + highOrders,
+					incomeRange: '￥' + this.formatDisplayMoney(lowIncome) + '-' + this.formatDisplayMoney(highIncome)
+				}
+			}
 		},
 		onLoad() {
 			this.getShopArea()
 			this.getWorkerMessage()
+			this.showOnboardingOnce()
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
@@ -296,6 +381,55 @@
 				}
 				return value;
 			},
+			formatOneDecimalInput(value) {
+				value = String(value || '').replace(/[^\d.]/g, '');
+				const dotIndex = value.indexOf('.');
+				if (dotIndex !== -1) {
+					value = value.slice(0, dotIndex + 1) + value.slice(dotIndex + 1).replace(/\./g, '');
+					const parts = value.split('.');
+					value = parts[0] + '.' + parts[1].slice(0, 1);
+				}
+				return value;
+			},
+			onHighFloorFeeInput(e) {
+				const value = this.formatOneDecimalInput(e.detail.value);
+				this.formData.highFloorFee = value;
+				return value;
+			},
+			formatDisplayMoney(value) {
+				const amount = parseFloat(value)
+				if (isNaN(amount)) return '0'
+				return amount.toFixed(2).replace(/\.?0+$/, '')
+			},
+			getMinFee(list) {
+				const fees = (list || []).map(item => parseFloat(item.orderBkge)).filter(item => !isNaN(item) && item > 0)
+				if (fees.length == 0) return 0
+				return Math.min.apply(null, fees)
+			},
+			getRuleSummary(list) {
+				if (!list || list.length == 0) return '未设置'
+				const minFee = this.getMinFee(list)
+				return '已覆盖 ' + list.length + ' 条路线' + (minFee > 0 ? '，最低￥' + this.formatDisplayMoney(minFee) + '起' : '')
+			},
+			showOnboardingOnce() {
+				this.$nextTick(() => {
+					if (uni.getStorageSync('part_time_rule_onboarding_seen')) return
+					setTimeout(() => {
+						if (this.$refs.onboardingPopup) {
+							this.$refs.onboardingPopup.open()
+						}
+					}, 300)
+				})
+			},
+			closeOnboarding() {
+				uni.setStorageSync('part_time_rule_onboarding_seen', 1)
+				this.$refs.onboardingPopup.close()
+			},
+			onDefaultRoutePriceInput(e) {
+				const value = this.formatMoneyInput(e.detail.value)
+				this.defaultRoutePrice = value
+				return value
+			},
 			normalizeOrderBkge(item) {
 				const value = this.formatMoneyInput(item.orderBkge);
 				const amount = parseFloat(value);
@@ -386,6 +520,13 @@
 				}
 				this.$forceUpdate()
 			},
+			toggleAreaCheck(type, checked) {
+				const list = type == 'qucan' ? this.qucan : this.songcan
+				list.forEach(item => {
+					item.checked = checked
+				})
+				this.$forceUpdate()
+			},
 			closeGuize() {
 				let selectedQucan = this.qucan.filter(item => item.checked);
 				let selectedSongcan = this.songcan.filter(item => item.checked);
@@ -414,9 +555,9 @@
 								getAreaName: q.title,
 								putAreaId: s.id,
 								putAreaName: s.title,
-								orderBkge: '',
+								orderBkge: this.formatMoneyInput(this.defaultRoutePrice),
 								orderType: this.currentConfigType == 'waima' ? 0 : 1,
-								remark: ''
+								remark: this.defaultRouteRemark || ''
 							});
 						}
 					});
@@ -428,6 +569,10 @@
 					this.paotuiRuleList = newRules;
 				}
 
+				uni.showToast({
+					title: '已生成' + newRules.length + '条路线',
+					icon: 'none'
+				});
 				this.$refs.guizePopup.close()
 			},
 			changePopup(e){
@@ -435,6 +580,9 @@
 					uni.navigateBack()
 				}
 			},
+			onRoutePopupChange(e) {
+				this.routePopupVisible = !!e.show
+			},
 			checkAddress(type) {
 				let that = this
 				this.currentConfigType = type;
@@ -484,13 +632,13 @@
 
 				if (this.formData.waima && this.waimaRuleList.length == 0) {
 					return uni.showToast({
-						title: '请配置外卖规则',
+						title: '请先划定外卖赚钱地盘',
 						icon: 'none'
 					});
 				}
 				if (this.formData.paotui && this.paotuiRuleList.length == 0) {
 					return uni.showToast({
-						title: '请配置快递规则',
+						title: '请先划定快递赚钱地盘',
 						icon: 'none'
 					});
 				}
@@ -500,7 +648,7 @@
 					this.waimaRuleList.forEach(item => this.normalizeOrderBkge(item));
 					let invalid = this.waimaRuleList.find(item => !item.orderBkge);
 					if (invalid) return uni.showToast({
-						title: '请填写外卖配送费',
+						title: '请填写外卖最低配送费',
 						icon: 'none'
 					});
 					workerRelaPriceList = workerRelaPriceList.concat(this.waimaRuleList);
@@ -509,7 +657,7 @@
 					this.paotuiRuleList.forEach(item => this.normalizeOrderBkge(item));
 					let invalid = this.paotuiRuleList.find(item => !item.orderBkge);
 					if (invalid) return uni.showToast({
-						title: '请填写快递配送费',
+						title: '请填写快递最低配送费',
 						icon: 'none'
 					});
 					workerRelaPriceList = workerRelaPriceList.concat(this.paotuiRuleList);
@@ -519,7 +667,7 @@
 					userId: uni.getStorageSync('id'),
 					workerName: this.formData.name,
 					cardPicture: this.formData.studentCard,
-					highFloorFee: this.formData.highFloorFee,
+					highFloorFee: this.formatOneDecimalInput(this.formData.highFloorFee),
 					deliveryLocation: this.formData.deliveryLocation,
 					mobile: this.formData.mobile,
 					workerRelaPriceList: workerRelaPriceList
@@ -703,44 +851,217 @@
 		width: 240rpx;
 	}
 
+	.rule-section-title {
+		line-height: 48rpx;
+		height: auto;
+	}
+
+	.rule-section-desc {
+		margin-top: 8rpx;
+		color: #6f7d79;
+		font-size: 24rpx;
+		line-height: 36rpx;
+	}
+
 	.value1 {
-		background: rgba(247, 248, 248, 0.6);
-		border-radius: 20rpx;
-		padding: 20rpx;
-		margin-bottom: 20rpx;
+		background: #f8fffc;
+		border-radius: 28rpx;
+		padding: 24rpx;
+		margin-bottom: 22rpx;
+		border: 1px solid rgba(166, 255, 234, 0.45);
 	}
 
 	.value-title {
 
 		display: flex;
-		height: 70rpx;
-		line-height: 70rpx;
+		min-height: 70rpx;
+		line-height: 42rpx;
 		font-size: 30rpx;
 		font-weight: 400;
+		align-items: center;
 
 	}
 
 	.title-1 {
 		font-weight: 700;
+		flex: 1;
 	}
 
 	.title-2 {
+		width: 176rpx;
+		height: 58rpx;
+		line-height: 58rpx;
+		border-radius: 58rpx;
+		color: #00624f;
+		background: rgba(166, 255, 234, 0.42);
+		text-align: right;
+		padding-right: 16rpx;
+		font-weight: 800;
+		box-sizing: border-box;
+
+	}
+
+	.rule-summary {
+		display: block;
+		margin-top: 4rpx;
+		color: #0b6b5a;
+		font-size: 22rpx;
+		font-weight: 700;
+		line-height: 30rpx;
+	}
+
+	.rule-empty-card {
+		margin-top: 18rpx;
+		padding: 38rpx 24rpx;
+		border: 1px dashed rgba(0, 35, 28, 0.18);
+		border-radius: 24rpx;
+		background: rgba(255, 255, 255, 0.78);
+		text-align: center;
+	}
+
+	.rule-empty-icon {
+		width: 132rpx;
+		height: 132rpx;
+		line-height: 132rpx;
+		margin: 0 auto 20rpx;
+		border-radius: 50%;
+		background: linear-gradient(135deg, #e3ff96, #a6ffea);
+		color: #07372f;
+		font-size: 24rpx;
+		font-weight: 900;
+	}
+
+	.rule-empty-title {
+		color: #00231C;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.rule-empty-desc {
+		margin-top: 10rpx;
+		color: #7b8a85;
+		font-size: 24rpx;
+		line-height: 36rpx;
+	}
+
+	.guize1 {
+		margin-top: 18rpx;
+	}
+
+	.route-card {
+		padding: 20rpx 0;
+		border-bottom: 1px solid rgba(0, 35, 28, 0.08);
+	}
+
+	.route-main {
+		display: flex;
+		align-items: center;
+	}
 
+	.route-points {
 		flex: 1;
-		color: #777;
-		text-align: right;
+		min-width: 0;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.route-point {
+		display: flex;
+		align-items: center;
+		max-width: 240rpx;
+	}
 
+	.route-badge {
+		width: 38rpx;
+		height: 38rpx;
+		line-height: 38rpx;
+		flex-shrink: 0;
+		border-radius: 50%;
+		background: #00231C;
+		color: #fff;
+		font-size: 20rpx;
+		font-weight: 900;
+		text-align: center;
 	}
 
-	.guize1-qusong {
+	.route-badge--send {
+		background: #005849;
+	}
+
+	.route-name {
+		height: 42rpx;
+		line-height: 42rpx;
+		padding: 0 16rpx;
+		margin-left: -8rpx;
+		border-radius: 0 42rpx 42rpx 0;
+		background: rgba(166, 255, 234, 0.58);
+		font-size: 24rpx;
+		font-weight: 800;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.route-name--send {
+		background: rgba(209, 206, 255, 0.78);
+	}
+
+	.route-price {
+		width: 120rpx;
+		height: 60rpx;
+		padding: 0 14rpx;
+		margin-left: 12rpx;
 		display: flex;
+		align-items: center;
+		border-radius: 18rpx;
+		background: #fff;
+		font-size: 26rpx;
+		font-weight: 900;
+		box-shadow: inset 0 0 0 1px rgba(0, 35, 28, 0.08);
+		box-sizing: border-box;
+	}
+
+	.route-price input {
 		flex: 1;
-		padding-top: 20rpx;
+		min-width: 0;
+		margin-left: 4rpx;
+		font-weight: 900;
 	}
 
-	.guize1 {
+	.route-delete {
+		width: 48rpx;
+		height: 48rpx;
+		line-height: 44rpx;
+		margin-left: 10rpx;
+		border-radius: 50%;
+		color: #ff3b30;
+		font-size: 40rpx;
+		text-align: center;
+	}
+
+	.route-remark {
 		display: flex;
-		margin-top: 20rpx;
+		align-items: center;
+		margin-top: 16rpx;
+		padding: 0 16rpx;
+		height: 64rpx;
+		border-radius: 16rpx;
+		background: #fff;
+		box-sizing: border-box;
+	}
+
+	.route-remark text {
+		margin-right: 16rpx;
+		color: #6f7d79;
+		font-size: 24rpx;
+		font-weight: 800;
+	}
+
+	.route-remark input {
+		flex: 1;
+		min-width: 0;
+		font-size: 24rpx;
 	}
 
 	.qusong1 {
@@ -777,6 +1098,83 @@
 		flex: 1;
 	}
 
+	.earning-simulator {
+		margin: 24rpx 0 8rpx;
+		padding: 30rpx;
+		border-radius: 28rpx;
+		background:
+			radial-gradient(circle at 92% 10%, rgba(166, 255, 234, 0.58) 0, rgba(166, 255, 234, 0) 180rpx),
+			linear-gradient(135deg, #fffdf2, #f6fffb);
+		box-shadow: 0 12rpx 28rpx rgba(0, 35, 28, 0.06);
+	}
+
+	.earning-title {
+		color: #00231C;
+		font-size: 30rpx;
+		font-weight: 900;
+	}
+
+	.earning-main {
+		margin-top: 16rpx;
+		color: #304842;
+		font-size: 28rpx;
+		font-weight: 800;
+	}
+
+	.earning-money {
+		margin-top: 10rpx;
+		color: #0b6b5a;
+		font-size: 36rpx;
+		font-weight: 900;
+	}
+
+	.earning-tip {
+		margin-top: 10rpx;
+		color: #89948f;
+		font-size: 22rpx;
+		line-height: 32rpx;
+	}
+
+	.official-card {
+		width: 95%;
+		margin: 28rpx auto 10rpx;
+		padding: 24rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 28rpx;
+		background: linear-gradient(135deg, rgba(227, 255, 150, 0.46), rgba(166, 255, 234, 0.42));
+		box-shadow: 0 12rpx 28rpx rgba(0, 35, 28, 0.06);
+		box-sizing: border-box;
+	}
+
+	.official-qr {
+		width: 150rpx;
+		height: 150rpx;
+		flex-shrink: 0;
+		border-radius: 22rpx;
+		background: #fff;
+	}
+
+	.official-info {
+		flex: 1;
+		min-width: 0;
+		margin-left: 24rpx;
+	}
+
+	.official-title {
+		color: #00231C;
+		font-size: 32rpx;
+		font-weight: 900;
+	}
+
+	.official-desc {
+		margin-top: 12rpx;
+		color: #526964;
+		font-size: 24rpx;
+		line-height: 36rpx;
+		font-weight: 700;
+	}
+
 	.btn {
 		width: 95%;
 		height: 100rpx;
@@ -790,15 +1188,189 @@
 	}
 
 	.guize-popup-content {
-		height: auto;
+		width: 100%;
+		height: 66vh;
 		background: #fff;
-		padding: 40rpx;
-		border-radius: 40rpx;
-		width: 90%;
+		padding: 40rpx 40rpx 28rpx;
+		border-radius: 40rpx 40rpx 0 0;
 		margin: 0 auto;
-		max-height: 860rpx;
-		overflow: scroll;
+		overflow: hidden;
 		position: relative;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+	}
+
+	.onboarding-popup {
+		width: 620rpx;
+		padding: 40rpx 34rpx;
+		box-sizing: border-box;
+		border-radius: 36rpx;
+		background: #fff;
+	}
+
+	.onboarding-title {
+		color: #00231C;
+		font-size: 36rpx;
+		font-weight: 900;
+		text-align: center;
+		margin-bottom: 26rpx;
+	}
+
+	.onboarding-step {
+		display: flex;
+		padding: 20rpx 0;
+		border-bottom: 1px solid rgba(0, 35, 28, 0.08);
+	}
+
+	.onboarding-num {
+		width: 52rpx;
+		height: 52rpx;
+		line-height: 52rpx;
+		margin-right: 18rpx;
+		flex-shrink: 0;
+		border-radius: 50%;
+		background: linear-gradient(135deg, #e3ff96, #a6ffea);
+		color: #00231C;
+		font-size: 26rpx;
+		font-weight: 900;
+		text-align: center;
+	}
+
+	.onboarding-step-title {
+		color: #00231C;
+		font-size: 28rpx;
+		font-weight: 900;
+	}
+
+	.onboarding-step-desc {
+		margin-top: 6rpx;
+		color: #7b8a85;
+		font-size: 24rpx;
+		line-height: 34rpx;
+	}
+
+	.onboarding-btn {
+		height: 88rpx;
+		line-height: 88rpx;
+		margin-top: 32rpx;
+		border-radius: 88rpx;
+		background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+		color: #00231C;
+		font-size: 30rpx;
+		font-weight: 900;
+		text-align: center;
+	}
+
+	.area-popup-title {
+		color: #00231C;
+		font-size: 34rpx;
+		font-weight: 900;
+		text-align: center;
+	}
+
+	.area-popup-desc {
+		margin-top: 14rpx;
+		padding: 18rpx;
+		border-radius: 18rpx;
+		background: rgba(166, 255, 234, 0.24);
+		color: #61736e;
+		font-size: 24rpx;
+		line-height: 36rpx;
+	}
+
+	.area-popup-scroll {
+		flex: 1;
+		min-height: 0;
+		height: auto;
+		overflow: scroll;
+		padding-bottom: 34rpx;
+		box-sizing: border-box;
+	}
+
+	.route-default-card {
+		margin-top: 18rpx;
+		padding: 20rpx;
+		border-radius: 22rpx;
+		background: linear-gradient(135deg, rgba(227, 255, 150, 0.52), rgba(166, 255, 234, 0.34));
+	}
+
+	.route-default-row {
+		display: flex;
+		align-items: center;
+	}
+
+	.route-default-row--remark {
+		margin-top: 16rpx;
+	}
+
+	.route-default-label {
+		width: 210rpx;
+		color: #00231C;
+		font-size: 26rpx;
+		font-weight: 900;
+	}
+
+	.route-default-input {
+		width: 190rpx;
+		height: 66rpx;
+		padding: 0 18rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 18rpx;
+		background: #fff;
+		font-size: 28rpx;
+		font-weight: 900;
+		box-sizing: border-box;
+	}
+
+	.route-default-input input {
+		flex: 1;
+		min-width: 0;
+		margin-left: 6rpx;
+		font-weight: 900;
+	}
+
+	.route-default-remark {
+		flex: 1;
+		min-width: 0;
+		height: 66rpx;
+		line-height: 66rpx;
+		padding: 0 18rpx;
+		border-radius: 18rpx;
+		background: #fff;
+		font-size: 24rpx;
+		box-sizing: border-box;
+	}
+
+	.area-section-title {
+		margin-top: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: #00231C;
+		font-size: 28rpx;
+		font-weight: 900;
+	}
+
+	.area-section-title view {
+		color: #1E90FF;
+		font-size: 24rpx;
+		font-weight: 800;
+	}
+
+	.area-action {
+		margin-left: 24rpx;
+	}
+
+	.area-section-title--second {
+		margin-top: 42rpx;
+	}
+
+	.area-options {
+		margin-top: 20rpx;
+		min-height: 90rpx;
+		overflow: hidden;
 	}
 
 	.guize-btn {
@@ -814,4 +1386,23 @@
 		font-size: 30rpx;
 		font-weight: 700
 	}
+
+	.area-fixed-btn {
+		width: 100%;
+		margin: 18rpx 0 0;
+		flex-shrink: 0;
+		box-shadow: 0 14rpx 28rpx rgba(0, 35, 28, 0.18);
+	}
+
+	.area-close {
+		position: absolute;
+		top: 24rpx;
+		right: 24rpx;
+		width: 56rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 50%;
+		background: rgba(247, 248, 248, 0.9);
+		text-align: center;
+	}
 </style>
\ No newline at end of file
diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue
index b035b9c..7781709 100644
--- a/package2/partTimeJob/partTimeJobCenter.vue
+++ b/package2/partTimeJob/partTimeJobCenter.vue
@@ -80,10 +80,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/afterService.vue b/package2/shop/afterService.vue
index 2737d6b..5f60129 100644
--- a/package2/shop/afterService.vue
+++ b/package2/shop/afterService.vue
@@ -31,19 +31,26 @@
 				</view>
 				<view class="refund-info">
 					<view class="refund-info-content">
-						<view>退款原因: <text style="font-weight: 700;color:#00231C;">{{item.refundTypeStatus == 1?'商家原因':item.refundTypeStatus == 2?'配送原因':item.refundTypeStatus == 3?'商家/配送都有原因（需要退配送费）':item.refundTypeStatus == 4?'平台退款':""}}</text></view>
-						
-						<view>退款类型: <text style="font-weight: 700;color:#00231C;">{{item.refundType == 1?'退商品':item.refundType == 2?'退配送费':item.refundType == 3?'全额退款':""}}</text></view>
-						<view class="refund-reason-row">
-							退款/售后原因:
-							<text class="refund-reason-text">{{item.reason || '无'}}</text>
-						</view>
-						<view class="refund-pictures-row" v-if="getPictureList(item.pictures).length > 0">
-							<view class="refund-pictures-label">退款/售后原因图片:</view>
-							<view class="refund-pictures">
-								<image class="refund-picture" v-for="(picture,pictureIndex) in getPictureList(item.pictures)"
-									:key="pictureIndex" :src="picture" mode="aspectFill"
-									@tap.stop="previewRefundImage(item.pictures,pictureIndex)"></image>
+						<view class="refund-main">
+							<view class="refund-text">
+								<view>退款原因: <text style="font-weight: 700;color:#00231C;">{{item.refundTypeStatus == 1?'商家原因':item.refundTypeStatus == 2?'配送原因':item.refundTypeStatus == 3?'商家/配送都有原因（需要退配送费）':item.refundTypeStatus == 4?'平台退款':""}}</text></view>
+								
+								<view>退款类型: <text style="font-weight: 700;color:#00231C;">{{item.refundType == 1?'退商品':item.refundType == 2?'退配送费':item.refundType == 3?'全额退款':""}}</text></view>
+								<view class="refund-reason-row">
+									退款/售后原因:
+									<text class="refund-reason-text">{{item.reason || '无'}}</text>
+								</view>
+								<view class="refund-pictures-row" v-if="getPictureList(item.pictures).length > 0">
+									<view class="refund-pictures-label">退款/售后原因图片:</view>
+									<view class="refund-pictures">
+										<image class="refund-picture" v-for="(picture,pictureIndex) in getPictureList(item.pictures)"
+											:key="pictureIndex" :src="picture" mode="aspectFill"
+											@tap.stop="previewRefundImage(item.pictures,pictureIndex)"></image>
+									</view>
+								</view>
+							</view>
+							<view class="refund-contact">
+								<view class="contact-btn" @tap.stop="openContactPopup(item)">联系</view>
 							</view>
 						</view>
 						<view style="text-align: right;">退款金额: <text style="color:red;font-size: 34rpx;font-weight: 700;">￥{{item.refundAmount}}</text></view>
@@ -146,6 +153,10 @@
 									<text class="product-popup-label">规格</text>
 									<text class="product-popup-spec-text">{{item1.specs | delNode}}</text>
 								</view>
+								<view class="product-popup-price-row">
+									<text>单价：￥{{item1.price != null ? item1.price : 0}}</text>
+									<text v-if="item1.packageFee != null && item1.packageFee !== ''" class="product-popup-package-fee">餐盒费：￥{{item1.packageFee}}</text>
+								</view>
 							</view>
 							<view class="product-popup-quantity">
 								<view class="product-popup-quantity-num">x{{item1.quantity}}</view>
@@ -158,6 +169,26 @@
 					</view>
 				</view>
 			</uni-popup>
+			<uni-popup ref="contactPopup" background-color="transparent">
+				<view class="contact-popup">
+					<view class="contact-popup-title">联系</view>
+					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.receiverPhone"
+						@tap="makeCall(contactItem.mallOrder.receiverPhone)">
+						<text>联系用户</text>
+						<text class="contact-popup-phone">{{contactItem.mallOrder.receiverPhone}}</text>
+					</view>
+					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.shopPhone"
+						@tap="makeCall(contactItem.mallOrder.shopPhone)">
+						<text>联系商家</text>
+						<text class="contact-popup-phone">{{contactItem.mallOrder.shopPhone}}</text>
+					</view>
+					<view class="contact-popup-item" v-if="contactItem.mallOrder && contactItem.mallOrder.deliveryType == 1 && contactItem.mallDeliveryOrder && contactItem.mallDeliveryOrder.workerPhone"
+						@tap="makeCall(contactItem.mallDeliveryOrder.workerPhone)">
+						<text>联系配送员</text>
+						<text class="contact-popup-phone">{{contactItem.mallDeliveryOrder.workerPhone}}</text>
+					</view>
+				</view>
+			</uni-popup>
 		</view>
 	</view>
 </template>
@@ -181,7 +212,8 @@
 				orderDetail:{},
 				returnData:[],
 				returnCount:0,
-				submitLoading:false
+				submitLoading:false,
+				contactItem:{}
 			}
 		},
 		filters:{
@@ -253,6 +285,10 @@
 					phoneNumber: phone
 				});
 			},
+			openContactPopup(item){
+				this.contactItem = item || {};
+				this.$refs.contactPopup.open('bottom');
+			},
 			getReturnCount(){
 				let that = this
 				if(this.type == 'worker'){
@@ -445,6 +481,61 @@
 		font-size: 28rpx;
 		line-height: 50rpx;
 	}
+	.refund-main {
+		display: flex;
+		align-items: flex-start;
+	}
+	.refund-text {
+		flex: 1;
+		min-width: 0;
+	}
+	.refund-contact {
+		width: 120rpx;
+		flex-shrink: 0;
+		margin-left: 16rpx;
+	}
+	.contact-btn {
+		height: 50rpx;
+		border-radius: 14rpx;
+		background: rgba(0, 35, 28, 1);
+		color: rgba(166, 255, 234, 1);
+		font-size: 24rpx;
+		font-weight: 700;
+		line-height: 50rpx;
+		text-align: center;
+	}
+	.contact-popup {
+		width: 100%;
+		padding: 34rpx 28rpx 48rpx;
+		box-sizing: border-box;
+		border-radius: 32rpx 32rpx 0 0;
+		background: #fff;
+	}
+	.contact-popup-title {
+		margin-bottom: 18rpx;
+		color: #00231C;
+		font-size: 34rpx;
+		font-weight: 900;
+		text-align: center;
+	}
+	.contact-popup-item {
+		display: flex;
+		align-items: center;
+		height: 88rpx;
+		padding: 0 24rpx;
+		margin-top: 16rpx;
+		border-radius: 18rpx;
+		background: #F5F8F5;
+		color: #00231C;
+		font-size: 28rpx;
+		font-weight: 700;
+	}
+	.contact-popup-phone {
+		flex: 1;
+		color: #55716a;
+		font-size: 26rpx;
+		text-align: right;
+	}
 	.refund-reason-row {
 		line-height: 42rpx;
 	}
@@ -665,6 +756,21 @@
 		word-break: break-all;
 	}
 	
+	.product-popup-price-row {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 12rpx;
+		color: #f04438;
+		font-size: 24rpx;
+		font-weight: 800;
+		line-height: 34rpx;
+	}
+	
+	.product-popup-package-fee {
+		margin-left: 18rpx;
+		color: #65736f;
+	}
+	
 	.product-popup-quantity {
 		width: 92rpx;
 		height: 92rpx;