diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index d43c75c..38b0b25 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,12 +2,13 @@
     "version" : "1.0",
     "configurations" : [
         {
+            "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/manifest.json b/manifest.json
index 353ace4..5e15f3a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "美融融商家",
     "appid" : "__UNI__BBE6285",
     "description" : "同城便捷到家美业“技术外卖”服务、同城预约到店服务平台美融融为同城爱美人群提供更优质的更全面的服务。",
-    "versionName" : "1.0.05",
+    "versionName" : "1.0.06",
     "versionCode" : 1005,
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -197,6 +197,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
+        "appid" : "wx17eef65c270b4869",
         "appid" : "wx17eef65c270b4869",
         "privacy" : {
             "requiredPrivateInfos" : [ "getBackgroundFetchData" ]
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index 3d7e403..3e7c7d9 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -391,9 +391,9 @@
 			}
 			// 判断是否显示上门提醒弹窗
 			const notShow = uni.getStorageSync('addServiceReminderNotShow');
-			if (!notShow) {
-				this.showReminderPopup = true;
-			}
+			// if (!notShow) {
+			// 	this.showReminderPopup = true;
+			// }
 			this.getUserInfo();
 		},
 		computed: {
@@ -868,6 +868,16 @@
 				} else {
 					url = "/user/serverupdate";
 				}
+				console.log(this.formData, '-0-0-0-0-0-');
+				delete this.formData.shop_business_time
+				delete this.formData.shop_head_photo
+				delete this.formData.shop_address
+				delete this.formData.shop_dependency
+				delete this.formData.shop_class
+				delete this.formData.team_buy
+				
+				
+
 				request.post(url, this.formData).then((res) => {
 					if (res.state == 1) {
 						const pages = getCurrentPages();
diff --git a/pages/shop/pay.vue b/pages/shop/pay.vue
index 5d91056..9d76ba8 100644
--- a/pages/shop/pay.vue
+++ b/pages/shop/pay.vue
@@ -1,601 +1,603 @@
-<template>
-	<view class="pay-page">
-		<!-- 自定义导航栏 -->
-		<custom-navbar title="支付订单" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
-
-		<!-- 支付金额 -->
-		<view class="amount-section">
-			<image src="/static/images/shop/pay_icon.png" mode="aspectFit" class="pay_icon"></image>
-			<view class="amount">
-				<text class="symbol">¥</text>
-				<text class="value">{{ orderInfo.pay_money }}</text>
-			</view>
-			<view class="countdown" v-if="countdown">支付剩余时间:
-				<uv-count-down :time="countdown * 1000" format="mm:ss" @finish="finish"></uv-count-down>
-			</view>
-		</view>
-
-		<!-- 支付方式 -->
-		<view class="method-section">
-			<view class="section-title">选择支付方式</view>
-			<view class="method-list">
-				<view class="method-item" v-for="(item, index) in methodList" :key="index" @click="selectMethod(item)">
-					<view class="method-info">
-						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
-						<text class="method-name">{{ item.name }}</text>
-					</view>
-					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
-						:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
-				</view>
-			</view>
-		</view>
-		<!-- 底部支付按钮 -->
-		<view class="footer">
-			<!-- <view class="total-amount">
-              <view class="amount-money">
-                <text class="symbol">¥</text>
-                <text class="amount">{{ orderInfo.pay_money }}</text>
-              </view>
-              <text class="amount-lable">应付金额</text>
-            </view> -->
-			<view class="pay-btn" @click="confirmPay">立即支付</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
-	import {
-		debounce
-	} from "../../utils/debounce";
-	import request from "@/utils/request";
-
-	export default {
-		components: {
-			customNavbar,
-		},
-		data() {
-			return {
-				countdown: 0,
-				identity: 0, //身份，0为商家1为手艺人
-				interfaceList: [{
-						weChatPayFor: "/sj/workHourOrder/weChatPayFor",
-						weChatSearch: "/sj/workHourOrder/weChatSearch",
-						aliPayFor: "/sj/workHourOrder/aliPayFor",
-						aliSearch: "/sj/workHourOrder/aliSearch",
-						path: "/pages/shop/manHourDetail",
-					},
-					{
-						weChatPayFor: "/syr/workSeatOrder/weChatPayFor",
-						weChatSearch: "/syr/workSeatOrder/weChatSearch",
-						aliPayFor: "/syr/workSeatOrder/aliPayFor",
-						aliSearch: "/syr/workSeatOrder/aliSearch",
-						path: "/pages/shop/manHourDetail",
-					},
-				],
-				orderInfo: {
-					id: "",
-					pay_money: "",
-					number: "",
-				},
-				serverTitle: "",
-				// countdown: '00:29:58',
-				selectedPayment: "wechat",
-				balance: "98489.98",
-				timer: null,
-				isPay: false,
-				methodList: [{
-						id: 1,
-						name: "微信",
-						payment: "wechat",
-						icon: "/static/images/shop//wechat.png",
-						selected: true,
-					},
-					{
-						id: 2,
-						name: "支付宝",
-						payment: "alipay",
-						icon: "/static/images/shop/alipay.png",
-						selected: false,
-					},
-					//  {
-					//    id: 3,
-					//    name: '账户余额',
-					// payment: 'balance',
-					//    icon: '/static/images/bankcard.png',
-					//    selected: false
-					//  }
-				],
-			};
-		},
-		computed: {
-			identityinfo() {
-				return this.interfaceList[this.identity];
-			},
-		},
-		onLoad(options) {
-			// this.getUserInfo();
-			if (options.id) {
-				this.orderInfo.id = options.id;
-				this.orderInfo.number = options.number;
-				this.orderInfo.pay_money = options.money;
-				this.serverTitle = options.title;
-				this.identity = options.identity;
-				// this.startCountdown()
-				// this.getOrderInfo()
-			}
-			if (options.number) {
-				this.getOderPayCountdown(options.number)
-				// this.startCountdown()
-			}
-		},
-		onUnload() {
-			if (this.timer) {
-				clearInterval(this.timer);
-				this.timer = null;
-			}
-		},
-		methods: {
-			async getOderPayCountdown(number) {
-				await request.post('/user/getOderPayCountdown', {
-					number: number
-				}).then(result => {
-					if (result.code == 200) {
-						console.log(result[0].countdown)
-						this.countdown = result[0].countdown
-					}
-				})
-			},
-			getUserInfo() {
-				request.post("/user/getuser", {
-					type: 1
-				}).then((result) => {
-					this.address.name = result.data.username;
-					this.address.phone = result.data.account;
-				});
-			},
-			// 获取订单信息
-			async getOrderInfo() {
-				try {
-					const res = await request.post("/order/detail", {
-						id: this.orderInfo.id,
-					});
-					if (res.code === 0) {
-						this.orderInfo = res.data;
-					}
-				} catch (error) {
-					console.error("获取订单信息失败:", error);
-				}
-			},
-			// 选择支付方式
-			selectMethod(item) {
-				this.selectedPayment = item.payment;
-				this.methodList.forEach((method) => {
-					method.selected = method.id === item.id;
-				});
-			},
-			finish() {
-				uni.showToast({
-					title: '支付超时，请重新下单',
-					icon: 'none'
-				})
-				setTimeout(() => {
-					uni.navigateBack()
-				}, 1500)
-			},
-			// 开始倒计时
-			startCountdown() {
-				let time = 30 * 60; // 30分钟
-				this.timer = setInterval(() => {
-					time--;
-					if (time <= 0) {
-						clearInterval(this.timer);
-						this.timer = null;
-						uni.showToast({
-							title: "支付超时，请重新下单",
-							icon: "none",
-						});
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 1500);
-						return;
-					}
-					const minutes = Math.floor(time / 60);
-					const seconds = time % 60;
-					this.countdown = `${String(minutes).padStart(2, "0")}:${String(
-          seconds
-        ).padStart(2, "0")}`;
-				}, 1000);
-			},
-			// 确认支付 debounce
-			async confirmPay() {
-				let that = this;
-				if (that.isPay) return;
-				try {
-					uni.showLoading({
-						title: "支付中...",
-					});
-					console.log(that.selectedPayment);
-					switch (that.selectedPayment) {
-						case "wechat":
-							// 调用微信支付
-							let wechatpayfor = await request.post(
-								that.interfaceList[that.identity].weChatPayFor,
-								that.orderInfo
-							);
-							console.log("wechatpayfor", wechatpayfor);
-							const systemInfo = uni.getSystemInfoSync();
-							if (systemInfo.platform === "ios") {
-								let appId = wechatpayfor.data.appid;
-								delete wechatpayfor.data.appid;
-								wechatpayfor.data["appId"] = appId;
-								console.log("wechatpayfor2", wechatpayfor);
-							}
-							console.log("================================");
-							uni.hideLoading();
-							uni.requestPayment({
-								provider: "wxpay",
-								orderInfo: wechatpayfor.data, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-								success: function(res) {
-									console.log("success:", res);
-									console.log(that.orderInfo.id, that.orderInfo.number);
-									// let rawdata = JSON.parse(res.rawdata);
-									request
-										.post(that.interfaceList[that.identity].weChatSearch, {
-											id: that.orderInfo.id,
-											number: that.orderInfo.number,
-										})
-										.then((orderRes) => {
-											// if(orderRes.trade_state == 'SUCCESS') {
-											that.paySuccess();
-											//  }else if(orderRes.trade_state == 'NOTPAY') {
-											// uni.showModal({
-											// 	title: '提示',
-											// 	content: '该订单未成功支付',
-											// 	success: function (res) {
-											// 		if (res.confirm) {
-											// 			console.log('用户点击确定');
-											// 		} else if (res.cancel) {
-											// 			console.log('用户点击取消');
-											// 		}
-											// 	}
-											// });
-											//  }
-										})
-										.catch((err) => {
-											console.log("查询状态", err);
-										});
-								},
+<template>
+	<view class="pay-page">
+		<!-- 自定义导航栏 -->
+		<custom-navbar title="支付订单" :showBack="true" backgroundColor="#FFFFFF"></custom-navbar>
+
+		<!-- 支付金额 -->
+		<view class="amount-section">
+			<image src="/static/images/shop/pay_icon.png" mode="aspectFit" class="pay_icon"></image>
+			<view class="amount">
+				<text class="symbol">¥</text>
+				<text class="value">{{ orderInfo.pay_money }}</text>
+			</view>
+			<view class="countdown" v-if="countdown">支付剩余时间:
+				<uv-count-down :time="countdown * 1000" format="mm:ss" @finish="finish"></uv-count-down>
+			</view>
+		</view>
+
+		<!-- 支付方式 -->
+		<view class="method-section">
+			<view class="section-title">选择支付方式</view>
+			<view class="method-list">
+				<view class="method-item" v-for="(item, index) in methodList" :key="index" @click="selectMethod(item)">
+					<view class="method-info">
+						<image :src="item.icon" mode="aspectFit" class="method-icon"></image>
+						<text class="method-name">{{ item.name }}</text>
+					</view>
+					<agree-radio :isAgree="item.selected" :yesImg="`/static/images/icons/yes_icon.png`"
+						:radioSize="`40rpx`" :noImg="`/static/images/icons/no_icon.png`"></agree-radio>
+				</view>
+			</view>
+		</view>
+		<!-- 底部支付按钮 -->
+		<view class="footer">
+			<!-- <view class="total-amount">
+              <view class="amount-money">
+                <text class="symbol">¥</text>
+                <text class="amount">{{ orderInfo.pay_money }}</text>
+              </view>
+              <text class="amount-lable">应付金额</text>
+            </view> -->
+			<view class="pay-btn" @click="confirmPay">立即支付</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import customNavbar from "@/components/custom-navbar/custom-navbar.vue";
+	import {
+		debounce
+	} from "../../utils/debounce";
+	import request from "@/utils/request";
+
+	export default {
+		components: {
+			customNavbar,
+		},
+		data() {
+			return {
+				countdown: 0,
+				identity: 0, //身份，0为商家1为手艺人
+				interfaceList: [{
+						weChatPayFor: "/sj/workHourOrder/weChatPayFor",
+						weChatSearch: "/sj/workHourOrder/weChatSearch",
+						aliPayFor: "/sj/workHourOrder/aliPayFor",
+						aliSearch: "/sj/workHourOrder/aliSearch",
+						path: "/pages/shop/manHourDetail",
+					},
+					{
+						weChatPayFor: "/syr/workSeatOrder/weChatPayFor",
+						weChatSearch: "/syr/workSeatOrder/weChatSearch",
+						aliPayFor: "/syr/workSeatOrder/aliPayFor",
+						aliSearch: "/syr/workSeatOrder/aliSearch",
+						path: "/pages/shop/manHourDetail",
+					},
+				],
+				orderInfo: {
+					id: "",
+					pay_money: "",
+					number: "",
+				},
+				serverTitle: "",
+				// countdown: '00:29:58',
+				selectedPayment: "wechat",
+				balance: "98489.98",
+				timer: null,
+				isPay: false,
+				methodList: [{
+						id: 1,
+						name: "微信",
+						payment: "wechat",
+						icon: "/static/images/shop//wechat.png",
+						selected: true,
+					},
+					{
+						id: 2,
+						name: "支付宝",
+						payment: "alipay",
+						icon: "/static/images/shop/alipay.png",
+						selected: false,
+					},
+					//  {
+					//    id: 3,
+					//    name: '账户余额',
+					// payment: 'balance',
+					//    icon: '/static/images/bankcard.png',
+					//    selected: false
+					//  }
+				],
+			};
+		},
+		computed: {
+			identityinfo() {
+				return this.interfaceList[this.identity];
+			},
+		},
+		onLoad(options) {
+			// this.getUserInfo();
+			if (options.id) {
+				this.orderInfo.id = options.id;
+				this.orderInfo.number = options.number;
+				this.orderInfo.pay_money = options.money;
+				this.serverTitle = options.title;
+				this.identity = options.identity;
+				// this.startCountdown()
+				// this.getOrderInfo()
+			}
+			if (options.number) {
+				this.getOderPayCountdown(options.number)
+				// this.startCountdown()
+			}
+		},
+		onUnload() {
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
+		},
+		methods: {
+			async getOderPayCountdown(number) {
+				await request.post('/user/getOderPayCountdown', {
+					number: number
+				}).then(result => {
+					if (result.code == 200) {
+						console.log(result[0].countdown)
+						this.countdown = result[0].countdown
+					}
+				})
+			},
+			getUserInfo() {
+				request.post("/user/getuser", {
+					type: 1
+				}).then((result) => {
+					this.address.name = result.data.username;
+					this.address.phone = result.data.account;
+				});
+			},
+			// 获取订单信息
+			async getOrderInfo() {
+				try {
+					const res = await request.post("/order/detail", {
+						id: this.orderInfo.id,
+					});
+					if (res.code === 0) {
+						this.orderInfo = res.data;
+					}
+				} catch (error) {
+					console.error("获取订单信息失败:", error);
+				}
+			},
+			// 选择支付方式
+			selectMethod(item) {
+				this.selectedPayment = item.payment;
+				this.methodList.forEach((method) => {
+					method.selected = method.id === item.id;
+				});
+			},
+			finish() {
+				uni.showToast({
+					title: '支付超时，请重新下单',
+					icon: 'none'
+				})
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 1500)
+			},
+			// 开始倒计时
+			startCountdown() {
+				let time = 30 * 60; // 30分钟
+				this.timer = setInterval(() => {
+					time--;
+					if (time <= 0) {
+						clearInterval(this.timer);
+						this.timer = null;
+						uni.showToast({
+							title: "支付超时，请重新下单",
+							icon: "none",
+						});
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1500);
+						return;
+					}
+					const minutes = Math.floor(time / 60);
+					const seconds = time % 60;
+					this.countdown = `${String(minutes).padStart(2, "0")}:${String(
+          seconds
+        ).padStart(2, "0")}`;
+				}, 1000);
+			},
+			// 确认支付 debounce
+			async confirmPay() {
+				let that = this;
+				if (that.isPay) return;
+				try {
+					uni.showLoading({
+						title: "支付中...",
+					});
+					console.log(that.selectedPayment);
+					switch (that.selectedPayment) {
+						case "wechat":
+							// 调用微信支付
+							let wechatpayfor = await request.post(
+								that.interfaceList[that.identity].weChatPayFor,
+								that.orderInfo
+							);
+							console.log("wechatpayfor", wechatpayfor);
+							const systemInfo = uni.getSystemInfoSync();
+							if (systemInfo.platform === "ios") {
+								let appId = wechatpayfor.data.appId;
+								// delete wechatpayfor.data.appid;
+								wechatpayfor.data["appId"] = appId;
+								console.log("wechatpayfor2", wechatpayfor);
+								console.log(that.orderInfo, 'that.orderInfothat.orderInfo');
+							}
+							console.log("================================");
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: "wxpay",
+								orderInfo: wechatpayfor.data, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+								success: function(res) {
+									console.log("success:", res);
+									console.log(that.orderInfo.id, that.orderInfo.number);
+									// let rawdata = JSON.parse(res.rawdata);
+									request
+										.post(that.interfaceList[that.identity].weChatSearch, {
+											id: that.orderInfo.id,
+											number: that.orderInfo.number,
+										})
+										.then((orderRes) => {
+											// if(orderRes.trade_state == 'SUCCESS') {
+											that.paySuccess();
+											//  }else if(orderRes.trade_state == 'NOTPAY') {
+											// uni.showModal({
+											// 	title: '提示',
+											// 	content: '该订单未成功支付',
+											// 	success: function (res) {
+											// 		if (res.confirm) {
+											// 			console.log('用户点击确定');
+											// 		} else if (res.cancel) {
+											// 			console.log('用户点击取消');
+											// 		}
+											// 	}
+											// });
+											//  }
+										})
+										.catch((err) => {
+											console.log("查询状态", err);
+										});
+								},
 								fail: function(err) {
-									uni.showModal({
-										title: "提示",
-										content: "该订单未成功支付",
-										success: function(res) {
-											if (res.confirm) {
-												console.log("用户点击确定");
-											} else if (res.cancel) {
-												console.log("用户点击取消");
-											}
-										},
-									});
-									console.log("fail:", JSON.stringify(err));
-								},
-							});
-							break;
-						case "alipay":
-							// 调用支付宝支付
-							let orderInfo = {
-								...that.orderInfo
-							};
-							orderInfo.title = that.serverTitle;
-							let alipayfor = await request.post(
-								that.interfaceList[that.identity].aliPayFor,
-								orderInfo
-							);
-							console.log("alipayfor", alipayfor);
-							uni.hideLoading();
-							uni.requestPayment({
-								provider: "alipay",
-								orderInfo: alipayfor.data, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-								success: function(res) {
-									console.log("success:", res);
-									console.log(
-										"id: ",
-										that.orderInfo.id,
-										"number: ",
-										that.orderInfo.number
-									);
-									console.log("ali支付成功了====================");
-									request
-										.post(that.interfaceList[that.identity].aliSearch, {
-											id: that.orderInfo.id,
-											number: that.orderInfo.number,
-										})
-										.then((orderRes) => {
-											console.log("orderRes", orderRes, orderRes.trade_status);
-
-											console.log("ali报错了】】】】】】】】】】】】】】");
-											// if(orderRes.trade_status == 'TRADE_SUCCESS') {
-											that.paySuccess();
-											//  }else {
-											// uni.showModal({
-											// 	title: '提示',
-											// 	content: '该订单未成功支付',
-											// 	success: function (res) {
-											// 		if (res.confirm) {
-											// 			console.log('用户点击确定');
-											// 		} else if (res.cancel) {
-											// 			console.log('用户点击取消');
-											// 		}
-											// 	}
-											// });
-											//  }
-										})
-										.catch((err) => {
-											console.log("ali报错了】】】】】】】】】】】】】】", err);
-											console.log("查询状态", err);
-										});
-								},
-								fail: function(err) {
-									uni.showModal({
-										title: "提示",
-										content: "该订单未成功支付",
-										success: function(res) {
-											if (res.confirm) {
-												console.log("用户点击确定");
-											} else if (res.cancel) {
-												console.log("用户点击取消");
-											}
-										},
-									});
-									console.log("fail:", JSON.stringify(err));
-								},
-							});
-							break;
-						case "balance":
-							// 余额支付直接成功
-							const res = await request.post(
-								"/user/balancepayfor",
-								that.orderInfo
-							);
-							console.log("余额支付结果", res);
-							uni.hideLoading();
-							if (res.state == 1) {
-								that.paySuccess();
-							} else if (res.state == 2) {
-								uni.showToast({
-									title: res.msg,
-								});
-							}
-							break;
-					}
-				} catch (error) {
-					uni.hideLoading();
-					console.error("支付失败:", error);
-					uni.showToast({
-						title: "支付失败，请重试",
-						icon: "none",
-					});
-					this.isPay = false;
-				}
-			},
-
-			// 支付成功
-			paySuccess() {
-				uni.showToast({
-					title: "支付成功",
-					icon: "success",
-				});
-				setTimeout(() => {
-					uni.redirectTo({
-						url: `/pages/shop/pay-success?orderId=${this.orderInfo.id}&path=${this.interfaceList[this.identity].path}&identity=${this.identity}`,
-					});
-				}, 50);
-				this.isPay = true;
-			},
-		},
-	};
-</script>
-
-<style lang="less">
-	.pay-page {
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	/* 金额展示 */
-	.amount-section {
-		background-color: transparent;
-		padding: 51rpx 32rpx 129rpx 32rpx;
-		text-align: center;
-
-		.pay_icon {
-			width: 199rpx;
-			height: 178rpx;
-			margin-bottom: 34rpx;
-		}
-
-		.amount {
-			margin-bottom: 24rpx;
-
-			.symbol {
-				font-family: DINPro, DINPro;
-				font-weight: bold;
-				font-size: 54rpx;
-				color: #333333;
-				line-height: 70rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-			.value {
-				font-family: DINPro, DINPro;
-				font-weight: bold;
-				font-size: 88rpx;
-				color: #333333;
-				line-height: 114rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-			.value2 {
-				font-family: DINPro, DINPro;
-				font-weight: bold;
-				font-size: 56rpx;
-				color: #333333;
-				line-height: 72rpx;
-				text-align: left;
-				font-style: normal;
-			}
-
-		}
-
-		.countdown {
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 37rpx;
-			text-align: center;
-			font-style: normal;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			::v-deep .uv-count-down__text {
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #333333;
-				line-height: 37rpx;
-				text-align: center;
-				font-style: normal;
-			}
-		}
-	}
-
-
-
-	/* 支付方式 */
-	.method-section {
-		background-image: url("/static/images/shop/payBj.png");
-		background-position: top;
-		background-repeat: no-repeat;
-		background-size: contain;
-		background-color: #fff;
-		margin: 0 20rpx;
-		padding: 22rpx 26rpx 62rpx 26rpx;
-		border-radius: 0rpx 0rpx 20rpx 20rpx;
-	}
-
-	.section-title {
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 40rpx;
-		text-align: left;
-		font-style: normal;
-		margin-bottom: 23rpx;
-	}
-
-	.balance-amount {
-		font-size: 28rpx;
-		color: #999999;
-		margin-left: 16rpx;
-	}
-
-	/* 底部按钮 */
-	.footer {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		height: 150rpx;
-		background-color: #ffffff;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-		padding: 0 24rpx;
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	.total-amount {
-		flex: 1;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: flex-start;
-		align-items: flex-start;
-	}
-
-	.total-amount .symbol {
-		font-size: 24rpx;
-		font-weight: 500;
-		color: #E8101E;
-	}
-
-	.total-amount .amount {
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #E8101E;
-	}
-
-	.amount-lable {
-		font-size: 24rpx;
-		color: #999999;
-	}
-
-	.pay-btn {
-		width: 680rpx;
-		height: 88rpx;
-		background: linear-gradient( 180deg, #F52540 0%, #E8101E 100%);
-		border-radius: 43rpx;
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #FFFFFF;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.method-item {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 40rpx 0;
-		border-bottom: 1rpx solid rgba(0, 0, 0, 0.05);
-	}
-
-	.method-item:last-child {
-		border-bottom: none;
-		padding-bottom: 0;
-	}
-
-	.method-info {
-		display: flex;
-		align-items: center;
-	}
-
-	.method-icon {
-		width: 38rpx;
-		height: 38rpx;
-		margin-right: 20rpx;
-	}
-
-	.method-name {
-		font-weight: 500;
-		font-size: 30rpx;
-		color: #5B5B5B;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-	}
-
-	/* 多端适配 */
-	/* #ifdef H5 */
-	.footer {
-		padding-bottom: 0;
-	}
-
-	/* #endif */
+									console.log(err,'erererererer');
+									uni.showModal({
+										title: "提示",
+										content: "该订单未成功支付",
+										success: function(res) {
+											if (res.confirm) {
+												console.log("用户点击确定");
+											} else if (res.cancel) {
+												console.log("用户点击取消");
+											}
+										},
+									});
+									console.log("fail:", JSON.stringify(err));
+								},
+							});
+							break;
+						case "alipay":
+							// 调用支付宝支付
+							let orderInfo = {
+								...that.orderInfo
+							};
+							orderInfo.title = that.serverTitle;
+							let alipayfor = await request.post(
+								that.interfaceList[that.identity].aliPayFor,
+								orderInfo
+							);
+							console.log("alipayfor", alipayfor);
+							uni.hideLoading();
+							uni.requestPayment({
+								provider: "alipay",
+								orderInfo: alipayfor.data, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+								success: function(res) {
+									console.log("success:", res);
+									console.log(
+										"id: ",
+										that.orderInfo.id,
+										"number: ",
+										that.orderInfo.number
+									);
+									console.log("ali支付成功了====================");
+									request
+										.post(that.interfaceList[that.identity].aliSearch, {
+											id: that.orderInfo.id,
+											number: that.orderInfo.number,
+										})
+										.then((orderRes) => {
+											console.log("orderRes", orderRes, orderRes.trade_status);
+
+											console.log("ali报错了】】】】】】】】】】】】】】");
+											// if(orderRes.trade_status == 'TRADE_SUCCESS') {
+											that.paySuccess();
+											//  }else {
+											// uni.showModal({
+											// 	title: '提示',
+											// 	content: '该订单未成功支付',
+											// 	success: function (res) {
+											// 		if (res.confirm) {
+											// 			console.log('用户点击确定');
+											// 		} else if (res.cancel) {
+											// 			console.log('用户点击取消');
+											// 		}
+											// 	}
+											// });
+											//  }
+										})
+										.catch((err) => {
+											console.log("ali报错了】】】】】】】】】】】】】】", err);
+											console.log("查询状态", err);
+										});
+								},
+								fail: function(err) {
+									uni.showModal({
+										title: "提示",
+										content: "该订单未成功支付",
+										success: function(res) {
+											if (res.confirm) {
+												console.log("用户点击确定");
+											} else if (res.cancel) {
+												console.log("用户点击取消");
+											}
+										},
+									});
+									console.log("fail:", JSON.stringify(err));
+								},
+							});
+							break;
+						case "balance":
+							// 余额支付直接成功
+							const res = await request.post(
+								"/user/balancepayfor",
+								that.orderInfo
+							);
+							console.log("余额支付结果", res);
+							uni.hideLoading();
+							if (res.state == 1) {
+								that.paySuccess();
+							} else if (res.state == 2) {
+								uni.showToast({
+									title: res.msg,
+								});
+							}
+							break;
+					}
+				} catch (error) {
+					uni.hideLoading();
+					console.error("支付失败:", error);
+					uni.showToast({
+						title: "支付失败，请重试",
+						icon: "none",
+					});
+					this.isPay = false;
+				}
+			},
+
+			// 支付成功
+			paySuccess() {
+				uni.showToast({
+					title: "支付成功",
+					icon: "success",
+				});
+				setTimeout(() => {
+					uni.redirectTo({
+						url: `/pages/shop/pay-success?orderId=${this.orderInfo.id}&path=${this.interfaceList[this.identity].path}&identity=${this.identity}`,
+					});
+				}, 50);
+				this.isPay = true;
+			},
+		},
+	};
+</script>
+
+<style lang="less">
+	.pay-page {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	/* 金额展示 */
+	.amount-section {
+		background-color: transparent;
+		padding: 51rpx 32rpx 129rpx 32rpx;
+		text-align: center;
+
+		.pay_icon {
+			width: 199rpx;
+			height: 178rpx;
+			margin-bottom: 34rpx;
+		}
+
+		.amount {
+			margin-bottom: 24rpx;
+
+			.symbol {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 54rpx;
+				color: #333333;
+				line-height: 70rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.value {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 88rpx;
+				color: #333333;
+				line-height: 114rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+			.value2 {
+				font-family: DINPro, DINPro;
+				font-weight: bold;
+				font-size: 56rpx;
+				color: #333333;
+				line-height: 72rpx;
+				text-align: left;
+				font-style: normal;
+			}
+
+		}
+
+		.countdown {
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #333333;
+			line-height: 37rpx;
+			text-align: center;
+			font-style: normal;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			::v-deep .uv-count-down__text {
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #333333;
+				line-height: 37rpx;
+				text-align: center;
+				font-style: normal;
+			}
+		}
+	}
+
+
+
+	/* 支付方式 */
+	.method-section {
+		background-image: url("/static/images/shop/payBj.png");
+		background-position: top;
+		background-repeat: no-repeat;
+		background-size: contain;
+		background-color: #fff;
+		margin: 0 20rpx;
+		padding: 22rpx 26rpx 62rpx 26rpx;
+		border-radius: 0rpx 0rpx 20rpx 20rpx;
+	}
+
+	.section-title {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 40rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 23rpx;
+	}
+
+	.balance-amount {
+		font-size: 28rpx;
+		color: #999999;
+		margin-left: 16rpx;
+	}
+
+	/* 底部按钮 */
+	.footer {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 150rpx;
+		background-color: #ffffff;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+		padding: 0 24rpx;
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.total-amount {
+		flex: 1;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: flex-start;
+		align-items: flex-start;
+	}
+
+	.total-amount .symbol {
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #E8101E;
+	}
+
+	.total-amount .amount {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #E8101E;
+	}
+
+	.amount-lable {
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.pay-btn {
+		width: 680rpx;
+		height: 88rpx;
+		background: linear-gradient(180deg, #F52540 0%, #E8101E 100%);
+		border-radius: 43rpx;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #FFFFFF;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.method-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 40rpx 0;
+		border-bottom: 1rpx solid rgba(0, 0, 0, 0.05);
+	}
+
+	.method-item:last-child {
+		border-bottom: none;
+		padding-bottom: 0;
+	}
+
+	.method-info {
+		display: flex;
+		align-items: center;
+	}
+
+	.method-icon {
+		width: 38rpx;
+		height: 38rpx;
+		margin-right: 20rpx;
+	}
+
+	.method-name {
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #5B5B5B;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+	}
+
+	/* 多端适配 */
+	/* #ifdef H5 */
+	.footer {
+		padding-bottom: 0;
+	}
+
+	/* #endif */
 </style>
\ No newline at end of file
diff --git a/pages/shop/photoAlbum/addPhoto.vue b/pages/shop/photoAlbum/addPhoto.vue
index a5df658..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
 					});
@@ -369,6 +390,7 @@
 					uni.showLoading({
 						title: '上传中'
 					})
+					 console.log(this.formData,'=============================');
 					if (this.formData.type == 1) {
 						res = await uploadImage.handleUpload(this.userInfo.id, 3);
 					} else {
diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue
index a4c4be1..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">
@@ -9,13 +9,14 @@
 			</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>
+					<text class="card-header-right-text">查看全部</text>
 					<image class="card-header-right-img" src="/static/images/icons/right_gray14.png"></image>
 				</view>
 			</view>
@@ -142,6 +143,7 @@
 				return obj
 			},
 			goList(id) {
+				console.log(id,'ididididididi');
 				uni.navigateTo({
 					url: `/pages/shop/photoAlbum/videoList?id=${id}&type=${this.type}`
 				});
@@ -156,7 +158,7 @@
 			},
 			goAdd(id, item) {
 				if (this.type == 1) {
-					if ( this.imgVideoList[id] && this.imgVideoList[id].length >= 20) {
+					if ( this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
 						uni.showToast({
 							title: '最多上传20张图片',
 							icon: 'none',
@@ -255,6 +257,7 @@
 			}
 
 			.titles-right {
+				display: flex;
 				.titles-text {
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
diff --git a/pages/shop/photoAlbum/videoList.vue b/pages/shop/photoAlbum/videoList.vue
index ed4a153..dfc18d2 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -1,486 +1,506 @@
-<template>
-	<view class="container">
-		<custom-navbar title="店铺图片" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff"
-			titleColor="#000" borderBottom="none">
-			<template #right>
-				<text class="custom-right" @click="toggleManage">{{ isManage ? '取消' : '管理' }}</text>
-			</template>
-		</custom-navbar>
-		<view class="review">
-			<view class="review-title">
-				<text class="review-title-text">添加环境图片，吸引更多顾客到店消费</text>
-			</view>
-		</view>
-		<view class="container-card">
-
-			<view class="card-content flex-row-center" v-if="type==1">
-				<view class="card-content-page">{{ 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>
-					<text class="content-default-text">添加照片</text>
-				</view>
-				<view class="content-photo" v-for="(item2,index2) in imgVideoList" :key="index2" v-if="imgVideoList"
-					@click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
-					<!-- 选择框 -->
-					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
-					</image>
-					<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>
-			</view>
-			<view class="card-content flex-row-center" v-else>
-				<view class="card-content-page">{{ 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>
-					<text class="content-default-text">添加视频</text>
-				</view>
-				<view class="content-photo content-video" v-for="(item2,index2) in imgVideoList" :key="index2"
-					v-if="imgVideoList" @click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
-					<!-- 选择框 -->
-					<image class="content-photo-select" v-if="isManage"
-						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
-					</image>
-					<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>
-					<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 class="container-buttons flex-row-center-center" v-if="isManage">
-			<view class="container-buttons-sure2 flex-row-center-center" @click="handleDelete">删除</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import request from "@/utils/request";
-	export default {
-		data() {
-			return {
-				imgVideoList: [],
-				type: 2, //1图片 2视频
-				class_type: 4, //1主(图片/视频) 2环境(图片/视频) 3作品(图片/视频) 4其它(图片/视频)
-				isManage: false, // 管理模式状态
-				selectedItems: [] // 选中的项索引数组
-			}
-		},
-		async onShow() {
-			await this.getList()
-		},
-		async onLoad(options) {
-			if (options.type) {
-				this.type = options.type
-			}
-			if (options.id) {
-				this.class_type = options.id
-			}
-		},
-		methods: {
-			// 切换管理/取消模式
-			toggleManage() {
-				this.isManage = !this.isManage;
-				if (!this.isManage) {
-					this.selectedItems = []; // 退出管理模式时清空选中项
-				}
-			},
-			// 切换选中状态
-			toggleSelect(index) {
-				console.log(1111, index)
-				if (this.selectedItems.includes(index)) {
-					// 已选中，移除
-					this.selectedItems = this.selectedItems.filter(i => i !== index);
-				} else {
-					// 未选中，添加
-					this.selectedItems.push(index);
-				}
-			},
-			// 批量删除
-			async handleDelete() {
-				// 收集选中项的ID
-				let deleteIds = this.selectedItems.map(index => this.imgVideoList[index].id);
-				let auth_ids = this.selectedItems.map(index => this.imgVideoList[index].auth_id).filter(item =>
-					item !== 0);
-				console.log(1111, deleteIds, auth_ids, [1, 6])
-				try {
-					const res = await request.post("/sj/imgVideo/del", {
-						ids: deleteIds,
-						auth_ids: auth_ids
-					});
-					if (res.code == 200) {
-						// 重新获取列表
-						await this.getList();
-						// 退出管理模式
-						this.isManage = false;
-						this.selectedItems = [];
-					} else {
-						uni.showToast({
-							title: '删除失败',
-							icon: 'none'
-						});
-					}
-				} catch (err) {
-					uni.showToast({
-						title: '删除失败',
-						icon: 'none'
-					});
-				}
-			},
-			goAdd(id, item) {
-				if (this.isManage) return; // 管理模式下禁止跳转
-				if (this.type == 1) {
-					if (this.imgVideoList.length >= 20) {
-						uni.showToast({
-							title: '最多上传20张图片',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				} else if (this.type == 2) {
-					if (this.imgVideoList.length >= 10) {
-						uni.showToast({
-							title: '最多上传10张视频',
-							icon: 'none',
-							duration: 2000
-						});
-						return
-					}
-				}
-				if (!id) {
-					uni.showToast({
-						title: '参数异常，无法上传',
-						icon: 'none',
-						duration: 2000
-					});
-					return;
-				}
-				let url = `/pages/shop/photoAlbum/addPhoto?id=${id}&type=${this.type}`;
-				if (item) {
-					url += `&item=${encodeURIComponent(JSON.stringify(item))}`;
-				}
-				uni.navigateTo({
-					url: url
-				});
-			},
-			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
-			},
-			async getList() {
-				try {
-					const res = await request.post("/sj/imgVideo/list", {
-						type: this.type,
-						class_type: this.class_type
-					});
-					// 核心修复：逐层可选链保护 + 兜底空数组，彻底避免属性访问错误
-					this.imgVideoList = res.code === 200 ?
-						res.data?.list?.[this.type]?.[this.class_type] || [] :
-						[];
-				} catch (err) {
-					// 网络错误、接口报错等所有异常的兜底处理
-					console.error("获取媒体列表失败：", err);
-					this.imgVideoList = [];
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-	.container {
-		.custom-right {
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #333333;
-			line-height: 37rpx;
-			text-align: left;
-			font-style: normal;
-			white-space: nowrap;
-		}
-
-		.review {
-			background: rgba(255, 250, 218, 1);
-			border-radius: 20rpx 20rpx 0rpx 0rpx;
-			margin: 20rpx;
-			padding: 20rpx 20rpx 20rpx 20rpx;
-
-			.review-title {
-				margin-bottom: 6rpx;
-
-				.review-title-text {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #835225;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-				}
-			}
-
-		}
-
-		.container-card {
-			border-radius: 20rpx;
-			margin: 20rpx;
-			padding: 20rpx 20rpx 30rpx 20rpx;
-			background: #fff;
-			transform: translateY(-30rpx);
-
-			.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;
-
-				.card-content-page {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
-					line-height: 33rpx;
-					text-align: left;
-					font-style: normal;
-					width: 100%;
-				}
-
-				.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-select {
-						position: absolute;
-						top: 12rpx;
-						right: 14rpx;
-						width: 36rpx;
-						height: 36rpx;
-						z-index: 999;
-					}
-
-					.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;
-				}
-			}
-		}
-	}
-
-
-	.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;
-		}
-	}
+<template>
+	<view class="container">
+		<custom-navbar :title="pagestitle" :leftImg="'/static/images/back.png'" :showUser="true" backgroundColor="#fff"
+			titleColor="#000" borderBottom="none">
+			<template #right>
+				<text class="custom-right" @click="toggleManage">{{ isManage ? '取消' : '管理' }}</text>
+			</template>
+		</custom-navbar>
+		<view class="review">
+			<view class="review-title">
+				<text class="review-title-text">添加{{pagestitle}}，吸引更多顾客到店消费</text>
+			</view>
+		</view>
+		<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="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>
+					<text class="content-default-text">添加照片</text>
+				</view>
+				<view class="content-photo" v-for="(item2,index2) in imgVideoList" :key="index2" v-if="imgVideoList"
+					@click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
+					<!-- 选择框 -->
+					<image class="content-photo-select" v-if="isManage"
+						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+					</image>
+					<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>
+			</view>
+			<view class="card-content flex-row-center" v-else>
+				<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>
+					<text class="content-default-text">添加视频</text>
+				</view>
+				<view class="content-photo content-video" v-for="(item2,index2) in imgVideoList" :key="index2"
+					v-if="imgVideoList" @click="isManage ? toggleSelect(index2) : goAdd(class_type,item2)">
+					<!-- 选择框 -->
+					<image class="content-photo-select" v-if="isManage"
+						:src="selectedItems.includes(index2) ? '/static/images/icons/yes_icon.png' : '/static/images/icons/no_icon2.png'">
+					</image>
+					<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>
+					<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 class="container-buttons flex-row-center-center" v-if="isManage">
+			<view class="container-buttons-sure2 flex-row-center-center" @click="handleDelete">删除</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import request from "@/utils/request";
+	export default {
+		data() {
+			return {
+				imgVideoList: [],
+				type: 2, //1图片 2视频
+				class_type: 4, //1主(图片/视频) 2环境(图片/视频) 3作品(图片/视频) 4其它(图片/视频)
+				isManage: false, // 管理模式状态
+				selectedItems: [], // 选中的项索引数组
+				pagestitle: "店铺图片"
+			}
+		},
+		async onShow() {
+			await this.getList()
+		},
+		async onLoad(options) {
+			console.log(options, '查看option');
+			if (options.type) {
+				this.type = options.type
+			}
+			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) {
+					this.pagestitle = "作品图片"
+				} else if (this.class_type == 4) {
+					this.pagestitle = "其它图片"
+				} else {
+					this.pagestitle = "店铺图片"
+				}
+			}
+		},
+		methods: {
+			// 切换管理/取消模式
+			toggleManage() {
+				this.isManage = !this.isManage;
+				if (!this.isManage) {
+					this.selectedItems = []; // 退出管理模式时清空选中项
+				}
+			},
+			// 切换选中状态
+			toggleSelect(index) {
+				console.log(1111, index)
+				if (this.selectedItems.includes(index)) {
+					// 已选中，移除
+					this.selectedItems = this.selectedItems.filter(i => i !== index);
+				} else {
+					// 未选中，添加
+					this.selectedItems.push(index);
+				}
+			},
+			// 批量删除
+			async handleDelete() {
+				// 收集选中项的ID
+				let deleteIds = this.selectedItems.map(index => this.imgVideoList[index].id);
+				let auth_ids = this.selectedItems.map(index => this.imgVideoList[index].auth_id).filter(item =>
+					item !== 0);
+				console.log(1111, deleteIds, auth_ids, [1, 6])
+				try {
+					const res = await request.post("/sj/imgVideo/del", {
+						ids: deleteIds,
+						auth_ids: auth_ids
+					});
+					if (res.code == 200) {
+						// 重新获取列表
+						await this.getList();
+						// 退出管理模式
+						this.isManage = false;
+						this.selectedItems = [];
+					} else {
+						uni.showToast({
+							title: '删除失败',
+							icon: 'none'
+						});
+					}
+				} catch (err) {
+					uni.showToast({
+						title: '删除失败',
+						icon: 'none'
+					});
+				}
+			},
+			goAdd(id, item) {
+				if (this.isManage) return; // 管理模式下禁止跳转
+				if (this.type == 1) {
+					if (this.imgVideoList.length >= 20) {
+						uni.showToast({
+							title: '最多上传20张图片',
+							icon: 'none',
+							duration: 2000
+						});
+						return
+					}
+				} else if (this.type == 2) {
+					if (this.imgVideoList.length >= 10) {
+						uni.showToast({
+							title: '最多上传10张视频',
+							icon: 'none',
+							duration: 2000
+						});
+						return
+					}
+				}
+				if (!id) {
+					uni.showToast({
+						title: '参数异常，无法上传',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				let url = `/pages/shop/photoAlbum/addPhoto?id=${id}&type=${this.type}`;
+				if (item) {
+					url += `&item=${encodeURIComponent(JSON.stringify(item))}`;
+				}
+				uni.navigateTo({
+					url: url
+				});
+			},
+			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
+			},
+			async getList() {
+				try {
+					const res = await request.post("/sj/imgVideo/list", {
+						type: this.type,
+						class_type: this.class_type
+					});
+					// 核心修复：逐层可选链保护 + 兜底空数组，彻底避免属性访问错误
+					this.imgVideoList = res.code === 200 ?
+						res.data?.list?.[this.type]?.[this.class_type] || [] : [];
+				} catch (err) {
+					// 网络错误、接口报错等所有异常的兜底处理
+					console.error("获取媒体列表失败：", err);
+					this.imgVideoList = [];
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.container {
+		.custom-right {
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #333333;
+			line-height: 37rpx;
+			text-align: left;
+			font-style: normal;
+			white-space: nowrap;
+		}
+
+		.review {
+			background: rgba(255, 250, 218, 1);
+			border-radius: 20rpx 20rpx 0rpx 0rpx;
+			margin: 20rpx;
+			padding: 20rpx 20rpx 20rpx 20rpx;
+
+			.review-title {
+				margin-bottom: 6rpx;
+
+				.review-title-text {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #835225;
+					line-height: 33rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+
+		}
+
+		.container-card {
+			border-radius: 20rpx;
+			margin: 20rpx;
+			padding: 20rpx 20rpx 30rpx 20rpx;
+			background: #fff;
+			transform: translateY(-30rpx);
+
+			.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;
+
+				.card-content-page {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+					line-height: 33rpx;
+					text-align: left;
+					font-style: normal;
+					width: 100%;
+				}
+
+				.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-select {
+						position: absolute;
+						top: 12rpx;
+						right: 14rpx;
+						width: 36rpx;
+						height: 36rpx;
+						z-index: 999;
+					}
+
+					.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;
+				}
+			}
+		}
+	}
+
+
+	.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;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/utils/albumUploadImage.js b/utils/albumUploadImage.js
index 8ff14bc..2f17212 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -173,10 +173,10 @@ const uploadFile = async (file, userId, type, uploadType) => {
 	let imageType;
 	if (uploadType == 'image') {
 		//imageType = file.path.split('.')
-		imageType = file.name.split('.')
+		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('.')
@@ -252,7 +252,9 @@ const uploadToOss = (file, ossConfig, name, uploadType) => {
 		if (uploadType == 'image') {
 			path = file.path
 			// 获取文件扩展名并设置 Content-Type
+			console.log('111111');
 			const ext = file.path.split('.').pop().toLowerCase()
+			console.log('33333333');
 			const mimeTypes = {
 				jpg: 'image/jpeg',
 				jpeg: 'image/jpeg',