bug修改

pages/home/components/filters.vue

@@ -156,6 +156,7 @@
 						weChatRefund: "/sj/workSeatOrder/weChatRefund",
 						aliRefund: "/sj/workSeatOrder/aliRefund",
 						startOrder: "/sj/workSeatOrder/start",
+						sureOrder:"/sj/workSeatOrder/sure",
 						endOrder: "/sj/workSeatOrder/end",
 						ordernum: "/sj/workSeatOrder/orderNum",
 						list: "/sj/workSeatOrder/list",
@@ -405,6 +406,7 @@
 					return;
 				}
 				this.clickType = true;
+				console.log(111,this.activeFirstId,this.urls)
 				request
 					.post(this.urls[this.activeFirstId].sureOrder, {
 						id: order.id,
@@ -414,7 +416,7 @@
 					.then((res) => {
 						if (res.state != 1 || res.code != 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 						} else {
@@ -459,7 +461,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.searchList();

pages/shop/SellerDetail.vue

@@ -25,11 +25,11 @@
 						}}</text>
 								<text class="service-name-num">×1</text>
 							</view>
-							<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
+						<!-- 	<text class="service-subtitle white-space-nowrap">{{identity==0?'使用场景':'服务范围'}}：{{
                   orderInfo.first_class_title +
                   "   " +
                   orderInfo.second_class_title
-                }}</text>
+                }}</text> -->
 						</view>
 						<view class="service-price">
 							<text>单价：{{ orderInfo.price }}元/10分钟</text>

pages/shop/buy-order.vue

@@ -77,7 +77,7 @@
 							</text>
 							<text class="action-btn gray-btn" v-if="order.state == 5 || order.state == 6 || order.state == 7"
 								@click="orderAgain(order)">
-								再来一单
+								再次购买
 							</text>
 							<text class="action-btn gray-btn" v-if="order.state == 5 && order.appeal == 2"
 								@click="lookComplaint(order)">

pages/shop/photoAlbum/photoManage.vue

@@ -136,8 +136,11 @@
 		methods: {
 			todetail() {
 				console.log('详情');
+				// uni.navigateTo({
+				// 	url: '/pages/shop/skill-detail'
+				// })
 				uni.navigateTo({
-					url: '/pages/shop/skill-detail'
+					url: `/pages/agreement/agreement?type=${this.type==1?22:23}&title=${this.type==1?`相册配置说明`:`视频配置说明`}`
 				})
 			},
 			getItem(item) {

pages/shop/sj-info-change.vue

@@ -1224,7 +1224,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="less">
 	.store-info-page {
 		padding-bottom: 20rpx;
 	}
@@ -1367,6 +1367,7 @@
 	.label-wrapper {
 		display: inline-flex;
 		align-items: center;
+		transform: translateY(4rpx);
 	}
 
 	.label {
@@ -1388,6 +1389,11 @@
 		align-items: flex-start;
 		justify-content: space-between;
 		padding: 24rpx;
+
+		.label {
+			transform: translateY(4rpx);
+		}
+
 	}
 
 	/* 左侧标签：固定宽度，不换行 */

pages/shop/userorder-detail.vue

@@ -93,7 +93,7 @@
 			</view> -->
 
 			<!-- 用户信息 -->
-		<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
+			<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
 				<view class="userinfo">
 					<view class="" v-if="orderInfo.user_yh.head_photo">
 						<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
@@ -653,10 +653,13 @@
 			// 开始服务
 			startOrder(e, order) {
 				// app阻止事件冒泡
-				// #ifdef APP-PLUS
+				if (order.team_buy_order_state == 1) {
-				e.preventDefault();
+					uni.showToast({
-				e.stopPropagation();
+						title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
-				// #endif
+						icon: "none",
+					});
+					return
+				}
 				this.showInput = true
 			},
 			// 输入完成
@@ -664,7 +667,9 @@
 				this.showInput = false;
 				if (this.clickType) return;
 				this.clickType = true;
-				uni.showLoading({ title: '服务开始中...' });
+				uni.showLoading({
+					title: '服务开始中...'
+				});
 
 				request.post(this.urls[this.serviceType].startOrder, {
 					id: this.orderInfo.id,
@@ -672,7 +677,10 @@
 					sjid: this.userInfo.id
 				}).then(res => {
 					if (res.state == 1) {
-						uni.showToast({ title: res.msg, icon: 'success' });
+						uni.showToast({
+							title: res.msg,
+							icon: 'success'
+						});
 						// 直接修改状态为 4（待完成）
 						this.orderInfo.state = 4;
 						// 强制刷新视图，按钮立即变化
@@ -687,11 +695,17 @@
 							prevPage.$vm.getOrderList?.();
 						}
 					} else if (res.state == 2) {
-						uni.showToast({ title: res.msg, icon: 'none' });
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
 					}
 				}).catch(err => {
 					console.error('开始服务失败', err);
-					uni.showToast({ title: '操作失败', icon: 'none' });
+					uni.showToast({
+						title: '操作失败',
+						icon: 'none'
+					});
 				}).finally(() => {
 					this.clickType = false;
 					uni.hideLoading();
@@ -1695,7 +1709,8 @@
 		text-align: left;
 		font-style: normal;
 	}
-	.coupon-title{
+
+	.coupon-title {
 		width: 160rpx;
 		height: 40rpx;
 		font-family: PingFangSC, PingFang SC;
@@ -1706,5 +1721,6 @@
 		text-align: left;
 		font-style: normal;
 	}
+
 	.coupon-item {}
 </style>

pages/shop/userorders.vue

@@ -249,7 +249,7 @@
 						console.log(res);
 						if (res.state == 1 || res.code == 200) {
 							uni.showToast({
-								title: res.msg,
+								title: "开始服务",
 								icon: "none",
 							});
 							this.$refs.groupRef.manualRefresh(this.listQuery);

pages/shop/workSpace/components/orderCard.vue

@@ -126,7 +126,7 @@
 					"待支付",
 					"待接单",
 					"待开始",
-					"进行中",
+					"待完成",
 					"已完成",
 					"已评价",
 					"已取消",