1

package2/group/groupBuySingle.vue

@@ -127,8 +127,8 @@
 						:style="{ height: stickyInnerHeight + 'px' }">
 						<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
 							:style="{'border-top-right-radius':item.checked?'20rpx':'','border-bottom-right-radius':item.checked?'20rpx':'','color':item.checked ? (isStoreGroupOrder ? '#f0642f' : 'rgba(0, 35, 28, 1)') : (isStoreGroupOrder ? '#9b6a4c' : '#777'),'background':item.checked ? (isStoreGroupOrder ? 'linear-gradient(90deg, #fff4e8, #fff)' : '#fff') : ''}">
-							<image class="menu-active-dot" v-if="item.checked" src="/static/images/img/loading.gif"
+							<!-- <image class="menu-active-dot" v-if="item.checked" src="/static/images/img/loading.gif"
-								mode="aspectFit"></image>
+								mode="aspectFit"></image> -->
 							<view style="width: 160rpx;">{{item.categoryName}}</view>
 						</view>
 					</scroll-view>
@@ -632,8 +632,16 @@
 			</view>
 		</uni-popup>
 		<!-- 参团成功提示弹出层 -->
-		<uni-popup ref="tishiPopup" background-color="#fff">
+		<uni-popup ref="tishiPopup" background-color="transparent">
-			<view class="tishi-popup">
+			<view v-if="!isPindan && isStoreGroupOrder" class="group-face-tip-popup" @tap.stop>
+				<view class="group-face-tip-close" @tap="$refs.tishiPopup.close()">
+					<uni-icons type="closeempty" size="22" color="#9a6a42"></uni-icons>
+				</view>
+				<view class="group-face-tip-title">温馨提示</view>
+				<view class="group-face-tip-text">面对面拼团不会公开显示</view>
+				<view class="group-face-tip-btn" @tap="$refs.tishiPopup.close()">我知道了</view>
+			</view>
+			<view v-else class="tishi-popup">
 				<view class="tishi-copy" v-if="!isPindan">
 					<view class="tishi-copy-title">面对面团不会公开显示</view>
 					<view class="tishi-copy-desc">
@@ -1745,6 +1753,9 @@
 				uni.showLoading({
 					title: '创建订单中....'
 				});
+				if(isStoreGroupOrder){
+					payload.otherOrder = 2
+				}
 				this.tui.request("/mall/order/create", "POST", payload, false, false).then(res => {
 					uni.hideLoading();
 					this.isCreatingOrder = false;
@@ -3121,6 +3132,68 @@
 		font-weight: 900;
 	}
 
+	.group-face-tip-popup {
+		width: 560rpx;
+		padding: 54rpx 42rpx 40rpx;
+		box-sizing: border-box;
+		border-radius: 34rpx;
+		background: linear-gradient(180deg, #fff8ec 0%, #ffffff 58%, #fff3e6 100%);
+		box-shadow: 0 18rpx 60rpx rgba(130, 75, 28, 0.22);
+		position: relative;
+		text-align: center;
+		overflow: hidden;
+	}
+
+	.group-face-tip-popup::before {
+		content: '';
+		position: absolute;
+		top: -90rpx;
+		right: -70rpx;
+		width: 220rpx;
+		height: 220rpx;
+		border-radius: 50%;
+		background: rgba(255, 190, 96, 0.18);
+	}
+
+	.group-face-tip-close {
+		position: absolute;
+		top: 22rpx;
+		right: 24rpx;
+		width: 48rpx;
+		height: 48rpx;
+		line-height: 48rpx;
+		border-radius: 50%;
+		background: rgba(255, 236, 214, 0.9);
+	}
+
+	.group-face-tip-title {
+		color: #9a4f17;
+		font-size: 38rpx;
+		font-weight: 900;
+		line-height: 52rpx;
+	}
+
+	.group-face-tip-text {
+		margin-top: 26rpx;
+		color: #2c3f38;
+		font-size: 30rpx;
+		font-weight: 700;
+		line-height: 44rpx;
+	}
+
+	.group-face-tip-btn {
+		margin: 42rpx auto 0;
+		width: 300rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		border-radius: 999rpx;
+		color: #fff;
+		font-size: 28rpx;
+		font-weight: 800;
+		background: linear-gradient(90deg, #f28b38, #c96f1e);
+		box-shadow: 0 10rpx 24rpx rgba(207, 112, 30, 0.25);
+	}
+
 	.spark-b {
 		width: 24rpx;
 		height: 24rpx;

package2/shop/afterService.vue

@@ -62,7 +62,7 @@
 				<view style="height: 80rpx;border-top: 1px solid #eee;display: flex;">
 					<view style="flex: 1;">
 						<view class="btn" @tap="orderDetailOpen(item)" style="display: inline-block;">
-							查看订单
+							{{item.mallOrder.otherOrder == 1 ? '快递/跑腿单' : '查看订单'}}
 						</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;">
 							拼团详情

package2/shop/merchantCenter.vue

@@ -361,15 +361,13 @@
 											that.tui.request("/mall/order/complete", "post", {
 												orderId: productId
 											}, false, true).then((res) => {
+												uni.hideLoading()
 												if (res.code == 200) {
-													uni.showToast({
+													that.tui.toast("核销成功",1500)
-														title: '核销成功',
-														icon: 'none'
-													})
 												} else {
 													that.tui.toast(res.message)
 												}
-												uni.hideLoading()
+												//
 											}).catch((res) => {})
 										}
 									}