商家邀请按钮覆盖文字、顶部文字按钮排列

components/common/service-first-tab.vue

@@ -138,6 +138,8 @@ export default {
   font-size: 30rpx;
   color: var(--inactive-color); 
   transition: color 0.2s;
+  white-space: nowrap;
+  
 }
 
 /* 激活色：使用CSS变量 --active-color */

pages.json

@@ -937,6 +937,12 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/shop/skill-detail",
+			"style": {
+				"navigationBarTitleText": "拍摄技巧"
+			}
 		}
 
 

pages/shop/photoAlbum/addPhoto.vue

@@ -105,9 +105,10 @@
 			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。</view>
 		</view>
 
-		<video v-show="videoPlay" :src="videoUrl" controls id="myvideo" style="height: 0; width: 0; position: absolute; top: -999rpx; left: -999rpx;"
+		<video v-show="videoPlay" :src="videoUrl" controls id="myvideo"
+			style="height: 0; width: 0; position: absolute; top: -999rpx; left: -999rpx;"
 			@fullscreenchange="screenChange"></video>
-			<uv-divider></uv-divider>
+		<uv-divider></uv-divider>
 	</view>
 </template>
 
@@ -122,7 +123,7 @@
 		},
 		data() {
 			return {
-				videoContext:null,
+				videoContext: null,
 				videoPlay: false,
 				videoUrl: "",
 				disabled: false,
@@ -232,35 +233,55 @@
 			async submitPhoto() {
 				// 1. 防连点核心逻辑：如果正在提交中，直接return阻止后续执行
 				if (this.isSubmitting) return;
-				console.log(this.formData,'this.formData');
+				console.log(this.formData, 'this.formData');
 				// 2. 表单必填项校验：校验图片和名称是否填写
 				if (!this.formData.url) {
-					if(this.formData.type==1){
+					if (this.formData.type == 1) {
-						if(this.formData.class_type==1){
+						if (this.formData.class_type == 1) {
 							uni.showToast({
 								title: '请先上传店铺主图',
 								icon: 'none',
 								duration: 2000
 							});
-						}else if(this.formData.class_type==2){
+						} else if (this.formData.class_type == 2) {
 							uni.showToast({
 								title: '请先上传环境图片',
 								icon: 'none',
 								duration: 2000
 							});
-						}else if(this.formData.class_type==3){
+						} else if (this.formData.class_type == 3) {
 							uni.showToast({
 								title: '请先上传作品图片',
 								icon: 'none',
 								duration: 2000
 							});
+						} else {
+							uni.showToast({
+								title: '请先上传其它图片',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					} else if (this.formData.type == 2) {
+						if (this.formData.class_type == 1) {
+							uni.showToast({
+								title: '请先上传店铺主视频',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: '请先上传其它视频',
+								icon: 'none',
+								duration: 2000
+							});
 						}
 					}
-					uni.showToast({
+					// uni.showToast({
-						title: '请先上传图片/视频',
+					// 	title: '请先上传图片/视频',
-						icon: 'none',
+					// 	icon: 'none',
-						duration: 2000
+					// 	duration: 2000
-					});
+					// });
 					return
 				}
 				if (!this.formData.name || this.formData.name.trim() === '') {
@@ -390,7 +411,7 @@
 					uni.showLoading({
 						title: '上传中'
 					})
-					 console.log(this.formData,'=============================');
+					console.log(this.formData, '=============================');
 					if (this.formData.type == 1) {
 						res = await uploadImage.handleUpload(this.userInfo.id, 3);
 					} else {

pages/shop/photoAlbum/photoManage.vue

@@ -1,15 +1,17 @@
 <template>
 	<view class="container">
-		<custom-navbar title="店铺视频" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff"
+		<custom-navbar :title="pagestitle" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff"
 			titleColor="#000" borderBottom="none"></custom-navbar>
 		<view class="container-titles flex-row-center-between">
 			<view class="titles-left">
 				<view class="titles-bar"></view>
 				<text class="titles-title">我的资料</text>
 			</view>
-			<view class="titles-right">
+			<view class="titles-right" @click="todetail">
 				<text class="titles-text">展示位置及拍摄技巧</text>
-				<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b153e8d5-37b1-4205-a4a1-9f6603f30c2a.png" mode="widthFix" style="width: 24rpx;margin-top: 2rpx;margin-left: 6rpx;"></image>
+				<image
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b153e8d5-37b1-4205-a4a1-9f6603f30c2a.png"
+					mode="widthFix" style="width: 24rpx;margin-top: 4rpx;margin-left: 6rpx;"></image>
 			</view>
 		</view>
 		<view class="container-card" v-for="(item,index) in cardList[type]" :key="index">
@@ -114,17 +116,30 @@
 
 				},
 				type: 2, //1图片 2视频
+				pagestitle: '店铺图片'
 			}
 		},
 		async onShow() {
 			await this.getList()
 		},
 		async onLoad(options) {
+			console.log(options, 'options');
 			if (options.type) {
 				this.type = options.type
+				if (this.type == 1) {
+					this.pagestitle = '店铺图片'
+				} else {
+					this.pagestitle = "店铺视频"
+				}
 			}
 		},
 		methods: {
+			todetail() {
+				console.log('详情');
+				uni.navigateTo({
+					url:'/pages/shop/skill-detail'
+				})
+			},
 			getItem(item) {
 				let obj = {
 					name: "",
@@ -143,7 +158,7 @@
 				return obj
 			},
 			goList(id) {
-				console.log(id,'ididididididi');
+				console.log(id, 'ididididididi');
 				uni.navigateTo({
 					url: `/pages/shop/photoAlbum/videoList?id=${id}&type=${this.type}`
 				});
@@ -158,7 +173,7 @@
 			},
 			goAdd(id, item) {
 				if (this.type == 1) {
-					if ( this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
+					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
 						uni.showToast({
 							title: '最多上传20张图片',
 							icon: 'none',
@@ -167,9 +182,9 @@
 						return
 					}
 				} else if (this.type == 2) {
-					if ( this.imgVideoList[id] && this.imgVideoList[id].length  >= 10) {
+					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
 						uni.showToast({
-							title: '最多上传10张视频',
+							title: '最多上个10张视频',
 							icon: 'none',
 							duration: 2000
 						});
@@ -258,6 +273,7 @@
 
 			.titles-right {
 				display: flex;
+
 				.titles-text {
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;

pages/shop/photoAlbum/videoList.vue

@@ -183,7 +183,7 @@
 				} else if (this.type == 2) {
 					if (this.imgVideoList.length >= 10) {
 						uni.showToast({
-							title: '最多上传10张视频',
+							title: '最多上10个视频',
 							icon: 'none',
 							duration: 2000
 						});

pages/shop/skill-detail.vue

@@ -0,0 +1,26 @@
+<template>
+	<view>
+
+	</view>
+</template>
+
+<script>
+	import request from "@/utils/request";
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>

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 scroll-y :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
+		<scroll-view  :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
 			<view class="page-container" v-if="sryDetail && sryDetail.id">
 				<!-- 个人信息栏 -->
 				<view class="user-info">
@@ -75,6 +75,7 @@
 			<view class="agreement-footer" @click="sjinvitesyr" v-if="sryDetail && sryDetail.id && sryDetail.bind_state!=1">
 				<view class="agreement-btn">邀请员工</view>
 			</view>
+			<!-- <view class="" style="height: 98rpx;background-color: aquamarine;"></view> -->
 		</scroll-view>
 	</view>
 </template>
@@ -428,7 +429,6 @@
 		right: 0;
 		bottom: 0;
 		background-color: #ffffff;
-
 		.agreement-btn {
 			width: 710rpx;
 			height: 98rpx;

pages/shop/staff/serviceList.vue

@@ -69,7 +69,7 @@
 			if (options.syrid) {
 				this.sjservers(Number(options.syrid));
 			} else {
-				this.serviceList = this.$store.state.sjServiceList;
+				this.serviceList = JSON.parse(JSON.stringify(this.$store.state.sjServiceList))
 			}
 			this.sjfirstclass();
 		},
@@ -80,8 +80,10 @@
 		},
 		methods: {
 			changeType(item){
+				
 				if(this.isBack==0){
 					item.is_choice = !item.is_choice
+					console.log(this.$store.state.sjServiceList,'this.$store.state.sjServiceList');
 				}
 				
 			},