From 0dc09928583b0d693456e82720212b5887605a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Thu, 9 Apr 2026 17:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA=E8=AF=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=8F=90=E7=A4=BA=E6=A1=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/photoAlbum/addPhoto.vue    | 25 +++++++++++++++++++++++--
 pages/shop/photoAlbum/photoManage.vue |  2 +-
 pages/shop/photoAlbum/videoList.vue   | 14 ++++++++++++--
 utils/albumUploadImage.js             |  2 +-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index 5e0c9f8..07c5c77 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -232,11 +232,32 @@
 			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: '请先上传店铺主图',
+						title: '请先上传图片/视频',
 						icon: 'none',
 						duration: 2000
 					});
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index cb871a2..b8ca90d 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<custom-navbar title="店铺图片" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff"
+		<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">
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index eca34b6..dfc18d2 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -14,7 +14,7 @@
 		<view class="container-card">
 
 			<view class="card-content flex-row-center" v-if="type==1">
-				<view class="card-content-page" v-if="class_type!=1">{{ imgVideoList.length }}/20张</view>
+				<view class="card-content-page" v-if="class_type!=1 ">{{ imgVideoList.length }}/20张</view>
 				<view class="content-default" @click="goAdd(class_type)"
 					v-if="!(class_type == 1 && imgVideoList && imgVideoList.length)">
 					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
@@ -37,7 +37,7 @@
 				</view>
 			</view>
 			<view class="card-content flex-row-center" v-else>
-				<view class="card-content-page">{{ imgVideoList.length }}/10张</view>
+				<view class="card-content-page" v-if="class_type!=1">{{ imgVideoList.length }}/10张</view>
 				<view class="content-default content-default2" @click="goAdd(class_type)"
 					v-if="!(class_type == 1 && imgVideoList && imgVideoList.length)">
 					<image class="content-default-img" src="/static/images/icons/addPhoto.png"></image>
@@ -98,6 +98,16 @@
 			}
 			if (options.id) {
 				this.class_type = options.id
+
+			}
+			if (this.type == 2) {
+				if (this.class_type == 1) {
+					this.pagestitle = "店铺主视频"
+				} else if (this.class_type == 4) {
+					this.pagestitle = "其它视频"
+				}
+				console.log('123123123');
+			} else if (this.type == 1) {
 				if (this.class_type == 2) {
 					this.pagestitle = "环境图片"
 				} else if (this.class_type == 3) {
diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index 1f7642c..2f17212 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -176,7 +176,7 @@ const uploadFile = async (file, userId, type, uploadType) => {
 		imageType = file.path.split('.')
 	} else if (uploadType == 'video') {
 		// #ifdef H5
-		imageType = file.name.split('.')
+		imageType = file.url.split('.')
 		// #endif
 		// #ifdef APP-PLUS || MP-WEIXIN
 		imageType = file.tempFilePath.split('.')