Merge branch 'mrr_sj_develop_丁杰_20260413_pricer' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_丁杰_20260413_pricer

pages/shop/SellerDetail.vue

@@ -1016,7 +1016,7 @@
 	}
 
 	.btn-border {
-		border: 1rpx solid #979797;
+		border: 2rpx solid #979797;
 		background-color: #fff;
 		box-sizing: border-box;
 		margin-left: 30rpx;

pages/shop/add-service.vue

@@ -276,19 +276,7 @@
 			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
 		</view>
 
-		<!-- 新增上门提醒弹窗-->
-		<transition name="fade">
-			<view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
-				<view class="popup-content2" @click.stop>
-					<view class="popup-title">提示</view>
-					<view class="popup-message">此服务是需要上门服务的哦～</view>
-					<view class="popup-buttons">
-						<view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
-						<view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
-					</view>
-				</view>
-			</view>
-		</transition>
+		
 
 	</view>
 </template>
@@ -316,7 +304,6 @@
 		},
 		data() {
 			return {
-				showReminderPopup: false,
 				artisanType: getApp().globalData.artisanType,
 				nowQer: "xc",
 				progress: 0,
@@ -391,9 +378,6 @@
 			}
 			// 判断是否显示上门提醒弹窗
 			const notShow = uni.getStorageSync('addServiceReminderNotShow');
-			// if (!notShow) {
-			// 	this.showReminderPopup = true;
-			// }
 			this.getUserInfo();
 		},
 		computed: {
@@ -513,14 +497,6 @@
 				return true;
 			},
 
-
-			closeReminderPopup(notShowAgain) {
-				console.log('关闭弹窗，不再提示：', notShowAgain);
-				if (notShowAgain) {
-					uni.setStorageSync('addServiceReminderNotShow', true);
-				}
-				this.showReminderPopup = false;
-			},
 			goImgAndText() {
 				uni.navigateTo({
 					url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,

pages/shop/staff/serviceList.vue

@@ -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>
-				<image class="item-right" src="/static/images/icons/staffAdd.png" @click="changeType(item)" v-else></image>
+				<view v-if="isBack==0">
+					<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">