1

package1/buyFood/buyFood.vue

@@ -474,7 +474,7 @@
 								alt="" style="width: 120rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
 						</view>
 						<view class="kaituan1-title1">
-							快呼唤小伙伴参加吧！
+							预计5分钟成团，分享好友可立即成团
 						</view>
 					</view>
 					<view class="kaituan2">

package1/order/orderConfirm.vue

@@ -13,10 +13,13 @@
 		<scroll-view class="content" scroll-y :show-scrollbar="false">
 			<view class="safe-spacer" :style="{ height: navHeight + 'px' }"></view>
 			<view class="pay-result">
-				<view class="pay-check">
+				<view class="pay-result-main">
-					<uni-icons type="checkmarkempty" size="28" color="#ffffff"></uni-icons>
+					<view class="pay-check">
+						<uni-icons type="checkmarkempty" size="28" color="#ffffff"></uni-icons>
+					</view>
+					<view class="pay-title">支付成功</view>
 				</view>
-				<view class="pay-title">支付成功</view>
+				<view class="group-estimate-tip" v-if="groupId">预计5分钟左右成团，分享好友可立即成团</view>
 			</view>
 			<view class="order-strip order-strip--top">
 				<view class="order-strip-left">
@@ -596,11 +599,18 @@
 
 	.pay-result {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		margin-top: 6rpx;
 	}
 
+	.pay-result-main {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
 	.pay-check {
 		width: 64rpx;
 		height: 64rpx;
@@ -621,6 +631,19 @@
 		line-height: 72rpx;
 	}
 
+	.group-estimate-tip {
+		margin-top: 16rpx;
+		padding: 10rpx 24rpx;
+		border-radius: 999rpx;
+		background: rgba(224, 255, 222, 0.72);
+		border: 1rpx solid rgba(166, 255, 234, 1);
+		color: #123c35;
+		font-size: 26rpx;
+		font-weight: 800;
+		line-height: 36rpx;
+		text-align: center;
+	}
+
 	.pay-subtitle {
 		margin-top: 12rpx;
 		color: #70827b;

package1/order/orderDetail.vue

@@ -60,7 +60,7 @@
 							alt="" style="width: 240rpx;height: 22rpx;position: absolute;bottom: 0;right: 30rpx;" />
 					</view>
 					<view class="kaituan1-title11">
-						快呼唤小伙伴参加吧！
+						{{getEstimatedGroupText(orderDetail)}}
 					</view>
 					<view class="kaituan-refresh-btn" @tap="refreah(orderDetail)">
 						{{isRefreshing ? '刷新中' : '刷新'}}
@@ -1253,6 +1253,14 @@
 				date = new Date(normalized);
 				return isNaN(date.getTime()) ? null : date;
 			},
+			getEstimatedGroupText(order) {
+				const payTime = this.parseOrderTime(order && order.payTime);
+				if (!payTime) return '分享好友可立即成团';
+				const estimateTime = new Date(payTime.getTime() + 5 * 60 * 1000);
+				const hour = String(estimateTime.getHours()).padStart(2, '0');
+				const minute = String(estimateTime.getMinutes()).padStart(2, '0');
+				return `预计${hour}:${minute}成团，分享好友可立即成团`;
+			},
 			formatTimeText(value) {
 				if (!value) return '';
 				if (value == '尽快送达') return '尽快送达';
@@ -3424,9 +3432,11 @@
 		background: rgba(224, 255, 222, 0.65);
 		border: 1px solid rgba(166, 255, 234, 1);
 		border-radius: 20rpx;
-		height: 44rpx;
+		min-height: 44rpx;
-		line-height: 38rpx;
+		line-height: 34rpx;
-		width: 280rpx;
+		width: auto;
+		max-width: calc(100% - 40rpx);
+		padding: 6rpx 18rpx;
 		text-align: center;
 		margin: 10rpx 0 0 20rpx;
 		box-sizing: border-box;

package1/runErrand/runErrand.vue

@@ -396,6 +396,7 @@
 	import deliveryTimeOp from '@/package1/components/delivery-time-op/delivery-time-op.vue'
 	import addressList from '@/package1/address/addressList.vue'
 	import { buildHomeSharePath } from '@/utils/sharePath.js'
+	import { requireLoginToCurrentPage } from '@/utils/authRedirect.js'
 
 	const SHARE_TARGET_PATH = '/package1/runErrand/runErrand'
 
@@ -542,6 +543,9 @@
 			}
 		},
 		methods: {
+			requirePageLogin() {
+				return requireLoginToCurrentPage()
+			},
 			enableShareMenu() {
 				if (!uni.showShareMenu) return
 				uni.showShareMenu({
@@ -623,6 +627,7 @@
 				}).catch(() => {});
 			},
 			openCommissionPopup() {
+				if (!this.requirePageLogin()) return
 				this.commissionInputValue = '';
 				this.commissionInputFocus = false;
 				this.$refs.commissionPopup.open('center');
@@ -649,6 +654,7 @@
 				return value;
 			},
 			confirmCommission() {
+				if (!this.requirePageLogin()) return
 				let commission = parseFloat(this.commissionInputValue);
 				if (!this.validateCustomCommission(commission)) return;
 				this.customCommission = this.formatCommissionValue(this.commissionInputValue);
@@ -656,6 +662,7 @@
 				/* this.fetchCoupons(); */
 			},
 			openRemarkPopup() {
+				if (!this.requirePageLogin()) return
 				this.remarkInputValue = this.addFormData.remark || '';
 				this.$refs.remarkPopup.open('center');
 			},
@@ -688,11 +695,13 @@
 				this.remarkInputValue = (this.remarkInputValue || '').toString().slice(0, 30);
 			},
 			confirmRemark() {
+				if (!this.requirePageLogin()) return
 				this.addFormData.remark = (this.remarkInputValue || '').slice(0, 30);
 				uni.hideKeyboard();
 				this.$refs.remarkPopup.close();
 			},
 			openCouponPopup() {
+				if (!this.requirePageLogin()) return
 				/* this.fetchCoupons(); */
 				this.$refs.couponPopup.open('bottom');
 			},
@@ -800,6 +809,7 @@
 				}
 			},
 			openAddressBook(mode) {
+				if (!this.requirePageLogin()) return
 				this.addressSelectMode = mode;
 				this.isBookPopupOpen = true;
 				this.addressBookVisible = true;
@@ -843,6 +853,7 @@
 				}
 			},
 			openKuaidiPicker() {
+				if (!this.requirePageLogin()) return
 				this.getShopArea();
 				this.$refs.kuaidiPickerPopup.open();
 			},
@@ -851,6 +862,7 @@
 				this.$refs.kuaidiPickerPopup.close();
 			},
 			goDetail() {
+				if (!this.requirePageLogin()) return
 				let shopAreaId = '';
 				if (this.isKuaidi) {
 					shopAreaId = this.selectedPickupArea ? this.selectedPickupArea.id : '';
@@ -874,6 +886,7 @@
 				
 			},
 			checkTime(type) {
+				if (!this.requirePageLogin()) return
 				if (type === this.formData.isImmediately) {
 					if (type === false) {
 						this.$refs.model.open()
@@ -940,6 +953,7 @@
 				this.$refs.model.close();
 			},
 			checkWorker(type) {
+				if (!this.requirePageLogin()) return
 				if (type == this.selectedWorker) return;
 				this.selectedWorker = type;
 				if (this.selectedWorker == 'buzhiding') {
@@ -948,15 +962,19 @@
 				}
 			},
 			checkWeightOrVolume() {
+				if (!this.requirePageLogin()) return
 				this.addFormData.isOverweightOrOvervolume = !this.addFormData.isOverweightOrOvervolume
 			},
 			addCode() {
+				if (!this.requirePageLogin()) return
 				this.addFormData.codeList.push({ code: '' })
 			},
 			delCode(index) {
+				if (!this.requirePageLogin()) return
 				this.addFormData.codeList.splice(index, 1)
 			},
 			pictureAdd() {
+				if (!this.requirePageLogin()) return
 				let that = this
 				uni.chooseMedia({
 					count: 9,
@@ -1009,6 +1027,7 @@
 				}, 1000)
 			},
 			delPicture(index) {
+				if (!this.requirePageLogin()) return
 				this.addFormData.picture.splice(index, 1);
 			},
 			getMustFinishTime() {
@@ -1038,6 +1057,7 @@
 				return null;
 			},
 			submitPay() {
+				if (!this.requirePageLogin()) return
 				uni.hideKeyboard();
 				if (this.currentOrderId) {
 					this.goPayOrderDetail();
@@ -1174,6 +1194,7 @@
 				});
 			},
 			wxPayment() {
+				if (!this.requirePageLogin()) return
 				let that = this;
 				if (!this.currentOrderId || !this.backendTotalAmount) return;