1

components/tab-bar/delivery.vue

@@ -113,6 +113,9 @@
 							style="height: 40rpx;line-height: 40rpx;background: rgba(130, 255, 130, 1);padding: 0 16rpx;border-radius: 40rpx;margin: 14rpx 20rpx 0 0;">
 							代跑腿
 						</view>
+						<view class="appointment-delivery-tag" v-if="item.appointmentDelivery == 1">
+							预约配送
+						</view>
 						<view class="" :style="{'color':shouldNotify(item.mustFinishTime)?'red':''}">
 							{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }}前送达
 						</view>
@@ -1025,6 +1028,19 @@
 				}
 				this.loadWorkerRules(true)
 			},
+			showRuleEditedConfirm() {
+				uni.showModal({
+					title: '提示',
+					content: '您编辑了接单规则，开启后才会接到路线订单，需要现在开启吗？',
+					confirmText: '确认',
+					cancelText: '取消',
+					success: (res) => {
+						if (res.confirm) {
+							this.openPopup()
+						}
+					}
+				})
+			},
 			checkArea() {
 				this.isArea = !this.isArea
 			},
@@ -2114,6 +2130,19 @@
 		border-radius: 10rpx;
 	}
 
+	.appointment-delivery-tag {
+		height: 48rpx;
+		margin: 10rpx 12rpx 0 0;
+		padding: 0 16rpx;
+		border-radius: 14rpx;
+		background: linear-gradient(135deg, #ff8f1f 0%, #ff6a3d 100%);
+		color: #fff;
+		font-size: 22rpx;
+		font-weight: 800;
+		line-height: 48rpx;
+		box-shadow: 0 8rpx 18rpx rgba(255, 106, 61, 0.16);
+	}
+
 	.shangxian-btn {
 		background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/7620b3eed7b14bb69d3c456ed0be72b3.png') no-repeat;
 		padding-left: 16rpx;

components/tab-bar/myCenter.vue

@@ -2,7 +2,7 @@
 	<view class="page1">
 		<view style="margin-top: 80px;" @click="navigatorTo('merchant')">商家入驻</view>
 		<view style="margin-top: 50px;" @click="navigatorTo('merchantCenter')">商家中心-{{shopCounts}}</view>
-		<view style="margin-top: 50px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
+		<view style="margin-top: 50px;" @click="navigatorTo('jianzhizhuce')">{{worker ? '接单规则' : '兼职注册'}}</view>
 		<view style="margin-top: 50px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页-{{workerCounts}}</view>
 		<view style="margin-top: 50px;" @click="navigatorTo('qianbao')">钱包余额 ￥{{balance}}</view>
 		<view style="margin-top: 50px;" @click="navigatorTo('dingdan')">我的订单</view>