From 1ed3b8eec4f2c8fcd8729d7e3fe808b0bf5c0330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Fri, 10 Apr 2026 12:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=82=80=E8=AF=B7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=A6=86=E7=9B=96=E6=96=87=E5=AD=97=E3=80=81=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E6=96=87=E5=AD=97=E6=8C=89=E9=92=AE=E6=8E=92=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common/service-first-tab.vue |    2 +
 pages.json                              |    6 +
 pages/shop/photoAlbum/addPhoto.vue      | 1499 ++++++++++++-----------
 pages/shop/photoAlbum/photoManage.vue   |  880 ++++++-------
 pages/shop/photoAlbum/videoList.vue     |    2 +-
 pages/shop/skill-detail.vue             |   26 +
 pages/shop/staff/addStaff.vue           |    4 +-
 pages/shop/staff/serviceList.vue        |    4 +-
 8 files changed, 1248 insertions(+), 1175 deletions(-)
 create mode 100644 pages/shop/skill-detail.vue

diff --git a/components/common/service-first-tab.vue b/components/common/service-first-tab.vue
index 46c652c..cd5dbac 100644
--- a/components/common/service-first-tab.vue
+++ b/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 */
diff --git a/pages.json b/pages.json
index d9a5e2f..b63a79f 100644
--- a/pages.json
+++ b/pages.json
@@ -937,6 +937,12 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/shop/skill-detail",
+			"style": {
+				"navigationBarTitleText": "拍摄技巧"
+			}
 		}
 
 
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 07c5c77..6c36e5c 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -1,740 +1,761 @@
-<template>
-	<view class="container">
-		<custom-navbar :title="pageTexts[formData.type][formData.class_type].title1"
-			:leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff" titleColor="#000"
-			borderBottom="none"></custom-navbar>
-
-		<view class="review" v-if="imgItem.apply_state==1">
-			<view class="review-title">
-				<text class="review-title-text">审核中…</text>
-			</view>
-			<text class="review-text">预计24小时完成审核，通过后将自动生效</text>
-		</view>
-		<view class="review" v-if="imgItem.apply_state==2">
-			<view class="review-title">
-				<text class="review-title-text">审核成功<text style="color: #E8101E;">、线上展示中</text></text>
-			</view>
-		</view>
-		<view class="review" v-if="imgItem.apply_state==3">
-			<view class="review-title">
-				<text class="review-title-text">已驳回…</text>
-			</view>
-			<text class="review-text" v-if="imgItem.back_text">驳回原因：{{ imgItem.back_text }}</text>
-		</view>
-
-		<view :class="{haveReview:imgItem.apply_state}">
-			<view class="container-card">
-				<view class="card-header">
-					<text class="card-title">{{ pageTexts[formData.type][formData.class_type].title2 }}</text>
-					<text class="card-title2">({{ formData.type==1?"上传1张照片":"上传1个视频" }})</text>
-				</view>
-				<view class="card-content flex-row-center-center" v-if="formData.type==1">
-					<view class="card-content-container">
-						<image v-if="formData.url" :src="formData.url" mode="aspectFill" class="preview-image"></image>
-						<view class="content-default" @click="chooseImage" v-else>
-							<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
-							<text class="content-default-text">添加照片</text>
-						</view>
-						<view class="content-photo-title" v-if="formData.url" @click.stop="chooseImage">
-							替换图片
-						</view>
-					</view>
-
-				</view>
-				<view class="card-content flex-row-center-center" v-else>
-					<view class="card-content-container">
-						<image v-if="formData.url" @click="goVideo"
-							:src="formData.url+`?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`"
-							mode="aspectFill" class="preview-video"></image>
-						<view class="content-default2" @click="chooseImage" v-else>
-							<image class="content-default2-img" src="/static/images/icons/addPhoto.png"></image>
-							<text class="content-default2-text">添加视频</text>
-						</view>
-						<view class="content-photo-title" @click.stop="chooseImage" v-if="formData.url">
-							替换视频
-						</view>
-						<view class="content-photo-play" v-if="formData.url">
-							<image class="content-photo-play-img" mode="aspectFill" src="/static/images/icons/play.png">
-							</image>
-						</view>
-					</view>
-
-				</view>
-			</view>
-
-			<view class="container-card">
-				<view class="card-header">
-					<text class="card-title">{{ formData.type==1?"图片名称":"视频名称" }}</text>
-				</view>
-				<view class="card-content">
-					<view class="card-content-input">
-						<input maxlength="6" :placeholder="formData.type==1?`请输入图片名称`:`请输入视频名称`" v-model="formData.name"
-							placeholder-class="inputClass" :disabled="disabled" />
-					</view>
-
-				</view>
-			</view>
-		</view>
-
-
-
-		<!-- <view class="container-buttons flex-row-center-center" v-if="">
-			<view class="container-buttons-cancel flex-row-center-center">取消</view>
-			<view class="container-buttons-sure flex-row-center-center" @click="submitPhoto">提交</view>
-		</view> -->
-		<view class="container-buttons flex-row-center-center" v-if="imgItem.apply_state">
-			<view class="container-buttons-sure2 flex-row-center-center" v-if="disabled==true"
-				@click="disabled = false">编辑</view>
-			<view class="container-buttons-cancel flex-row-center-center" v-if="disabled==false"
-				@click="disabled = true">取消</view>
-			<view class="container-buttons-sure flex-row-center-center" @click="editPhoto" v-if="disabled==false">提交
-			</view>
-		</view>
-
-		<view class="container-buttons flex-row-center-center" v-else>
-			<view class="container-buttons-sure2 flex-row-center-center" @click="submitPhoto">提交</view>
-		</view>
-
-		<!-- 获取权限提示匡内容 -->
-		<view class="permission" :class="{ transform: isShowPer && nowQer === 'xc' }">
-			<view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
-			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
-		</view>
-		<view class="permission" :class="{ transform: isShowPer && nowQer === 'xj' }">
-			<view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
-			<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;"
-			@fullscreenchange="screenChange"></video>
-			<uv-divider></uv-divider>
-	</view>
-</template>
-
-<script>
-	import request from "@/utils/request";
-	import uploadImage from '@/utils/albumUploadImage';
-	import permissionUtils from '@/utils/per';
-	import locationService from '@/utils/locationService';
-	export default {
-		components: {
-
-		},
-		data() {
-			return {
-				videoContext:null,
-				videoPlay: false,
-				videoUrl: "",
-				disabled: false,
-				isShowPer: false,
-				nowQer: 'xc',
-				formData: {
-					name: "",
-					url: "",
-					class_type: 1, //1主(图片/视频) 2环境(图片/视频) 3作品(图片/视频) 4其它(图片/视频)
-					type: 1, //1图片 2视频
-				},
-				pageTexts: {
-					1: {
-						1: {
-							title1: '添加店铺图片',
-							title2: '店铺主图',
-						},
-						2: {
-							title1: '添加环境图片',
-							title2: '环境图片',
-						},
-						3: {
-							title1: '添加作品图片',
-							title2: '作品图片',
-						},
-						4: {
-							title1: '添加其它图片',
-							title2: '其它图片',
-						},
-					},
-					2: {
-						1: {
-							title1: '添加店铺视频',
-							title2: '店铺主视频',
-						},
-						2: {
-							title1: '添加环境视频',
-							title2: '环境视频',
-						},
-						3: {
-							title1: '添加作品视频',
-							title2: '作品视频',
-						},
-						4: {
-							title1: '添加其它视频',
-							title2: '其它视频',
-						},
-					},
-				},
-				userInfo: {},
-				isSubmitting: false,
-				imgItem: {}
-			}
-		},
-		async onLoad(options) {
-			if (options.id) {
-				this.formData.class_type = options.id;
-			}
-			if (options.type) {
-				this.formData.type = options.type;
-			}
-			if (options.item) {
-				try {
-					this.imgItem = JSON.parse(decodeURIComponent(options.item));
-					this.formData.name = this.imgItem.auth_name
-					this.formData.url = this.imgItem.auth_url
-					this.formData.id = this.imgItem.id
-					this.formData.auth_id = this.imgItem.auth_id
-					this.disabled = true
-				} catch (e) {
-
-				}
-			}
-			let type = 3;
-			let result = await request.post("/user/getuser", {
-				type,
-			});
-			this.userInfo = result.data;
-		},
-		methods: {
-			screenChange(e) {
-				
-				let fullScreen = e.detail.fullScreen; // 值true为进入全屏，false为退出全屏
-				console.log(e, "全屏");
-				if (!fullScreen) {
-					//退出全屏
-					this.videoContext.pause()
-					plus.screen.lockOrientation('portrait-primary');
-					this.videoPlay = false; // 隐藏播放盒子
-				}
-			},
-			goVideo() {
-				// let urls = [this.formData.url]
-				// uni.navigateTo({
-				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
-				// });
-				this.videoPlay = true; // 显示播放盒子
-				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
-				this.videoUrl = this.formData.url;
-				this.videoContext.requestFullScreen({
-					direction: 90
-				});
-				this.videoContext.play();
-
-
-			},
-			async submitPhoto() {
-				// 1. 防连点核心逻辑：如果正在提交中，直接return阻止后续执行
-				if (this.isSubmitting) return;
-				console.log(this.formData,'this.formData');
-				// 2. 表单必填项校验：校验图片和名称是否填写
-				if (!this.formData.url) {
-					if(this.formData.type==1){
-						if(this.formData.class_type==1){
-							uni.showToast({
-								title: '请先上传店铺主图',
-								icon: 'none',
-								duration: 2000
-							});
-						}else if(this.formData.class_type==2){
-							uni.showToast({
-								title: '请先上传环境图片',
-								icon: 'none',
-								duration: 2000
-							});
-						}else if(this.formData.class_type==3){
-							uni.showToast({
-								title: '请先上传作品图片',
-								icon: 'none',
-								duration: 2000
-							});
-						}
-					}
-					uni.showToast({
-						title: '请先上传图片/视频',
-						icon: 'none',
-						duration: 2000
-					});
-					return
-				}
-				if (!this.formData.name || this.formData.name.trim() === '') {
-					uni.showToast({
-						title: '请输入图片名称',
-						icon: 'none',
-						duration: 2000
-					});
-					return
-				}
-
-				try {
-					// 3. 开启提交锁 + 显示加载中提示
-					this.isSubmitting = true;
-					uni.showLoading({
-						title: '提交中...',
-						mask: true
-					});
-
-					// 4. 提交接口请求 【修复原代码传参BUG：formData → this.formData】
-					const res = await request.post("/sj/imgVideo/add", this.formData);
-
-					if (res.code == 200) {
-						// 5. 提交成功：提示 + 延时返回上一页（用户能看到提示）
-						uni.showToast({
-							title: '提交成功',
-							icon: 'success'
-						});
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1
-							}); // 返回上一级页面，核心需求
-						}, 1500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-
-				} catch (err) {
-					// 6. 提交失败：异常提示
-					console.error('图片提交失败：', err);
-					uni.showToast({
-						title: '提交失败，请稍后重试',
-						icon: 'none',
-						duration: 2000
-					});
-				} finally {
-					// 7. 核心兜底：无论成功/失败/报错，都关闭加载 + 释放提交锁
-					uni.hideLoading();
-					this.isSubmitting = false;
-				}
-			},
-			async editPhoto() {
-				// 1. 防连点核心逻辑：如果正在提交中，直接return阻止后续执行
-				if (this.isSubmitting) return;
-
-				// 2. 表单必填项校验：校验图片和名称是否填写
-				if (!this.formData.url) {
-					uni.showToast({
-						title: '请先上传店铺主图',
-						icon: 'none',
-						duration: 2000
-					});
-					return
-				}
-				if (!this.formData.name || this.formData.name.trim() === '') {
-					uni.showToast({
-						title: '请输入图片名称',
-						icon: 'none',
-						duration: 2000
-					});
-					return
-				}
-
-				try {
-					// 3. 开启提交锁 + 显示加载中提示
-					this.isSubmitting = true;
-					uni.showLoading({
-						title: '提交中...',
-						mask: true
-					});
-
-					// 4. 提交接口请求 【修复原代码传参BUG：formData → this.formData】
-					const res = await request.post("/sj/imgVideo/edit", this.formData);
-
-					if (res.code == 200) {
-						// 5. 提交成功：提示 + 延时返回上一页（用户能看到提示）
-						uni.showToast({
-							title: '提交成功',
-							icon: 'success'
-						});
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1
-							}); // 返回上一级页面，核心需求
-						}, 1500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				} catch (err) {
-					// 6. 提交失败：异常提示
-					console.error('图片提交失败：', err);
-					uni.showToast({
-						title: '提交失败，请稍后重试',
-						icon: 'none',
-						duration: 2000
-					});
-				} finally {
-					// 7. 核心兜底：无论成功/失败/报错，都关闭加载 + 释放提交锁
-					uni.hideLoading();
-					this.isSubmitting = false;
-				}
-			},
-			// 打开相机
-			async openCamera() {
-				this.isShowPer = false;
-				let res = null
-
-				try {
-					uni.showLoading({
-						title: '上传中'
-					})
-					 console.log(this.formData,'=============================');
-					if (this.formData.type == 1) {
-						res = await uploadImage.handleUpload(this.userInfo.id, 3);
-					} else {
-						res = await uploadImage.handleUpload(this.userInfo.id, 3, ['album', 'camera'],
-							'video');
-					}
-					console.log('上传单张图片', res)
-					this.formData.url = res;
-				} catch (err) {
-					console.log(err)
-					uni.showToast({
-						title: '上传失败',
-						icon: 'none'
-					}); // 新增：上传失败提示
-				} finally {
-					uni.hideLoading(); // 移到这里，必执行
-				}
-			},
-			// 显示权限说明弹窗
-			showPermissionDialog(title, content) {
-				return new Promise((resolve) => {
-					uni.showModal({
-						title,
-						content,
-						confirmText: '去开启',
-						success(res) {
-							resolve(res.confirm);
-						}
-					});
-				});
-			},
-			// 选择图片
-			async chooseImage() {
-				if (this.disabled) return
-				try {
-					const systemInfo = uni.getSystemInfoSync()
-					if (systemInfo.platform === 'ios') {
-						this.openCamera();
-					} else {
-						let xcpermission = '';
-						let xjpermission = '';
-						if (systemInfo.platform === 'ios') {
-							xcpermission = 'photo_library',
-								xjpermission = 'camera'
-						} else {
-							xcpermission =
-								`android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
-							xjpermission = 'android.permission.CAMERA'
-						}
-						const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
-						const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
-						if (xcfirstRequest || xjfirstRequest) {
-							this.isShowPer = true;
-						}
-
-						// 1. 检查权限
-						// const { granted } = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
-						this.nowQer = 'xc';
-						const xc = await permissionUtils.checkPermission('photo_library',
-							'需要相册权限用于上传照片');
-						this.nowQer = 'xj';
-						const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
-						this.isShowPer = false;
-						this.nowQer = '';
-						if (xc.granted && xj.granted) {
-							this.openCamera();
-							return;
-						}
-
-						// 2. 显示权限说明弹窗
-						const confirm = await this.showPermissionDialog(
-							'相机相册权限申请',
-							'我们需要访问您的相机以及相册以完成更换头像功能'
-						);
-
-						if (!confirm) return;
-
-						// 3. 请求权限
-						const result1 = await permissionUtils.requestPermission('photo_library',
-							'我们需要访问您的相册以上传图片/视频');
-						const result2 = await permissionUtils.requestPermission('camera',
-							'我们需要访问您的相机以上传图片/视频');
-						if (result1 && result2) {
-							this.openCamera();
-						} else {
-							locationService.openAppSettings();
-							// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
-						}
-					}
-				} catch (err) {
-					console.log(err)
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="less">
-	.container {
-		.review {
-			background: #FAE7EC;
-			border-radius: 20rpx 20rpx 0rpx 0rpx;
-			margin: 20rpx;
-			padding: 26rpx 20rpx 30rpx 20rpx;
-
-			.review-title {
-				margin-bottom: 6rpx;
-
-				.review-title-text {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #E8101E;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.review-text {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #A43F45;
-				line-height: 33rpx;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-
-		.container-card {
-			border-radius: 20rpx;
-			margin: 20rpx;
-			padding: 20rpx 20rpx 30rpx 20rpx;
-			background: #fff;
-
-			.card-header {
-				margin-bottom: 20rpx;
-
-				.card-title {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #1D2129;
-					line-height: 48rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.card-title2 {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					margin-left: 10rpx;
-				}
-
-			}
-
-			.card-content {
-				.card-content-container {
-					position: relative;
-					display: flex;
-					overflow: hidden;
-					border-radius: 20rpx;
-				}
-
-				.preview-image {
-					width: 370rpx;
-					height: 278rpx;
-					border-radius: 20rpx;
-				}
-
-				.preview-video {
-					width: 520rpx;
-					height: 220rpx;
-					border-radius: 20rpx;
-				}
-
-				.content-default {
-					width: 370rpx;
-					height: 278rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					.content-default-img {
-						width: 42rpx;
-						height: 35rpx;
-						margin-bottom: 8rpx;
-					}
-
-					.content-default-text {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #666666;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-						display: block;
-					}
-				}
-
-				.content-default2 {
-					width: 520rpx;
-					height: 220rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					.content-default2-img {
-						width: 42rpx;
-						height: 35rpx;
-						margin-bottom: 8rpx;
-					}
-
-					.content-default2-text {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #666666;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-						display: block;
-					}
-				}
-
-				.content-photo-title {
-					background: rgba(51, 51, 51, 0.6);
-					padding: 8rpx 0 6rpx 0;
-					position: absolute;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					line-height: 33rpx;
-					text-align: center;
-					font-style: normal;
-				}
-
-				.content-photo-play {
-					width: 25rpx;
-					height: 25rpx;
-					position: absolute;
-					right: 10rpx;
-					top: 6rpx;
-
-					.content-photo-play-img {
-						width: 25rpx;
-						height: 25rpx;
-					}
-				}
-
-				.card-content-input {
-					width: 670rpx;
-					height: 76rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					box-sizing: border-box;
-					padding: 18rpx 20rpx;
-
-					.inputClass {
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #BFBFBF;
-						line-height: 40rpx;
-						text-align: left;
-						font-style: normal;
-					}
-				}
-			}
-
-		}
-
-		.haveReview {
-			transform: translateY(-30rpx);
-		}
-
-		.container-buttons {
-			position: fixed;
-			left: 0;
-			right: 0;
-			bottom: 0;
-			padding: 30rpx 0;
-			background: #FFFFFF;
-			gap: 60rpx;
-
-			.container-buttons-cancel {
-				width: 278rpx;
-				height: 98rpx;
-				border-radius: 49rpx;
-				border: 1rpx solid #E8101E;
-				font-weight: 400;
-				font-size: 32rpx;
-				color: #E8101E;
-				text-align: center;
-				font-style: normal;
-			}
-
-			.container-buttons-sure {
-				width: 278rpx;
-				height: 98rpx;
-				background: #E8101E;
-				border-radius: 49rpx;
-				font-weight: 400;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				text-align: center;
-				font-style: normal;
-			}
-
-			.container-buttons-sure2 {
-				width: 710rpx;
-				height: 98rpx;
-				background: #E8101E;
-				border-radius: 49rpx;
-				font-weight: 400;
-				font-size: 38rpx;
-				color: #FFFFFF;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-	}
-
-
-	/* APP适配 */
-	/* #ifdef APP-PLUS */
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 108rpx + 20rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
+<template>
+	<view class="container">
+		<custom-navbar :title="pageTexts[formData.type][formData.class_type].title1"
+			:leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff" titleColor="#000"
+			borderBottom="none"></custom-navbar>
+
+		<view class="review" v-if="imgItem.apply_state==1">
+			<view class="review-title">
+				<text class="review-title-text">审核中…</text>
+			</view>
+			<text class="review-text">预计24小时完成审核，通过后将自动生效</text>
+		</view>
+		<view class="review" v-if="imgItem.apply_state==2">
+			<view class="review-title">
+				<text class="review-title-text">审核成功<text style="color: #E8101E;">、线上展示中</text></text>
+			</view>
+		</view>
+		<view class="review" v-if="imgItem.apply_state==3">
+			<view class="review-title">
+				<text class="review-title-text">已驳回…</text>
+			</view>
+			<text class="review-text" v-if="imgItem.back_text">驳回原因：{{ imgItem.back_text }}</text>
+		</view>
+
+		<view :class="{haveReview:imgItem.apply_state}">
+			<view class="container-card">
+				<view class="card-header">
+					<text class="card-title">{{ pageTexts[formData.type][formData.class_type].title2 }}</text>
+					<text class="card-title2">({{ formData.type==1?"上传1张照片":"上传1个视频" }})</text>
+				</view>
+				<view class="card-content flex-row-center-center" v-if="formData.type==1">
+					<view class="card-content-container">
+						<image v-if="formData.url" :src="formData.url" mode="aspectFill" class="preview-image"></image>
+						<view class="content-default" @click="chooseImage" v-else>
+							<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
+							<text class="content-default-text">添加照片</text>
+						</view>
+						<view class="content-photo-title" v-if="formData.url" @click.stop="chooseImage">
+							替换图片
+						</view>
+					</view>
+
+				</view>
+				<view class="card-content flex-row-center-center" v-else>
+					<view class="card-content-container">
+						<image v-if="formData.url" @click="goVideo"
+							:src="formData.url+`?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`"
+							mode="aspectFill" class="preview-video"></image>
+						<view class="content-default2" @click="chooseImage" v-else>
+							<image class="content-default2-img" src="/static/images/icons/addPhoto.png"></image>
+							<text class="content-default2-text">添加视频</text>
+						</view>
+						<view class="content-photo-title" @click.stop="chooseImage" v-if="formData.url">
+							替换视频
+						</view>
+						<view class="content-photo-play" v-if="formData.url">
+							<image class="content-photo-play-img" mode="aspectFill" src="/static/images/icons/play.png">
+							</image>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+			<view class="container-card">
+				<view class="card-header">
+					<text class="card-title">{{ formData.type==1?"图片名称":"视频名称" }}</text>
+				</view>
+				<view class="card-content">
+					<view class="card-content-input">
+						<input maxlength="6" :placeholder="formData.type==1?`请输入图片名称`:`请输入视频名称`" v-model="formData.name"
+							placeholder-class="inputClass" :disabled="disabled" />
+					</view>
+
+				</view>
+			</view>
+		</view>
+
+
+
+		<!-- <view class="container-buttons flex-row-center-center" v-if="">
+			<view class="container-buttons-cancel flex-row-center-center">取消</view>
+			<view class="container-buttons-sure flex-row-center-center" @click="submitPhoto">提交</view>
+		</view> -->
+		<view class="container-buttons flex-row-center-center" v-if="imgItem.apply_state">
+			<view class="container-buttons-sure2 flex-row-center-center" v-if="disabled==true"
+				@click="disabled = false">编辑</view>
+			<view class="container-buttons-cancel flex-row-center-center" v-if="disabled==false"
+				@click="disabled = true">取消</view>
+			<view class="container-buttons-sure flex-row-center-center" @click="editPhoto" v-if="disabled==false">提交
+			</view>
+		</view>
+
+		<view class="container-buttons flex-row-center-center" v-else>
+			<view class="container-buttons-sure2 flex-row-center-center" @click="submitPhoto">提交</view>
+		</view>
+
+		<!-- 获取权限提示匡内容 -->
+		<view class="permission" :class="{ transform: isShowPer && nowQer === 'xc' }">
+			<view class="per-tit">美融融plus 对储存空间/照片权限申请说明</view>
+			<view class="per-cont">便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。</view>
+		</view>
+		<view class="permission" :class="{ transform: isShowPer && nowQer === 'xj' }">
+			<view class="per-tit">美融融plus 对相机拍摄权限申请说明</view>
+			<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;"
+			@fullscreenchange="screenChange"></video>
+		<uv-divider></uv-divider>
+	</view>
+</template>
+
+<script>
+	import request from "@/utils/request";
+	import uploadImage from '@/utils/albumUploadImage';
+	import permissionUtils from '@/utils/per';
+	import locationService from '@/utils/locationService';
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				videoContext: null,
+				videoPlay: false,
+				videoUrl: "",
+				disabled: false,
+				isShowPer: false,
+				nowQer: 'xc',
+				formData: {
+					name: "",
+					url: "",
+					class_type: 1, //1主(图片/视频) 2环境(图片/视频) 3作品(图片/视频) 4其它(图片/视频)
+					type: 1, //1图片 2视频
+				},
+				pageTexts: {
+					1: {
+						1: {
+							title1: '添加店铺图片',
+							title2: '店铺主图',
+						},
+						2: {
+							title1: '添加环境图片',
+							title2: '环境图片',
+						},
+						3: {
+							title1: '添加作品图片',
+							title2: '作品图片',
+						},
+						4: {
+							title1: '添加其它图片',
+							title2: '其它图片',
+						},
+					},
+					2: {
+						1: {
+							title1: '添加店铺视频',
+							title2: '店铺主视频',
+						},
+						2: {
+							title1: '添加环境视频',
+							title2: '环境视频',
+						},
+						3: {
+							title1: '添加作品视频',
+							title2: '作品视频',
+						},
+						4: {
+							title1: '添加其它视频',
+							title2: '其它视频',
+						},
+					},
+				},
+				userInfo: {},
+				isSubmitting: false,
+				imgItem: {}
+			}
+		},
+		async onLoad(options) {
+			if (options.id) {
+				this.formData.class_type = options.id;
+			}
+			if (options.type) {
+				this.formData.type = options.type;
+			}
+			if (options.item) {
+				try {
+					this.imgItem = JSON.parse(decodeURIComponent(options.item));
+					this.formData.name = this.imgItem.auth_name
+					this.formData.url = this.imgItem.auth_url
+					this.formData.id = this.imgItem.id
+					this.formData.auth_id = this.imgItem.auth_id
+					this.disabled = true
+				} catch (e) {
+
+				}
+			}
+			let type = 3;
+			let result = await request.post("/user/getuser", {
+				type,
+			});
+			this.userInfo = result.data;
+		},
+		methods: {
+			screenChange(e) {
+
+				let fullScreen = e.detail.fullScreen; // 值true为进入全屏，false为退出全屏
+				console.log(e, "全屏");
+				if (!fullScreen) {
+					//退出全屏
+					this.videoContext.pause()
+					plus.screen.lockOrientation('portrait-primary');
+					this.videoPlay = false; // 隐藏播放盒子
+				}
+			},
+			goVideo() {
+				// let urls = [this.formData.url]
+				// uni.navigateTo({
+				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
+				// });
+				this.videoPlay = true; // 显示播放盒子
+				this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 必传
+				this.videoUrl = this.formData.url;
+				this.videoContext.requestFullScreen({
+					direction: 90
+				});
+				this.videoContext.play();
+
+
+			},
+			async submitPhoto() {
+				// 1. 防连点核心逻辑：如果正在提交中，直接return阻止后续执行
+				if (this.isSubmitting) return;
+				console.log(this.formData, 'this.formData');
+				// 2. 表单必填项校验：校验图片和名称是否填写
+				if (!this.formData.url) {
+					if (this.formData.type == 1) {
+						if (this.formData.class_type == 1) {
+							uni.showToast({
+								title: '请先上传店铺主图',
+								icon: 'none',
+								duration: 2000
+							});
+						} else if (this.formData.class_type == 2) {
+							uni.showToast({
+								title: '请先上传环境图片',
+								icon: 'none',
+								duration: 2000
+							});
+						} 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({
+					// 	title: '请先上传图片/视频',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// });
+					return
+				}
+				if (!this.formData.name || this.formData.name.trim() === '') {
+					uni.showToast({
+						title: '请输入图片名称',
+						icon: 'none',
+						duration: 2000
+					});
+					return
+				}
+
+				try {
+					// 3. 开启提交锁 + 显示加载中提示
+					this.isSubmitting = true;
+					uni.showLoading({
+						title: '提交中...',
+						mask: true
+					});
+
+					// 4. 提交接口请求 【修复原代码传参BUG：formData → this.formData】
+					const res = await request.post("/sj/imgVideo/add", this.formData);
+
+					if (res.code == 200) {
+						// 5. 提交成功：提示 + 延时返回上一页（用户能看到提示）
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success'
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							}); // 返回上一级页面，核心需求
+						}, 1500);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+
+				} catch (err) {
+					// 6. 提交失败：异常提示
+					console.error('图片提交失败：', err);
+					uni.showToast({
+						title: '提交失败，请稍后重试',
+						icon: 'none',
+						duration: 2000
+					});
+				} finally {
+					// 7. 核心兜底：无论成功/失败/报错，都关闭加载 + 释放提交锁
+					uni.hideLoading();
+					this.isSubmitting = false;
+				}
+			},
+			async editPhoto() {
+				// 1. 防连点核心逻辑：如果正在提交中，直接return阻止后续执行
+				if (this.isSubmitting) return;
+
+				// 2. 表单必填项校验：校验图片和名称是否填写
+				if (!this.formData.url) {
+					uni.showToast({
+						title: '请先上传店铺主图',
+						icon: 'none',
+						duration: 2000
+					});
+					return
+				}
+				if (!this.formData.name || this.formData.name.trim() === '') {
+					uni.showToast({
+						title: '请输入图片名称',
+						icon: 'none',
+						duration: 2000
+					});
+					return
+				}
+
+				try {
+					// 3. 开启提交锁 + 显示加载中提示
+					this.isSubmitting = true;
+					uni.showLoading({
+						title: '提交中...',
+						mask: true
+					});
+
+					// 4. 提交接口请求 【修复原代码传参BUG：formData → this.formData】
+					const res = await request.post("/sj/imgVideo/edit", this.formData);
+
+					if (res.code == 200) {
+						// 5. 提交成功：提示 + 延时返回上一页（用户能看到提示）
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success'
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							}); // 返回上一级页面，核心需求
+						}, 1500);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				} catch (err) {
+					// 6. 提交失败：异常提示
+					console.error('图片提交失败：', err);
+					uni.showToast({
+						title: '提交失败，请稍后重试',
+						icon: 'none',
+						duration: 2000
+					});
+				} finally {
+					// 7. 核心兜底：无论成功/失败/报错，都关闭加载 + 释放提交锁
+					uni.hideLoading();
+					this.isSubmitting = false;
+				}
+			},
+			// 打开相机
+			async openCamera() {
+				this.isShowPer = false;
+				let res = null
+
+				try {
+					uni.showLoading({
+						title: '上传中'
+					})
+					console.log(this.formData, '=============================');
+					if (this.formData.type == 1) {
+						res = await uploadImage.handleUpload(this.userInfo.id, 3);
+					} else {
+						res = await uploadImage.handleUpload(this.userInfo.id, 3, ['album', 'camera'],
+							'video');
+					}
+					console.log('上传单张图片', res)
+					this.formData.url = res;
+				} catch (err) {
+					console.log(err)
+					uni.showToast({
+						title: '上传失败',
+						icon: 'none'
+					}); // 新增：上传失败提示
+				} finally {
+					uni.hideLoading(); // 移到这里，必执行
+				}
+			},
+			// 显示权限说明弹窗
+			showPermissionDialog(title, content) {
+				return new Promise((resolve) => {
+					uni.showModal({
+						title,
+						content,
+						confirmText: '去开启',
+						success(res) {
+							resolve(res.confirm);
+						}
+					});
+				});
+			},
+			// 选择图片
+			async chooseImage() {
+				if (this.disabled) return
+				try {
+					const systemInfo = uni.getSystemInfoSync()
+					if (systemInfo.platform === 'ios') {
+						this.openCamera();
+					} else {
+						let xcpermission = '';
+						let xjpermission = '';
+						if (systemInfo.platform === 'ios') {
+							xcpermission = 'photo_library',
+								xjpermission = 'camera'
+						} else {
+							xcpermission =
+								`android.permission.READ_EXTERNAL_STORAGE,android.permission.WRITE_EXTERNAL_STORAGE`
+							xjpermission = 'android.permission.CAMERA'
+						}
+						const xjfirstRequest = !plus.storage.getItem(`perm_${xjpermission}`)
+						const xcfirstRequest = !plus.storage.getItem(`perm_${xcpermission}`)
+						if (xcfirstRequest || xjfirstRequest) {
+							this.isShowPer = true;
+						}
+
+						// 1. 检查权限
+						// const { granted } = await permissionUtils.checkPermission('photo_library', '需要相册权限用于上传照片');
+						this.nowQer = 'xc';
+						const xc = await permissionUtils.checkPermission('photo_library',
+							'需要相册权限用于上传照片');
+						this.nowQer = 'xj';
+						const xj = await permissionUtils.checkPermission('camera', '需要相机权限用于拍摄照片');
+						this.isShowPer = false;
+						this.nowQer = '';
+						if (xc.granted && xj.granted) {
+							this.openCamera();
+							return;
+						}
+
+						// 2. 显示权限说明弹窗
+						const confirm = await this.showPermissionDialog(
+							'相机相册权限申请',
+							'我们需要访问您的相机以及相册以完成更换头像功能'
+						);
+
+						if (!confirm) return;
+
+						// 3. 请求权限
+						const result1 = await permissionUtils.requestPermission('photo_library',
+							'我们需要访问您的相册以上传图片/视频');
+						const result2 = await permissionUtils.requestPermission('camera',
+							'我们需要访问您的相机以上传图片/视频');
+						if (result1 && result2) {
+							this.openCamera();
+						} else {
+							locationService.openAppSettings();
+							// uni.showToast({ title: '相机权限被拒绝', icon: 'none' });
+						}
+					}
+				} catch (err) {
+					console.log(err)
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	.container {
+		.review {
+			background: #FAE7EC;
+			border-radius: 20rpx 20rpx 0rpx 0rpx;
+			margin: 20rpx;
+			padding: 26rpx 20rpx 30rpx 20rpx;
+
+			.review-title {
+				margin-bottom: 6rpx;
+
+				.review-title-text {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #E8101E;
+					line-height: 40rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.review-text {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #A43F45;
+				line-height: 33rpx;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+
+		.container-card {
+			border-radius: 20rpx;
+			margin: 20rpx;
+			padding: 20rpx 20rpx 30rpx 20rpx;
+			background: #fff;
+
+			.card-header {
+				margin-bottom: 20rpx;
+
+				.card-title {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #1D2129;
+					line-height: 48rpx;
+					text-align: left;
+					font-style: normal;
+				}
+
+				.card-title2 {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+					line-height: 33rpx;
+					text-align: left;
+					font-style: normal;
+					margin-left: 10rpx;
+				}
+
+			}
+
+			.card-content {
+				.card-content-container {
+					position: relative;
+					display: flex;
+					overflow: hidden;
+					border-radius: 20rpx;
+				}
+
+				.preview-image {
+					width: 370rpx;
+					height: 278rpx;
+					border-radius: 20rpx;
+				}
+
+				.preview-video {
+					width: 520rpx;
+					height: 220rpx;
+					border-radius: 20rpx;
+				}
+
+				.content-default {
+					width: 370rpx;
+					height: 278rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					.content-default-img {
+						width: 42rpx;
+						height: 35rpx;
+						margin-bottom: 8rpx;
+					}
+
+					.content-default-text {
+						font-weight: 400;
+						font-size: 22rpx;
+						color: #666666;
+						line-height: 30rpx;
+						text-align: left;
+						font-style: normal;
+						display: block;
+					}
+				}
+
+				.content-default2 {
+					width: 520rpx;
+					height: 220rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					.content-default2-img {
+						width: 42rpx;
+						height: 35rpx;
+						margin-bottom: 8rpx;
+					}
+
+					.content-default2-text {
+						font-weight: 400;
+						font-size: 22rpx;
+						color: #666666;
+						line-height: 30rpx;
+						text-align: left;
+						font-style: normal;
+						display: block;
+					}
+				}
+
+				.content-photo-title {
+					background: rgba(51, 51, 51, 0.6);
+					padding: 8rpx 0 6rpx 0;
+					position: absolute;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FFFFFF;
+					line-height: 33rpx;
+					text-align: center;
+					font-style: normal;
+				}
+
+				.content-photo-play {
+					width: 25rpx;
+					height: 25rpx;
+					position: absolute;
+					right: 10rpx;
+					top: 6rpx;
+
+					.content-photo-play-img {
+						width: 25rpx;
+						height: 25rpx;
+					}
+				}
+
+				.card-content-input {
+					width: 670rpx;
+					height: 76rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					box-sizing: border-box;
+					padding: 18rpx 20rpx;
+
+					.inputClass {
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #BFBFBF;
+						line-height: 40rpx;
+						text-align: left;
+						font-style: normal;
+					}
+				}
+			}
+
+		}
+
+		.haveReview {
+			transform: translateY(-30rpx);
+		}
+
+		.container-buttons {
+			position: fixed;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			padding: 30rpx 0;
+			background: #FFFFFF;
+			gap: 60rpx;
+
+			.container-buttons-cancel {
+				width: 278rpx;
+				height: 98rpx;
+				border-radius: 49rpx;
+				border: 1rpx solid #E8101E;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #E8101E;
+				text-align: center;
+				font-style: normal;
+			}
+
+			.container-buttons-sure {
+				width: 278rpx;
+				height: 98rpx;
+				background: #E8101E;
+				border-radius: 49rpx;
+				font-weight: 400;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				text-align: center;
+				font-style: normal;
+			}
+
+			.container-buttons-sure2 {
+				width: 710rpx;
+				height: 98rpx;
+				background: #E8101E;
+				border-radius: 49rpx;
+				font-weight: 400;
+				font-size: 38rpx;
+				color: #FFFFFF;
+				text-align: left;
+				font-style: normal;
+			}
+		}
+	}
+
+
+	/* APP适配 */
+	/* #ifdef APP-PLUS */
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 108rpx + 20rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index b8ca90d..efaa0a2 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -1,434 +1,450 @@
-<template>
-	<view class="container">
-		<custom-navbar title="店铺视频" :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">
-				<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>
-			</view>
-		</view>
-		<view class="container-card" v-for="(item,index) in cardList[type]" :key="index">
-			<view class="card-header flex-row-center-between">
-				<text class="card-title">{{ item.title }}</text>
-				<view class="card-header-right" @click="goList(item.id)">
-					<text class="card-header-right-text">查看全部</text>
-					<image class="card-header-right-img" src="/static/images/icons/right_gray14.png"></image>
-				</view>
-			</view>
-			<view class="card-content flex-row-center" v-if="type==1">
-				<view class="content-default" @click="goAdd(item.id)"
-					v-if="!(item.id == 1 && imgVideoList[item.id] && imgVideoList[item.id].length)">
-					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
-					<text class="content-default-text">添加照片</text>
-				</view>
-				<view class="content-photo" v-for="(item2,index2) in imgVideoList[item.id]" :key="index2"
-					v-if="imgVideoList[item.id]" @click="goAdd(item.id,item2)">
-					<image class="content-photo-img" mode="aspectFill" :src="getItem(item2).url"></image>
-					<view class="content-photo-title">
-						{{ getItem(item2).name }}
-					</view>
-					<view class="content-photo-mask" v-if="item2.apply_state==1">
-						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/time.png"></image>
-						<text class="photo-mask-text">审核中…</text>
-					</view>
-					<view class="content-photo-mask" v-if="item2.apply_state==3">
-						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/close2.png"></image>
-						<view class="photo-mask-text">已驳回</view>
-					</view>
-				</view>
-			</view>
-			<view class="card-content flex-row-center" v-else>
-				<view class="content-default content-default2" @click="goAdd(item.id)"
-					v-if="!(item.id == 1 && imgVideoList[item.id] && imgVideoList[item.id].length)">
-					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
-					<text class="content-default-text">添加视频</text>
-				</view>
-				<view class="content-photo content-video" v-for="(item2,index2) in imgVideoList[item.id]" :key="index2"
-					v-if="imgVideoList[item.id]" @click="goAdd(item.id,item2)">
-					<image class="content-photo-video" mode="aspectFill" :src="getItem(item2).url"></image>
-					<view class="content-photo-title">
-						{{ getItem(item2).name }}
-					</view>
-					<view class="content-photo-play">
-						<image class="content-photo-play-img" mode="aspectFill" src="/static/images/icons/play.png">
-						</image>
-					</view>
-
-					<!-- <video class="content-photo-video" loop="true" :controls="false" :autoplay="true" :muted="true"
-						:src="item2.url || item2.auth_url">
-					</video> -->
-					<view class="content-photo-mask" v-if="item2.apply_state==1">
-						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/time.png"></image>
-						<view class="photo-mask-text">审核中…</view>
-					</view>
-					<view class="content-photo-mask" v-if="item2.apply_state==3">
-						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/close2.png"></image>
-						<view class="photo-mask-text">已驳回</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import request from "@/utils/request";
-	export default {
-		data() {
-			return {
-				cardList: {
-					1: [{
-							title: "店铺主图",
-							id: 1
-						},
-						{
-							title: "环境图片",
-							id: 2
-						},
-						{
-							title: "作品展示",
-							id: 3
-						},
-						{
-							title: "其他",
-							id: 4
-						}
-					],
-					2: [{
-							title: "店铺主视频",
-							id: 1
-						},
-						{
-							title: "其他",
-							id: 4
-						}
-					],
-				},
-				imgVideoList: {
-
-				},
-				type: 2, //1图片 2视频
-			}
-		},
-		async onShow() {
-			await this.getList()
-		},
-		async onLoad(options) {
-			if (options.type) {
-				this.type = options.type
-			}
-		},
-		methods: {
-			getItem(item) {
-				let obj = {
-					name: "",
-					url: ""
-				}
-				if (item.apply_state == 1) {
-					obj.url = item.auth_url
-					obj.name = item.auth_name
-				} else {
-					obj.url = item.url || item.auth_url
-					obj.name = item.name || item.auth_name
-				}
-				if (item.type == 2) {
-					obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
-				}
-				return obj
-			},
-			goList(id) {
-				console.log(id,'ididididididi');
+<template>
+	<view class="container">
+		<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" @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: 4rpx;margin-left: 6rpx;"></image>
+			</view>
+		</view>
+		<view class="container-card" v-for="(item,index) in cardList[type]" :key="index">
+			<view class="card-header flex-row-center-between">
+				<text class="card-title">{{ item.title }}</text>
+				<view class="card-header-right" @click="goList(item.id)">
+					<text class="card-header-right-text">查看全部</text>
+					<image class="card-header-right-img" src="/static/images/icons/right_gray14.png"></image>
+				</view>
+			</view>
+			<view class="card-content flex-row-center" v-if="type==1">
+				<view class="content-default" @click="goAdd(item.id)"
+					v-if="!(item.id == 1 && imgVideoList[item.id] && imgVideoList[item.id].length)">
+					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
+					<text class="content-default-text">添加照片</text>
+				</view>
+				<view class="content-photo" v-for="(item2,index2) in imgVideoList[item.id]" :key="index2"
+					v-if="imgVideoList[item.id]" @click="goAdd(item.id,item2)">
+					<image class="content-photo-img" mode="aspectFill" :src="getItem(item2).url"></image>
+					<view class="content-photo-title">
+						{{ getItem(item2).name }}
+					</view>
+					<view class="content-photo-mask" v-if="item2.apply_state==1">
+						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/time.png"></image>
+						<text class="photo-mask-text">审核中…</text>
+					</view>
+					<view class="content-photo-mask" v-if="item2.apply_state==3">
+						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/close2.png"></image>
+						<view class="photo-mask-text">已驳回</view>
+					</view>
+				</view>
+			</view>
+			<view class="card-content flex-row-center" v-else>
+				<view class="content-default content-default2" @click="goAdd(item.id)"
+					v-if="!(item.id == 1 && imgVideoList[item.id] && imgVideoList[item.id].length)">
+					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
+					<text class="content-default-text">添加视频</text>
+				</view>
+				<view class="content-photo content-video" v-for="(item2,index2) in imgVideoList[item.id]" :key="index2"
+					v-if="imgVideoList[item.id]" @click="goAdd(item.id,item2)">
+					<image class="content-photo-video" mode="aspectFill" :src="getItem(item2).url"></image>
+					<view class="content-photo-title">
+						{{ getItem(item2).name }}
+					</view>
+					<view class="content-photo-play">
+						<image class="content-photo-play-img" mode="aspectFill" src="/static/images/icons/play.png">
+						</image>
+					</view>
+
+					<!-- <video class="content-photo-video" loop="true" :controls="false" :autoplay="true" :muted="true"
+						:src="item2.url || item2.auth_url">
+					</video> -->
+					<view class="content-photo-mask" v-if="item2.apply_state==1">
+						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/time.png"></image>
+						<view class="photo-mask-text">审核中…</view>
+					</view>
+					<view class="content-photo-mask" v-if="item2.apply_state==3">
+						<image class="photo-mask-img" mode="aspectFill" src="/static/images/icons/close2.png"></image>
+						<view class="photo-mask-text">已驳回</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import request from "@/utils/request";
+	export default {
+		data() {
+			return {
+				cardList: {
+					1: [{
+							title: "店铺主图",
+							id: 1
+						},
+						{
+							title: "环境图片",
+							id: 2
+						},
+						{
+							title: "作品展示",
+							id: 3
+						},
+						{
+							title: "其他",
+							id: 4
+						}
+					],
+					2: [{
+							title: "店铺主视频",
+							id: 1
+						},
+						{
+							title: "其他",
+							id: 4
+						}
+					],
+				},
+				imgVideoList: {
+
+				},
+				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/photoAlbum/videoList?id=${id}&type=${this.type}`
-				});
-				// let urls = []
-				// this.imgVideoList[id].forEach(item=>{
-				// 	urls.push(item.auth_url)
-				// })
-				// console.log(111111,urls)
-				// uni.navigateTo({
-				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
-				// });
-			},
-			goAdd(id, item) {
-				if (this.type == 1) {
-					if ( this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if ( this.imgVideoList[id] && this.imgVideoList[id].length  >= 10) {
-						uni.showToast({
-							title: '最多上传10张视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				}
-				// 1. 原有逻辑：分类id为空，拦截提示
-				if (!id) {
-					uni.showToast({
-						title: '参数异常，无法上传',
-						icon: 'none',
-						duration: 2000
-					});
-					return;
-				}
-
-				// // 2. 原有逻辑：有图片对象且有auth_url → 审核中提示，禁止跳转
-				// if (item && item.auth_url) {
-				// 	uni.showToast({
-				// 		title: '图片审核中',
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	});
-				// 	return
-				// }
-
-				// 3. ✅ 核心新增：把【id + item对象】一起拼接到跳转地址上
-				// 注意：uni-app/小程序 路由传对象，必须用 JSON.stringify 转成字符串，否则传参失败！
-				let url = `/pages/shop/photoAlbum/addPhoto?id=${id}&type=${this.type}`;
-				// 如果item有值，就拼接序列化后的item对象；无值则只传id
-				if (item) {
-					url += `&item=${encodeURIComponent(JSON.stringify(item))}`;
-				}
-
-				// 4. 跳转页面
-				uni.navigateTo({
-					url: url
-				});
-			},
-			async getList() {
-				try {
-					const res = await request.post("/sj/imgVideo/list", {
-						type: this.type
-					});
-					// 核心修复：保留imgVideoList对象结构，可选链避免属性不存在，默认值确保始终为对象
-					this.imgVideoList = res.data?.list?.[this.type] || {};
-					// 若接口返回格式为res.data.list[this.type]是对应类型的id数据，需调整为：
-					// this.imgVideoList = res.data?.list?.[this.type] || {};
-				} catch (err) {
-					// 网络错误等异常处理，确保imgVideoList始终为对象
-					console.error("获取图片/视频列表失败：", err);
-					this.imgVideoList = {};
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-	.container {
-		.container-titles {
-			margin: 30rpx 30rpx 20rpx 23rpx;
-
-			.titles-left {
-				display: flex;
-				align-items: center;
-
-				.titles-bar {
-					width: 6rpx;
-					height: 30rpx;
-					background-color: #E8101E;
-					margin-right: 10rpx;
-					border-radius: 5rpx;
-				}
-
-				.titles-title {
-					font-family: PingFangSC, PingFang SC;
-					font-weight: 500;
-					font-size: 32rpx;
-					color: #1D2129;
-					line-height: 48rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-			.titles-right {
-				display: flex;
-				.titles-text {
-					font-family: PingFangSC, PingFang SC;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #986E4A;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-		}
-
-		.container-card {
-			border-radius: 20rpx;
-			margin: 20rpx;
-			padding: 20rpx 20rpx 30rpx 20rpx;
-			background: #fff;
-
-			.card-header {
-				margin-bottom: 20rpx;
-
-				.card-title {
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #1D2129;
-					line-height: 48rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-				.card-header-right {
-					.card-header-right-text {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #999999;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-					}
-
-					.card-header-right-img {
-						width: 8rpx;
-						height: 16rpx;
-						margin-left: 7rpx;
-					}
-				}
-			}
-
-			.card-content {
-				gap: 14rpx;
-				flex-wrap: wrap;
-
-				.content-default {
-					width: 214rpx;
-					height: 214rpx;
-					background: #F5F5F5;
-					border-radius: 20rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-
-					.content-default-img {
-						width: 42rpx;
-						height: 35rpx;
-						margin-bottom: 8rpx;
-					}
-
-					.content-default-text {
-						font-weight: 400;
-						font-size: 22rpx;
-						color: #666666;
-						line-height: 30rpx;
-						text-align: left;
-						font-style: normal;
-						display: block;
-					}
-				}
-
-				.content-default2 {
-					width: 328rpx;
-					height: 186rpx;
-					background: #F5F5F5;
-					border-radius: 17rpx;
-				}
-
-				.content-photo {
-					box-sizing: border-box;
-					width: 214rpx;
-					height: 214rpx;
-					border-radius: 20rpx;
-					position: relative;
-					overflow: hidden;
-
-					.content-photo-img {
-						width: 214rpx;
-						height: 214rpx;
-						border-radius: 20rpx;
-					}
-
-					.content-photo-video {
-						width: 328rpx;
-						height: 186rpx;
-						border-radius: 20rpx;
-					}
-
-					.content-photo-title {
-						background: rgba(51, 51, 51, 0.6);
-						padding: 6rpx 0 4rpx 0;
-						position: absolute;
-						left: 0;
-						right: 0;
-						bottom: 0;
-						font-weight: 400;
-						font-size: 15rpx;
-						color: #CACACA;
-						line-height: 21rpx;
-						text-align: center;
-						font-style: normal;
-					}
-
-					.content-photo-play {
-						width: 25rpx;
-						height: 25rpx;
-						position: absolute;
-						right: 10rpx;
-						top: 6rpx;
-
-						.content-photo-play-img {
-							width: 25rpx;
-							height: 25rpx;
-						}
-					}
-
-					.content-photo-mask {
-						position: absolute;
-						left: 0;
-						right: 0;
-						top: 0;
-						bottom: 0;
-						background: rgba(0, 0, 0, 0.3);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						flex-direction: column;
-						border-radius: 20rpx;
-
-						.photo-mask-img {
-							width: 36rpx;
-							height: 36rpx;
-							margin-bottom: 8rpx;
-						}
-
-						.photo-mask-text {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #FFFFFF;
-							line-height: 33rpx;
-							text-align: left;
-							font-style: normal;
-						}
-					}
-				}
-
-				.content-video {
-					width: 328rpx;
-					height: 186rpx;
-				}
-			}
-
-		}
-	}
+					url:'/pages/shop/skill-detail'
+				})
+			},
+			getItem(item) {
+				let obj = {
+					name: "",
+					url: ""
+				}
+				if (item.apply_state == 1) {
+					obj.url = item.auth_url
+					obj.name = item.auth_name
+				} else {
+					obj.url = item.url || item.auth_url
+					obj.name = item.name || item.auth_name
+				}
+				if (item.type == 2) {
+					obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`
+				}
+				return obj
+			},
+			goList(id) {
+				console.log(id, 'ididididididi');
+				uni.navigateTo({
+					url: `/pages/shop/photoAlbum/videoList?id=${id}&type=${this.type}`
+				});
+				// let urls = []
+				// this.imgVideoList[id].forEach(item=>{
+				// 	urls.push(item.auth_url)
+				// })
+				// console.log(111111,urls)
+				// uni.navigateTo({
+				// 	url: `/pages/album/list?urls=${encodeURIComponent(JSON.stringify(urls))}`
+				// });
+			},
+			goAdd(id, item) {
+				if (this.type == 1) {
+					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
+						uni.showToast({
+							title: '最多上传20张图片',
+							icon: 'none',
+							duration: 2000
+						});
+						return
+					}
+				} else if (this.type == 2) {
+					if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
+						uni.showToast({
+							title: '最多上个10张视频',
+							icon: 'none',
+							duration: 2000
+						});
+						return
+					}
+				}
+				// 1. 原有逻辑：分类id为空，拦截提示
+				if (!id) {
+					uni.showToast({
+						title: '参数异常，无法上传',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+
+				// // 2. 原有逻辑：有图片对象且有auth_url → 审核中提示，禁止跳转
+				// if (item && item.auth_url) {
+				// 	uni.showToast({
+				// 		title: '图片审核中',
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	});
+				// 	return
+				// }
+
+				// 3. ✅ 核心新增：把【id + item对象】一起拼接到跳转地址上
+				// 注意：uni-app/小程序 路由传对象，必须用 JSON.stringify 转成字符串，否则传参失败！
+				let url = `/pages/shop/photoAlbum/addPhoto?id=${id}&type=${this.type}`;
+				// 如果item有值，就拼接序列化后的item对象；无值则只传id
+				if (item) {
+					url += `&item=${encodeURIComponent(JSON.stringify(item))}`;
+				}
+
+				// 4. 跳转页面
+				uni.navigateTo({
+					url: url
+				});
+			},
+			async getList() {
+				try {
+					const res = await request.post("/sj/imgVideo/list", {
+						type: this.type
+					});
+					// 核心修复：保留imgVideoList对象结构，可选链避免属性不存在，默认值确保始终为对象
+					this.imgVideoList = res.data?.list?.[this.type] || {};
+					// 若接口返回格式为res.data.list[this.type]是对应类型的id数据，需调整为：
+					// this.imgVideoList = res.data?.list?.[this.type] || {};
+				} catch (err) {
+					// 网络错误等异常处理，确保imgVideoList始终为对象
+					console.error("获取图片/视频列表失败：", err);
+					this.imgVideoList = {};
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.container {
+		.container-titles {
+			margin: 30rpx 30rpx 20rpx 23rpx;
+
+			.titles-left {
+				display: flex;
+				align-items: center;
+
+				.titles-bar {
+					width: 6rpx;
+					height: 30rpx;
+					background-color: #E8101E;
+					margin-right: 10rpx;
+					border-radius: 5rpx;
+				}
+
+				.titles-title {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #1D2129;
+					line-height: 48rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+			.titles-right {
+				display: flex;
+
+				.titles-text {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #986E4A;
+					line-height: 33rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+		}
+
+		.container-card {
+			border-radius: 20rpx;
+			margin: 20rpx;
+			padding: 20rpx 20rpx 30rpx 20rpx;
+			background: #fff;
+
+			.card-header {
+				margin-bottom: 20rpx;
+
+				.card-title {
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #1D2129;
+					line-height: 48rpx;
+					text-align: left;
+					font-style: normal;
+				}
+
+				.card-header-right {
+					.card-header-right-text {
+						font-weight: 400;
+						font-size: 22rpx;
+						color: #999999;
+						line-height: 30rpx;
+						text-align: left;
+						font-style: normal;
+					}
+
+					.card-header-right-img {
+						width: 8rpx;
+						height: 16rpx;
+						margin-left: 7rpx;
+					}
+				}
+			}
+
+			.card-content {
+				gap: 14rpx;
+				flex-wrap: wrap;
+
+				.content-default {
+					width: 214rpx;
+					height: 214rpx;
+					background: #F5F5F5;
+					border-radius: 20rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+
+					.content-default-img {
+						width: 42rpx;
+						height: 35rpx;
+						margin-bottom: 8rpx;
+					}
+
+					.content-default-text {
+						font-weight: 400;
+						font-size: 22rpx;
+						color: #666666;
+						line-height: 30rpx;
+						text-align: left;
+						font-style: normal;
+						display: block;
+					}
+				}
+
+				.content-default2 {
+					width: 328rpx;
+					height: 186rpx;
+					background: #F5F5F5;
+					border-radius: 17rpx;
+				}
+
+				.content-photo {
+					box-sizing: border-box;
+					width: 214rpx;
+					height: 214rpx;
+					border-radius: 20rpx;
+					position: relative;
+					overflow: hidden;
+
+					.content-photo-img {
+						width: 214rpx;
+						height: 214rpx;
+						border-radius: 20rpx;
+					}
+
+					.content-photo-video {
+						width: 328rpx;
+						height: 186rpx;
+						border-radius: 20rpx;
+					}
+
+					.content-photo-title {
+						background: rgba(51, 51, 51, 0.6);
+						padding: 6rpx 0 4rpx 0;
+						position: absolute;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						font-weight: 400;
+						font-size: 15rpx;
+						color: #CACACA;
+						line-height: 21rpx;
+						text-align: center;
+						font-style: normal;
+					}
+
+					.content-photo-play {
+						width: 25rpx;
+						height: 25rpx;
+						position: absolute;
+						right: 10rpx;
+						top: 6rpx;
+
+						.content-photo-play-img {
+							width: 25rpx;
+							height: 25rpx;
+						}
+					}
+
+					.content-photo-mask {
+						position: absolute;
+						left: 0;
+						right: 0;
+						top: 0;
+						bottom: 0;
+						background: rgba(0, 0, 0, 0.3);
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						flex-direction: column;
+						border-radius: 20rpx;
+
+						.photo-mask-img {
+							width: 36rpx;
+							height: 36rpx;
+							margin-bottom: 8rpx;
+						}
+
+						.photo-mask-text {
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #FFFFFF;
+							line-height: 33rpx;
+							text-align: left;
+							font-style: normal;
+						}
+					}
+				}
+
+				.content-video {
+					width: 328rpx;
+					height: 186rpx;
+				}
+			}
+
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index dfc18d2..9d2699c 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/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
 						});
diff --git a/pages/shop/skill-detail.vue b/pages/shop/skill-detail.vue
new file mode 100644
index 0000000..e62fbbf
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/pages/shop/staff/addStaff.vue b/pages/shop/staff/addStaff.vue
index fc3dd39..a313eb1 100644
--- a/pages/shop/staff/addStaff.vue
+++ b/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;
diff --git a/pages/shop/staff/serviceList.vue b/pages/shop/staff/serviceList.vue
index 2a4a067..fcc19c9 100644
--- a/pages/shop/staff/serviceList.vue
+++ b/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');
 				}
 				
 			},