bug修改

pages/shop/photoAlbum/photoManage.vue

@@ -5,7 +5,7 @@
 		<view class="container-titles flex-row-center-between">
 			<view class="titles-left">
 				<view class="titles-bar"></view>
-				<text class="titles-title">我的资料</text>
+				<text class="titles-title">商家相册</text>
 			</view>
 			<view class="titles-right" @click="todetail">
 				<text class="titles-text">展示位置及拍摄技巧</text>
@@ -186,7 +186,7 @@
 						return
 					}
 				} else if (this.type == 2) {
-					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
+					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 11) {
 						uni.showToast({
 							title: '最多上个10张视频',
 							icon: 'none',

pages/shop/photoAlbum/videoList.vue

@@ -172,7 +172,7 @@
 			goAdd(id, item) {
 				if (this.isManage) return; // 管理模式下禁止跳转
 				if (this.type == 1) {
-					if (this.imgVideoList.length >= 20) {
+					if (this.imgVideoList.length >= 21) {
 						uni.showToast({
 							title: '最多上传20张图片',
 							icon: 'none',
@@ -181,7 +181,7 @@
 						return
 					}
 				} else if (this.type == 2) {
-					if (this.imgVideoList.length >= 10) {
+					if (this.imgVideoList.length >= 11) {
 						uni.showToast({
 							title: '最多上10个视频',
 							icon: 'none',

pages/shop/staff/addStaff.vue

@@ -12,7 +12,7 @@
 		<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent" @confirm="search"
 			@search="search">
 		</searchBox>
-		<scroll-view  :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
+		<scroll-view  :style="{ height:`calc(100vh - ${statusBarHeight + 380}rpx)`} " scroll-y>
 			<view class="page-container" v-if="sryDetail && sryDetail.id">
 				<!-- 个人信息栏 -->
 				<view class="user-info">

pages/shop/staff/serviceList.vue

@@ -7,7 +7,7 @@
 		</serviecFirstTab>
 
 		<view class="service-list">
-			<view class="service-item flex-row-center-between" v-for="(item, index) in getList" :key="index">
+			<view class="service-item flex-row-center-between" v-for="(item, index) in getList" :key="index" v-if="(item.is_choice && isBack!=0)  || isBack==0">
 				<view class="item-left flex-row-start">
 					<image class="item-left-photo" :src="item.photo[0]" mode="aspectFill"></image>
 					<view class="item-left-texts">
@@ -26,8 +26,11 @@
 				<!-- <view class="item-right" @click="item.is_choice = !item.is_choice">
 					{{ item.is_choice ? "取消" : "添加" }}
 				</view> -->
-				<image class="item-right" src="/static/images/icons/staffCancel.png" @click="changeType(item)" v-if="item.is_choice"></image>
+				<view v-if="isBack==0">
-				<image class="item-right" src="/static/images/icons/staffAdd.png" @click="changeType(item)" v-else></image>
+					<image class="item-right" src="/static/images/icons/staffCancel.png" @click="changeType(item)" v-if="item.is_choice"></image>
+					<image class="item-right" src="/static/images/icons/staffAdd.png" @click="changeType(item)" v-else></image>
+				</view>
+				
 			</view>
 		</view>
 		<view class="container-footer">

pages/shop/userorder-detail.vue

@@ -596,10 +596,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
 			},
 			// 输入完成

pages/shop/userorders.vue

@@ -233,6 +233,13 @@
 			},
 			// 开始服务
 			startOrder(e, order) {
+				if (order.team_buy_order_state == 1) {
+					uni.showToast({
+						title: "订单当前处于拼团中，服务将在拼团完成后才开启~",
+						icon: "none",
+					});
+					return
+				}
 				this.showInput = true;
 				this.handelOrder = order;
 			},