From b963e6a18280599c3ea6d2c6cff0e4f63907fa5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 7 Apr 2026 11:04:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json | 4 +++-
 manifest.json          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 81b430e..3e2665e 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,11 +2,13 @@
     "version" : "1.0",
     "configurations" : [
         {
+            "customPlaygroundType" : "device",
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
         {
-            "playground" : "custom",
+            "customPlaygroundType" : "device",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/manifest.json b/manifest.json
index 86647ef..ccfb56d 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特有相关 */

From e4b7646da9db15d2bc5cd66aafb88e8fe7d57ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Tue, 7 Apr 2026 16:36:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8A=E9=97=A8=E6=8F=90=E9=86=92=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json     | 2 +-
 pages/shop/add-service.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 3e2665e..6531799 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "device",
+            "customPlaygroundType" : "local",
             "playground" : "custom",
             "type" : "uni-app:app-ios"
         },
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index d0924ac..f988aeb 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: {

From 35dca559d3dc33edd1d7eb774d2b30279c41e2f5 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 16:10:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=9A=E4=B8=AAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                |    4 +-
 apple-app-site-association            |    2 +-
 manifest.json                         |    8 +-
 pages/shop/add-service.vue            | 2996 +++++++++++++------------
 pages/shop/pay.vue                    | 1200 +++++-----
 pages/shop/photoAlbum/addPhoto.vue    |    1 +
 pages/shop/photoAlbum/photoManage.vue |    7 +-
 pages/shop/photoAlbum/videoList.vue   |  980 ++++----
 utils/albumUploadImage.js             |    4 +-
 9 files changed, 2615 insertions(+), 2587 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 6531799..38b0b25 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -7,8 +7,8 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/apple-app-site-association b/apple-app-site-association
index 739a02d..d28a42e 100644
--- a/apple-app-site-association
+++ b/apple-app-site-association
@@ -3,7 +3,7 @@
         "apps": [],
         "details": [
             {
-                "appID": "wx5b1c0c8d01ded35d",
+                "appID": "wx17eef65c270b4869",
                 "paths": ["*"]
             }
         ]
diff --git a/manifest.json b/manifest.json
index ccfb56d..f4621e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -107,7 +107,7 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx2381a791a52a402d",
+                        "appid" : "wx17eef65c270b4869",
                         "UniversalLinks" : "https://app.mrrweb.com.cn/"
                     },
                     "appleiap" : {},
@@ -117,7 +117,7 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx2381a791a52a402d",
+                        "appid" : "wx17eef65c270b4869",
                         "UniversalLinks" : "https://app.mrrweb.com.cn/"
                     }
                 },
@@ -134,7 +134,7 @@
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx2381a791a52a402d",
+                        "appid" : "wx17eef65c270b4869",
                         "UniversalLinks" : "https://app.mrrweb.com.cn/"
                     }
                 }
@@ -197,7 +197,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxb486b10a60d2c78d",
+        "appid" : "wx17eef65c270b4869",
         "privacy" : {
             "requiredPrivateInfos" : [ "getBackgroundFetchData" ]
         },
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index f988aeb..87913a3 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -1,1494 +1,1504 @@
-<template>
-	<view class="add-service">
-		<view class="fixed-header">
-			<view class="tip" v-if="formData.back_text && formData.state == 4">
-				<image
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/390d9d12-3c30-4639-9ac3-7b604b606b6d.png"
-					class="tip-icon"></image>
-				<text>{{ formData.back_text }}</text>
-			</view>
-		</view>
-
-		<!-- 表单区域 -->
-		<view class="form-container">
-			<!-- 服务名称 -->
-			<view class="form-item">
-				<text class="form-label required">服务名称</text>
-				<input type="text" v-model="formData.title" placeholder="请输入服务名称" placeholder-class="placeholder"
-					class="form-input" />
-			</view>
-
-			<!-- 服务价格 -->
-			<view class="form-item" style="flex-wrap: wrap;">
-				<text class="form-label required">服务定价</text>
-				<input type="digit" v-model.number="formData.line_price" placeholder="请输入定价，最多两位小数"
-					placeholder-class="placeholder" class="form-input" @input="inpPrice2" @blur="inpPrice2"
-					@confirm="inpPrice2" step="0.01" />
-				<view class="price-tip">
-					<text class="price-tip-card">服务的基础定价，未参与任何优惠的价格</text>
-				</view>
-			</view>
-
-			<!-- 服务价格 -->
-			<view class="form-item" style="flex-wrap: wrap;">
-				<text class="form-label required">服务售价</text>
-				<input type="digit" v-model.number="formData.server_price" placeholder="请输入售价，最多两位小数"
-					placeholder-class="placeholder" class="form-input" @input="inpPrice" @blur="inpPrice"
-					@confirm="inpPrice" step="0.01" />
-				<view class="price-tip">
-					<text class="price-tip-card">服务参与单品优惠后的价格</text>
-				</view>
-			</view>
-
-			<!-- 服务分类 -->
-			<view class="form-item">
-				<text class="form-label required">服务分类</text>
-				<view class="form-right" @click="openServiceTypePicker">
-					<text :class="[
-              'form-value',
-              formData.first_class_id ? '' : 'placeholder',
-            ]">
-						{{ serviceType || "选择分类" }}
-					</text>
-					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-
-			<!-- 服务子类 -->
-			<view class="form-item" v-if="showCategory">
-				<text class="form-label required">服务子类</text>
-				<view class="form-right" @click="openCategoryPicker">
-					<text :class="[
-              'form-value',
-              formData.second_class_id ? '' : 'placeholder',
-            ]">
-						{{ category || "选择子类" }}
-					</text>
-					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
-						class="arrow-right" mode="aspectFit"></image>
-				</view>
-			</view>
-
-			<!-- 是否允许该服务在门店售卖 -->
-			<view class="form-item shopsale-box" v-if="artisanType == 1">
-				<view class="form-label required">
-					是否允许该服务在门店端售卖，以供门店下单购买。
-					{{
-            showShopPrice
-              ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
-              : ""
-          }}
-					<text style="color: #e8101e" v-if="showShopPrice">{{
-            shopPrice
-          }}</text>
-					{{ showShopPrice ? "元。" : "" }}
-				</view>
-				<view class="shopsale-change">
-					<view class="shopsale-option" @click="changeSale(2)">
-						<agree-radio :isAgree="formData.sj_see == 2"></agree-radio>
-						<text class="option-text">允许</text>
-					</view>
-					<view class="shopsale-option" @click="changeSale(1)">
-						<agree-radio :isAgree="formData.sj_see == 1"></agree-radio>
-						<text class="option-text">不允许</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 服务时间 -->
-			<view class="form-item">
-				<text class="form-label required">服务时长</text>
-				<input type="number" v-model="formData.server_time" placeholder="请输入服务时间"
-					placeholder-class="placeholder" class="form-input" />
-				<text class="pr-240">分钟</text>
-			</view>
-
-			<!-- 服务简介 -->
-			<!-- <view class="form-item textarea-item">
-        <text class="form-label">服务简介</text>
-        <textarea 
-          v-model="formData.detail"
-          placeholder="详细描述商品的购买详情、使用情况及出售原因能够更快的出售商品哦~"
-          placeholder-class="placeholder"
-          class="form-textarea"
-		  maxlength="-1"
-        />
-      </view> -->
-
-			<view class="form-step">
-				<view class="form-item">
-					<text class="form-label">图文详情</text>
-					<view class="form-detail">
-						<text @click="goImgAndText">{{
-              formData.graphic_details ? "已设置" : "去设置"
-            }}</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 服务简介 -->
-			<view class="detail-card">
-				<view class="detail-title">
-					<text class="form-label">服务简介</text>
-				</view>
-
-				<view class="detail-row">
-					<text class="form-label required">服务功效</text>
-					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务功效"
-							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.effect || '').length}}/200</text>
-					</view>
-				</view>
-
-				<view class="detail-row">
-					<text class="form-label required">适用人群</text>
-					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.crowd"
-							placeholder="请输入不适用人群，例如：未成年人/孕妇不适用" placeholder-class="placeholder"
-							maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.crowd || '').length}}/200</text>
-					</view>
-				</view>
-
-				<view class="detail-row">
-					<text class="form-label">产品清单</text>
-					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.product" placeholder="请输入产品清单"
-							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.product || '').length}}/200</text>
-					</view>
-				</view>
-
-				<view class="detail-row">
-					<text class="form-label">适用范围</text>
-					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.scope" placeholder="请输入使用时间/适用人数"
-							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.scope || '').length}}/200</text>
-					</view>
-				</view>
-
-				<view class="detail-row">
-					<text class="form-label">温馨提示</text>
-					<view class="detail-textarea-wrap">
-						<textarea class="detail-textarea" v-model="detailForm.tips" placeholder="请输入其他注意事项"
-							placeholder-class="placeholder" maxlength="200"></textarea>
-						<text class="detail-count">{{(detailForm.tips || '').length}}/200</text>
-					</view>
-				</view>
-			</view>
-			<view class="form-step">
-				<view class="form-item">
-					<text class="form-label required">服务流程</text>
-					<text @click="addStep">添加</text>
-				</view>
-				<view class="step" v-for="(item, i) in formData.process">
-					<text class="form-label">第{{ i + 1 }}步</text>
-					<input type="text" class="step-inp" v-model="formData.process[i].text" />
-					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/delete_icon.png"
-						class="delete-icon" mode="aspectFit" @click="deleteStep(i)"></image>
-				</view>
-			</view>
-
-			<!-- 购买须知 -->
-			<!-- <view class="form-item textarea-item">
-        <text class="form-label">购买须知</text>
-        <textarea 
-          v-model="formData.purchase_notes"
-          placeholder="详细描述商品的购买详情、使用情况及出售原因能够更快的出售商品哦~"
-          placeholder-class="placeholder"
-          class="form-textarea"
-		  maxlength="-1"
-        />
-      </view> -->
-			<!-- <circle-progress 
-	       :progress="progress"
-	       :size="300"
-	       :strokeWidth="15"
-	       color="rgba(252, 67, 124, 1)"
-	       backgroundColor="rgba(245, 245, 245, 1)"
-	     /> -->
-
-			<!-- 上传短视频 -->
-			<view class="form-item-up upload-item">
-				<view>
-					<text class="form-label">上传短视频</text>
-					<text class="upload-tip">(仅可上传1个视频)</text>
-				</view>
-				<!-- <upload-video
-			@addVideo="addVideo"
-			@deleteVideo="deleteVideo"
-			:video="formData.video"></upload-video> -->
-				<ali-oss-uploader :max-count="1" :max-size="100" :type="artisanType + 1"
-					:user-id="formData.publish_user_id" :width="'654rpx'" :kind="2" :file-string="formData.video"
-					accept="video/*" button-text="上传视频" @success="uploadVideoSuc" @error="uploadVideoErr"
-					@delete="uploadVideoDel" @ckeckisShowPer="ckeckisShowPer" @ckecknowQer="ckecknowQer">
-				</ali-oss-uploader>
-			</view>
-
-			<!-- 服务图片 -->
-			<view class="form-item-up upload-item">
-				<view>
-					<text class="form-label required">服务图片</text>
-					<text class="upload-tip">(仅可上传9个图片)</text>
-				</view>
-				<!-- <upload-img
-        	:photo="formData.photo"
-        	:maxNum="9"
-			:width="'654rpx'"
-        	@addImg="addImg"
-        	@deleteImage="deleteImage"></upload-img> -->
-				<ali-oss-uploader v-model="formData.photo" :max-count="9" :max-size="5" :width="'654rpx'"
-					:type="artisanType + 1" :user-id="formData.publish_user_id" button-text="上传图片"
-					tips="最多上传3张图片，每张不超过5MB" @success="onUploadSuccess" @error="onUploadError" @delete="onFileDelete"
-					@ckeckisShowPer="ckeckisShowPer" @ckecknowQer="ckecknowQer">
-				</ali-oss-uploader>
-			</view>
-		</view>
-
-		<!-- 底部按钮 -->
-		<view class="bottom-buttons">
-			<button class="btn-draft" @click="saveDraft" v-if="!state || state == 0">
-				存草稿
-			</button>
-			<button class="btn-submit" @click="submitForm">提交</button>
-		</view>
-
-		<!-- 服务类型选择器 -->
-		<popup-picker :show="showServiceTypePicker" title="选择服务类型" :columns="[serviceTypes]"
-			:value="[selectedServiceTypeIndex]" @close="showServiceTypePicker = false"
-			@confirm="handleServiceTypeConfirm" />
-
-		<!-- 服务分类选择器 -->
-		<PopupPickerMy :show="showCategoryPicker" title="选择服务分类" :columns="[categoryAll]" :value="selectedCategoryIndex"
-			@close="showCategoryPicker = false" @confirm="handleCategoryConfirm" />
-		<view class="mask" v-if="isShow" @click="isShow = false"></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>
-
-		<!-- 新增上门提醒弹窗-->
-		<transition name="fade">
-			<view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
-				<view class="popup-content2" @click.stop>
-					<view class="popup-title">提示</view>
-					<view class="popup-message">此服务是需要上门服务的哦～</view>
-					<view class="popup-buttons">
-						<view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
-						<view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
-					</view>
-				</view>
-			</view>
-		</transition>
-
-	</view>
-</template>
-
-<script>
-	import request from "../../utils/request";
-	import PopupPicker from "@/components/popup-picker/popup-picker.vue";
-	import PopupPickerMy from "@/components/popup-picker/PopupPickerMy.vue";
-	import CircleProgress from "@/components/circle-progress/circle-progress.vue";
-	import sparkMD5 from "spark-md5"; // 引入MD5计算库
-	import {
-		debounce
-	} from "@/utils/debounce.js";
-	import AliOssUploader from "../../components/ali-oss-uploader/ali-oss-uploader.vue";
-	import permissionUtils from "../../utils/per";
-	import locationService from "../../utils/locationService";
-	import _public from "../../utils/public";
-
-	export default {
-		components: {
-			PopupPicker,
-			CircleProgress,
-			AliOssUploader,
-			PopupPickerMy,
-		},
-		data() {
-			return {
-				showReminderPopup: false,
-				artisanType: getApp().globalData.artisanType,
-				nowQer: "xc",
-				progress: 0,
-				isShow: false,
-				state: null,
-				isShowPer: false,
-				formData: {
-					publish_user_id: null,
-					server_kind: getApp().globalData.artisanType,
-					title: "",
-					server_price: "",
-					line_price: '',
-					server_time: "",
-					first_class_id: "",
-					second_class_id: "",
-					detail: [],
-					process: [],
-					video: "",
-					photo: [],
-					graphic_details: "",
-					sj_see: null, // 1代表商家端不可见  2代表商家端可见
-					// 新增的五个独立字段
-					efficacy: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					prompt: "",
-				},
-				ratio: null,
-				// 服务简介部分
-				detailForm: {
-					effect: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					tips: "",
-				},
-				detailOtherList: [],
-
-				serviceTypes: [], // 服务分类
-				categoryAll: [],
-				showServiceTypePicker: false,
-				showCategoryPicker: false,
-				selectedServiceTypeIndex: 0,
-				selectedCategoryIndex: [0],
-				serviceType: "",
-				category: "",
-				imagesList: [], // 临时图片地址
-				addDetailList: [],
-				showCategory: false,
-				showProgress: false,
-				publish_user_id: null,
-				isAdd: false,
-				isDraft: false,
-			};
-		},
-		onShow() {
-			uni.$on("updateGraphicDetails", (data) => {
-				this.$set(this.formData, "graphic_details", JSON.stringify(data));
-				// 这里可以添加其他处理逻辑
-			});
-		},
-		onLoad(options) {
-			this.state = options.state || "";
-			if (options.id) {
-				this.formData.id = options.id;
-				this.getInit();
-			} else {
-				request.post("/sj/firstclass", {}).then((res) => {
-					this.serviceTypes = this.serviceTypes.concat(res.data);
-				});
-			}
-			// 判断是否显示上门提醒弹窗
-			const notShow = uni.getStorageSync('addServiceReminderNotShow');
-			// if (!notShow) {
-			// 	this.showReminderPopup = true;
-			// }
-			this.getUserInfo();
-		},
-		computed: {
-			showShopPrice() {
-				return (
-					this.artisanType == 1 &&
-					this.formData.sj_see == 2 &&
-					this.formData.server_price &&
-					this.formData.first_class_id
-				);
-			},
-			shopPrice() {
-				return _public.roundUpToTwoDecimals(
-					this.formData.server_price,
-					this.ratio
-				);
-			},
-		},
-		methods: {
-			inpPrice2(e) {
-				let that = this;
-				let value = e.detail.value;
-
-				// 1. 移除非数字和小数点
-				value = value.replace(/[^\d.]/g, '');
-
-				// 2. 确保只有一个小数点
-				const parts = value.split('.');
-				if (parts.length > 2) {
-					value = parts[0] + '.' + parts.slice(1).join('');
-				}
-
-				// 3. 限制小数点后最多一位
-				if (parts.length > 1) {
-					value = parts[0] + '.' + parts[1].slice(0, 2);
-				}
-				// 4. 如果以小数点开头，前面补0
-				if (value.startsWith('.')) {
-					value = '0' + value;
-				}
-				that.$set(that.formData, 'line_price', value);
-			},
-			// 服务简介部分
-			initDetailForm(detail = []) {
-				// 先重置 detailForm 为空
-				this.detailForm = {
-					effect: "",
-					crowd: "",
-					product: "",
-					scope: "",
-					tips: "",
-				};
-				this.detailOtherList = [];
-
-				// 优先从后端返回的新字段赋值
-				if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
-				if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
-				if (this.formData.product) this.detailForm.product = this.formData.product;
-				if (this.formData.scope) this.detailForm.scope = this.formData.scope;
-				if (this.formData.prompt) this.detailForm.tips = this.formData.prompt;
-
-				// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
-				if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
-					(detail || []).forEach((item) => {
-						if (item.title === "服务功效") {
-							this.detailForm.effect = item.text || "";
-						} else if (item.title === "适用人群") {
-							this.detailForm.crowd = item.text || "";
-						} else if (item.title === "产品清单") {
-							this.detailForm.product = item.text || "";
-						} else if (item.title === "适用范围" || item.title === "使用范围") {
-							this.detailForm.scope = item.text || "";
-						} else if (item.title === "温馨提示") {
-							this.detailForm.tips = item.text || "";
-						} else {
-							this.detailOtherList.push({
-								title: item.title || "",
-								text: item.text || "",
-								photo: item.photo || "",
-							});
-						}
-					});
-				}
-			},
-
-			syncDetailForm() {
-				// 将 detailForm 的值映射到 formData 的新字段
-				this.formData.efficacy = (this.detailForm.effect || "").trim();
-				this.formData.crowd = (this.detailForm.crowd || "").trim();
-				this.formData.product = (this.detailForm.product || "").trim();
-				this.formData.scope = (this.detailForm.scope || "").trim();
-				this.formData.prompt = (this.detailForm.tips || "").trim();
-			},
-
-			checkDetailForm() {
-				if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
-					uni.showToast({
-						title: "请输入服务功效",
-						icon: "none",
-					});
-					return false;
-				}
-				if (!this.detailForm.crowd || !this.detailForm.crowd.trim()) {
-					uni.showToast({
-						title: "请输入适用人群",
-						icon: "none",
-					});
-					return false;
-				}
-				// if (!this.detailForm.product || !this.detailForm.product.trim()) {
-				// 	uni.showToast({
-				// 		title: "请输入产品清单",
-				// 		icon: "none",
-				// 	});
-				// 	return false;
-				// }
-				return true;
-			},
-
-
-			closeReminderPopup(notShowAgain) {
-				console.log('关闭弹窗，不再提示：', notShowAgain);
-				if (notShowAgain) {
-					uni.setStorageSync('addServiceReminderNotShow', true);
-				}
-				this.showReminderPopup = false;
-			},
-			goImgAndText() {
-				uni.navigateTo({
-					url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,
-				});
-			},
-			ckeckisShowPer(value) {
-				console.log("ckeckisShowPer==========", value);
-				this.isShowPer = value;
-			},
-			ckecknowQer(value) {
-				this.nowQer = value;
-			},
-			addVideo(value) {
-				this.formData.video = value;
-			},
-			// addImg(arr) {
-			// 	this.formData.photo = this.formData.photo.concat(arr);
-			// },
-			// deleteImage(index) {
-			//   this.formData.photo.splice(index, 1)
-			// },
-			onUploadSuccess(file) {
-				console.log("添加的图片", this.formData.photo);
-			},
-			onUploadError(error) {
-				console.error("上传失败:", error);
-				uni.showToast({
-					title: "上传失败",
-					icon: "none",
-				});
-			},
-			onFileDelete(file, index) {
-				console.log("删除文件:", this.formData.photo, index);
-			},
-			uploadVideoSuc(file) {
-				this.formData.video = file;
-			},
-			uploadVideoErr() {},
-			uploadVideoDel() {
-				this.formData.video = null;
-			},
-			async getInit() {
-				const firstclass = await request.post("/sj/firstclass");
-				this.serviceTypes = this.serviceTypes.concat(firstclass.data);
-
-				await request
-					.post("/user/serverdetail", {
-						id: this.formData.id
-					})
-					.then((res) => {
-						// 直接合并所有字段，避免遗漏
-						this.formData = {
-							...this.formData,
-							...res.data
-						};
-						// 确保 detail 数组被保留（可能用于兼容）
-						this.formData.detail = res.data.detail || [];
-						// 调用初始化方法，它会优先使用新字段
-						this.initDetailForm(res.data.detail || []);
-						// 处理分类显示
-						firstclass.data.filter((item, i) => {
-							if (item.id == this.formData.first_class_id) {
-								this.selectedServiceTypeIndex = i;
-								this.serviceType = item.title;
-								this.ratio = item.ratio;
-							}
-						});
-					});
-				request
-					.post("/user/secondclass", {
-						id: this.formData.first_class_id,
-					})
-					.then((result) => {
-						if (result.data.length == 0 || !result.data) {
-							this.showCategory = false;
-						} else {
-							this.categoryAll = result.data;
-							this.categoryAll.filter((e, i) => {
-								if (e.id == this.formData.second_class_id) {
-									this.selectedCategoryIndex = i;
-									this.category = e.title;
-								}
-							});
-							this.showCategory = true;
-						}
-					});
-			},
-			getUserInfo() {
-				const type = this.artisanType == 1 ? 2 : this.artisanType == 2 ? 3 : 1;
-				request
-					.post("/user/getuser", {
-						type: type,
-					})
-					.then((result) => {
-						this.formData.publish_user_id = result.data.id;
-					});
-			},
-			// 是否在商家端售卖
-			changeSale(value) {
-				this.formData.sj_see = value;
-			},
-			// 输入价格
-			inpPrice(e) {
-				let that = this;
-				let value = e.detail.value;
-
-				// 1. 移除非数字和小数点
-				value = value.replace(/[^\d.]/g, "");
-
-				// 2. 确保只有一个小数点
-				const parts = value.split(".");
-				if (parts.length > 2) {
-					value = parts[0] + "." + parts.slice(1).join("");
-				}
-
-				// 3. 限制小数点后最多一位
-				if (parts.length > 1) {
-					value = parts[0] + "." + parts[1].slice(0, 2);
-				}
-				// 4. 如果以小数点开头，前面补0
-				if (value.startsWith(".")) {
-					value = "0" + value;
-				}
-				that.$set(that.formData, "server_price", value);
-			},
-			deleteStep(i) {
-				this.formData.process.splice(i, 1);
-			},
-			addStep() {
-				let i = this.formData.process.length + 1;
-				let arr = {
-					title: "第" + i + "步",
-					text: "",
-					photo: "",
-				};
-				this.formData.process.push(arr);
-			},
-
-			// 删除视频
-			deleteVideo() {
-				this.formData.video = "";
-			},
-
-			// 保存草稿
-			saveDraft: debounce(function() {
-				if (this.isDraft) return;
-				this.syncDetailForm();
-				const {
-					title,
-					server_price,
-					line_price,
-					server_time,
-					first_class_id,
-					second_class_id,
-					detail,
-					process,
-					video,
-					photo,
-				} = this.formData;
-				let item = {
-					title,
-					server_price,
-					line_price,
-					server_time,
-					first_class_id,
-					second_class_id,
-					detail,
-					process,
-					video,
-					photo,
-				};
-				// 检查是否所有字段都为空
-				const isEmpty = Object.values(item).every((value) => {
-					if (Array.isArray(value)) {
-						return value.length === 0;
-					}
-					return !value;
-				});
-
-				if (isEmpty) {
-					uni.showToast({
-						title: "请至少填写一项内容",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 实现保存草稿逻辑
-				this.formData.state = 0;
-				let url = null;
-				if (!this.formData.id) {
-					url = "/user/serveradd";
-				} else {
-					url = "/user/serverchange";
-				}
-				request.post(url, this.formData).then((res) => {
-					if (res.state == 1) {
-						this.isDraft = true;
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2]; // 上一个页面
-						uni.showToast({
-							title: res.msg,
-							icon: "success",
-							duration: 1000,
-						});
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1,
-								success: () => {
-									prevPage.$vm.currentTab = 3;
-									prevPage.$vm.state = 0;
-									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-								},
-							});
-						}, 500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-						this.isDraft = false;
-					}
-				});
-			}, 500),
-
-			// 提交表单
-			submitForm: debounce(function() {
-				if (this.isAdd) return;
-				this.syncDetailForm();
-				// 表单验证
-
-				if (!this.formData.title) {
-					uni.showToast({
-						title: "请输入服务名称",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.line_price) {
-					uni.showToast({
-						title: '请输入服务定价',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.formData.server_price) {
-					uni.showToast({
-						title: '请输入服务售价',
-						icon: 'none'
-					})
-					return
-				}
-
-				if (!this.formData.first_class_id) {
-					uni.showToast({
-						title: "请选择服务分类",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.showCategory && !this.formData.second_class_id) {
-					uni.showToast({
-						title: "请选择服务子类",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.server_time) {
-					uni.showToast({
-						title: "请输入服务时长",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.formData.server_time < 10) {
-					uni.showToast({
-						title: "服务时长最短为10分钟",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.formData.server_time > 240) {
-					uni.showToast({
-						title: "服务时长最长为240分钟",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.formData.sj_see && this.artisanType == 1) {
-					uni.showToast({
-						title: "请选择是否允许在门店端售卖",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 检查服务简介
-				if (!this.checkDetailForm()) {
-					return;
-				}
-				this.syncDetailForm();
-
-				// 检查服务流程数组
-				if (this.formData.process && this.formData.process.length > 0) {
-					for (let item of this.formData.process) {
-						if (!item.text) {
-							uni.showToast({
-								title: "请完善服务流程内容",
-								icon: "none",
-							});
-							return;
-						}
-					}
-				} else {
-					uni.showToast({
-						title: "请添加服务流程内容",
-						icon: "none",
-					});
-					return;
-				}
-
-				// 检查视频和图片
-				// if (!this.formData.video) {
-				//   uni.showToast({
-				//     title: '请上传服务视频',
-				//     icon: 'none'
-				//   })
-				//   return
-				// }
-				if (!this.formData.photo || this.formData.photo.length === 0) {
-					uni.showToast({
-						title: "请上传服务图片",
-						icon: "none",
-					});
-					return;
-				}
-				if (this.artisanType == 2) {
-					delete this.formData.sj_see;
-				}
-				// 提交表单逻辑
-				delete this.formData.state;
-				let url = null;
-				if (!this.formData.id) {
-					url = "/user/serveradd";
-				} else {
-					url = "/user/serverupdate";
-				}
-				request.post(url, this.formData).then((res) => {
-					if (res.state == 1) {
-						const pages = getCurrentPages();
-						const prevPage = pages[pages.length - 2]; // 上一个页面
-						uni.showToast({
-							title: res.msg,
-							icon: "success",
-							duration: 600,
-							mask: true,
-						});
-						this.isAdd = true;
-						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1,
-								success: () => {
-									prevPage.$vm.currentTab = 1;
-									prevPage.$vm.state = 1;
-									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
-								},
-							});
-						}, 500);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-						});
-						this.isAdd = false;
-					}
-				});
-			}, 500),
-
-			// 打开服务分类
-			openServiceTypePicker() {
-				console.log("open");
-				// 实现分类选择逻辑
-				this.showServiceTypePicker = true;
-			},
-
-			// 打开服务子类选择器
-			openCategoryPicker() {
-				// 实现子类选择逻辑
-				if (!this.formData.first_class_id) {
-					uni.showToast({
-						title: "请先选择服务分类",
-						icon: "none",
-					});
-				} else {
-					this.showCategoryPicker = true;
-				}
-			},
-
-			// 处理服务类型选择
-			handleServiceTypeConfirm(e) {
-				console.log("e", e);
-				const selectedType = e.items[0];
-				if (this.formData.first_class_id == selectedType.id) return;
-				this.formData.first_class_id = selectedType.id;
-				this.serviceType = selectedType.title;
-				this.ratio = selectedType.ratio;
-				let id = selectedType.id;
-				request
-					.post("/user/secondclass", {
-						id,
-					})
-					.then((res) => {
-						if (res.data.length == 0 || !res.data) {
-							this.showCategory = false;
-							this.selectedCategoryIndex = [0];
-						} else {
-							this.categoryAll = res.data;
-							this.showCategory = true;
-							this.selectedCategoryIndex = [0];
-						}
-					});
-			},
-
-			// 处理服务分类选择
-			handleCategoryConfirm(e) {
-				console.log(e, "selectedCategory", this.categoryAll);
-				const selectedCategory = e.item;
-				this.formData.second_class_id = selectedCategory.id;
-				this.category = selectedCategory.title;
-			},
-		},
-	};
-</script>
-
-<style lang="less">
-	.add-service {
-		padding: 24rpx 24rpx 0;
-		box-sizing: border-box;
-	}
-
-	.form-container {
-		margin-top: 20rpx;
-	}
-
-	.form-item {
-		background-color: #fff;
-		padding: 24rpx;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		margin-bottom: 24rpx;
-	}
-
-	.price-tip {
-		width: 100%;
-		margin-top: 40rpx;
-
-		.price-tip-card {
-			padding: 8rpx 12rpx;
-			background: #FDF0F0;
-			border-radius: 8rpx;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #EE4853;
-			line-height: 33rpx;
-		}
-	}
-
-	.shopsale-box {
-		flex-flow: column;
-		justify-content: space-between;
-		align-items: space-between;
-	}
-
-	.shopsale-change {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 24rpx;
-	}
-
-	.shopsale-option {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.shopsale-option:last-child {
-		margin-left: 220rpx;
-	}
-
-	.option-text {
-		padding-left: 16rpx;
-	}
-
-	.form-item-up {
-		background-color: #fff;
-		padding: 24rpx;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: space-between;
-		align-items: flex-start;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-		margin-bottom: 24rpx;
-	}
-
-	.form-label {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.form-input {
-		flex: 1;
-		height: 40rpx;
-		font-size: 28rpx;
-		color: #333333;
-		align-items: center;
-		text-align: center;
-	}
-
-	.form-right {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.form-value {
-		font-size: 28rpx;
-		color: #333333;
-		margin-right: 16rpx;
-	}
-
-	.placeholder {
-		font-weight: 400;
-		font-size: 28rpx;
-		color: #999999;
-	}
-
-	.textarea-item {
-		padding-bottom: 30rpx;
-	}
-
-	.form-textarea {
-		flex: 1;
-		height: 198rpx;
-		font-size: 28rpx;
-		color: #333333;
-		line-height: 1.5;
-		margin-left: 32rpx;
-	}
-
-	.upload-item {
-		padding-bottom: 30rpx;
-	}
-
-	.upload-tip {
-		font-size: 24rpx;
-		color: #999999;
-		margin-left: 10rpx;
-	}
-
-	.upload-content {
-		margin-top: 20rpx;
-		position: relative;
-	}
-
-	.progress-box {
-		width: 204rpx;
-		height: 204rpx;
-		background-color: rgba(0, 0, 0, 0.5);
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: 99;
-		display: flex;
-		flex-flow: column nowrap;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.progress-text {
-		font-size: 42rpx;
-		color: #ffffff;
-		font-weight: 500;
-	}
-
-	.progress-lable {
-		font-size: 28rpx;
-		color: #ffffff;
-	}
-
-	.progress-box progress {
-		/* width: 204rpx; */
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-	}
-
-	.video-preview,
-	.image-preview,
-	.upload-btn {
-		width: 200rpx;
-		height: 200rpx;
-		margin-right: 10rpx;
-		margin-bottom: 20rpx;
-		position: relative;
-	}
-
-	.preview-video,
-	.preview-image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 8rpx;
-	}
-
-	.upload-btn {
-		border: 2rpx dashed #dddddd;
-		border-radius: 8rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.plus-icon {
-		font-size: 60rpx;
-		color: #999999;
-	}
-
-	.delete-btn {
-		position: absolute;
-		top: -20rpx;
-		right: -20rpx;
-		width: 40rpx;
-		height: 40rpx;
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 50%;
-		color: #ffffff;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-	}
-
-	.bottom-buttons {
-		/* position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0; */
-		height: 100rpx;
-		padding: 40rpx 0 64rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.btn-draft,
-	.btn-submit {
-		width: 334rpx;
-		height: 76rpx;
-		line-height: 76rpx;
-		text-align: center;
-		font-size: 28rpx;
-		border-radius: 40rpx;
-		margin: 0 24rpx;
-	}
-
-	.btn-draft {
-		background-color: #ffffff;
-		color: #e8101e;
-		border: 2rpx solid #e8101e;
-		box-sizing: border-box;
-	}
-
-	.btn-submit {
-		background-color: #e8101e;
-		color: #ffffff;
-		width: 705rpx;
-		height: 76rpx;
-	}
-
-	.form-step {
-		background-color: #fff;
-		margin-bottom: 24rpx;
-	}
-
-	.form-step .form-item {
-		margin-bottom: 0;
-	}
-
-	.step {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		align-items: center;
-		padding: 0 24rpx 24rpx;
-	}
-
-	.step-inp {
-		flex: 1;
-		font-size: 28rpx;
-		color: #333333;
-		margin-left: 38rpx;
-		padding: 0 24rpx;
-		background-color: rgba(230, 230, 230, 0.5);
-	}
-
-	.step-textarea {
-		font-size: 24rpx;
-		flex: 1;
-		height: 70rpx;
-		border-radius: 6rpx;
-		margin-left: 38rpx;
-		padding: 24rpx;
-		background-color: rgba(230, 230, 230, 0.5);
-	}
-
-	/* 选择器触发按钮样式 */
-	.picker-trigger {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 24rpx 32rpx;
-		background-color: #ffffff;
-		border-radius: 12rpx;
-		margin-bottom: 24rpx;
-	}
-
-	.picker-label {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.picker-value {
-		font-size: 28rpx;
-		color: #666666;
-	}
-
-	.picker-arrow {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 16rpx;
-	}
-
-	.delete-icon {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 24rpx;
-	}
-
-	.form-detail {
-		position: relative;
-	}
-
-	.required::before {
-		content: "*";
-		color: #ff0000;
-		margin-right: 4rpx;
-	}
-
-	.step-inp,
-	.form-input {
-		height: 60rpx;
-	}
-
-	// 服务简介相关
-	.detail-card {
-		background: #ffffff;
-		border-radius: 20rpx;
-		padding: 0 24rpx 8rpx;
-		margin-bottom: 24rpx;
-		box-sizing: border-box;
-		overflow: hidden;
-	}
-
-	.detail-title {
-		padding: 24rpx 0 25rpx;
-	}
-
-	.detail-title .form-label {
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #333;
-		line-height: 40rpx;
-	}
-
-	.detail-row {
-		padding: 0 0 36rpx;
-	}
-
-	.detail-row .form-label {
-		display: block;
-		margin-bottom: 20rpx;
-		line-height: 40rpx;
-	}
-
-	.detail-textarea-wrap {
-		position: relative;
-		background: #f7f7f7;
-		border-radius: 16rpx;
-		padding: 24rpx 24rpx 52rpx;
-		box-sizing: border-box;
-	}
-
-	.detail-textarea {
-		width: 100%;
-		height: 108rpx;
-		min-height: 108rpx;
-		margin: 0;
-		padding: 0;
-		background: transparent;
-		border: 0;
-		font-size: 28rpx;
-		line-height: 40rpx;
-		color: #333333;
-		box-sizing: border-box;
-	}
-
-	.detail-count {
-		position: absolute;
-		right: 24rpx;
-		bottom: 16rpx;
-		font-size: 22rpx;
-		color: #999999;
-		line-height: 32rpx;
-	}
-
-	/* 平台特定样式 */
-	/* #ifdef H5 */
-
-	.form-input,
-	.form-textarea {
-		outline: none;
-	}
-
-	.upload-btn {
-		cursor: pointer;
-	}
-
-	/* #endif */
-
-	/* #ifdef APP-PLUS */
-	.form-input {
-		height: 90rpx;
-	}
-
-	.permission.transform {
-		top: calc(var(--status-bar-height) + 88rpx + 30rpx);
-		opacity: 1;
-		visibility: visible;
-	}
-
-	/* #endif */
-
-	/* #ifdef MP-WEIXIN */
-	.form-input {
-		height: 80rpx;
-	}
-
-	.bottom-buttons {
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	/* #endif */
-	.tip {
-		padding: 20rpx 30rpx;
-		background: #feefec;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #f31d2f;
-		line-height: 42rpx;
-		text-align: left;
-		font-style: normal;
-
-		text-align: center;
-
-		.tip-icon {
-			width: 34rpx;
-			height: 34rpx;
-			margin-right: 10rpx;
-			transform: translateY(6rpx);
-		}
-	}
-
-	/* 淡入淡出动画 */
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity 0.3s;
-	}
-
-	.fade-enter,
-	.fade-leave-to {
-		opacity: 0;
-	}
-
-	.popup-mask2 {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-		// z-index: 1000;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.popup-content2 {
-		width: 600rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		overflow: hidden;
-		padding: 40rpx 30rpx;
-		box-sizing: border-box;
-	}
-
-	.popup-title {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #333333;
-		text-align: center;
-		margin-bottom: 20rpx;
-	}
-
-	.popup-message {
-		font-size: 30rpx;
-		color: #666666;
-		text-align: center;
-		margin-top: 40rpx;
-		margin-bottom: 30rpx;
-		line-height: 1.5;
-	}
-
-	.popup-buttons {
-		display: flex;
-		flex-flow: row nowrap;
-		justify-content: space-between;
-		padding: 20rpx 0 0 0;
-		gap: 60rpx;
-	}
-
-	.popup-btn {
-		flex: 1;
-		height: 80rpx;
-		line-height: 80rpx;
-		text-align: center;
-		font-size: 26rpx;
-		border-radius: 40rpx;
-	}
-
-	.popup-btn-know {
-		background-color: #e8101e;
-		color: #ffffff;
-	}
-
-	.popup-btn-notshow {
-		background-color: #ffffff;
-		color: #e8101e;
-		border: 1rpx #e8101e solid;
-	}
+<template>
+	<view class="add-service">
+		<view class="fixed-header">
+			<view class="tip" v-if="formData.back_text && formData.state == 4">
+				<image
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/390d9d12-3c30-4639-9ac3-7b604b606b6d.png"
+					class="tip-icon"></image>
+				<text>{{ formData.back_text }}</text>
+			</view>
+		</view>
+
+		<!-- 表单区域 -->
+		<view class="form-container">
+			<!-- 服务名称 -->
+			<view class="form-item">
+				<text class="form-label required">服务名称</text>
+				<input type="text" v-model="formData.title" placeholder="请输入服务名称" placeholder-class="placeholder"
+					class="form-input" />
+			</view>
+
+			<!-- 服务价格 -->
+			<view class="form-item" style="flex-wrap: wrap;">
+				<text class="form-label required">服务定价</text>
+				<input type="digit" v-model.number="formData.line_price" placeholder="请输入定价，最多两位小数"
+					placeholder-class="placeholder" class="form-input" @input="inpPrice2" @blur="inpPrice2"
+					@confirm="inpPrice2" step="0.01" />
+				<view class="price-tip">
+					<text class="price-tip-card">服务的基础定价，未参与任何优惠的价格</text>
+				</view>
+			</view>
+
+			<!-- 服务价格 -->
+			<view class="form-item" style="flex-wrap: wrap;">
+				<text class="form-label required">服务售价</text>
+				<input type="digit" v-model.number="formData.server_price" placeholder="请输入售价，最多两位小数"
+					placeholder-class="placeholder" class="form-input" @input="inpPrice" @blur="inpPrice"
+					@confirm="inpPrice" step="0.01" />
+				<view class="price-tip">
+					<text class="price-tip-card">服务参与单品优惠后的价格</text>
+				</view>
+			</view>
+
+			<!-- 服务分类 -->
+			<view class="form-item">
+				<text class="form-label required">服务分类</text>
+				<view class="form-right" @click="openServiceTypePicker">
+					<text :class="[
+              'form-value',
+              formData.first_class_id ? '' : 'placeholder',
+            ]">
+						{{ serviceType || "选择分类" }}
+					</text>
+					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
+						class="arrow-right" mode="aspectFit"></image>
+				</view>
+			</view>
+
+			<!-- 服务子类 -->
+			<view class="form-item" v-if="showCategory">
+				<text class="form-label required">服务子类</text>
+				<view class="form-right" @click="openCategoryPicker">
+					<text :class="[
+              'form-value',
+              formData.second_class_id ? '' : 'placeholder',
+            ]">
+						{{ category || "选择子类" }}
+					</text>
+					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/arrow_right.png"
+						class="arrow-right" mode="aspectFit"></image>
+				</view>
+			</view>
+
+			<!-- 是否允许该服务在门店售卖 -->
+			<view class="form-item shopsale-box" v-if="artisanType == 1">
+				<view class="form-label required">
+					是否允许该服务在门店端售卖，以供门店下单购买。
+					{{
+            showShopPrice
+              ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
+              : ""
+          }}
+					<text style="color: #e8101e" v-if="showShopPrice">{{
+            shopPrice
+          }}</text>
+					{{ showShopPrice ? "元。" : "" }}
+				</view>
+				<view class="shopsale-change">
+					<view class="shopsale-option" @click="changeSale(2)">
+						<agree-radio :isAgree="formData.sj_see == 2"></agree-radio>
+						<text class="option-text">允许</text>
+					</view>
+					<view class="shopsale-option" @click="changeSale(1)">
+						<agree-radio :isAgree="formData.sj_see == 1"></agree-radio>
+						<text class="option-text">不允许</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 服务时间 -->
+			<view class="form-item">
+				<text class="form-label required">服务时长</text>
+				<input type="number" v-model="formData.server_time" placeholder="请输入服务时间"
+					placeholder-class="placeholder" class="form-input" />
+				<text class="pr-240">分钟</text>
+			</view>
+
+			<!-- 服务简介 -->
+			<!-- <view class="form-item textarea-item">
+        <text class="form-label">服务简介</text>
+        <textarea 
+          v-model="formData.detail"
+          placeholder="详细描述商品的购买详情、使用情况及出售原因能够更快的出售商品哦~"
+          placeholder-class="placeholder"
+          class="form-textarea"
+		  maxlength="-1"
+        />
+      </view> -->
+
+			<view class="form-step">
+				<view class="form-item">
+					<text class="form-label">图文详情</text>
+					<view class="form-detail">
+						<text @click="goImgAndText">{{
+              formData.graphic_details ? "已设置" : "去设置"
+            }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 服务简介 -->
+			<view class="detail-card">
+				<view class="detail-title">
+					<text class="form-label">服务简介</text>
+				</view>
+
+				<view class="detail-row">
+					<text class="form-label required">服务功效</text>
+					<view class="detail-textarea-wrap">
+						<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务功效"
+							placeholder-class="placeholder" maxlength="200"></textarea>
+						<text class="detail-count">{{(detailForm.effect || '').length}}/200</text>
+					</view>
+				</view>
+
+				<view class="detail-row">
+					<text class="form-label required">适用人群</text>
+					<view class="detail-textarea-wrap">
+						<textarea class="detail-textarea" v-model="detailForm.crowd"
+							placeholder="请输入不适用人群，例如：未成年人/孕妇不适用" placeholder-class="placeholder"
+							maxlength="200"></textarea>
+						<text class="detail-count">{{(detailForm.crowd || '').length}}/200</text>
+					</view>
+				</view>
+
+				<view class="detail-row">
+					<text class="form-label">产品清单</text>
+					<view class="detail-textarea-wrap">
+						<textarea class="detail-textarea" v-model="detailForm.product" placeholder="请输入产品清单"
+							placeholder-class="placeholder" maxlength="200"></textarea>
+						<text class="detail-count">{{(detailForm.product || '').length}}/200</text>
+					</view>
+				</view>
+
+				<view class="detail-row">
+					<text class="form-label">适用范围</text>
+					<view class="detail-textarea-wrap">
+						<textarea class="detail-textarea" v-model="detailForm.scope" placeholder="请输入使用时间/适用人数"
+							placeholder-class="placeholder" maxlength="200"></textarea>
+						<text class="detail-count">{{(detailForm.scope || '').length}}/200</text>
+					</view>
+				</view>
+
+				<view class="detail-row">
+					<text class="form-label">温馨提示</text>
+					<view class="detail-textarea-wrap">
+						<textarea class="detail-textarea" v-model="detailForm.tips" placeholder="请输入其他注意事项"
+							placeholder-class="placeholder" maxlength="200"></textarea>
+						<text class="detail-count">{{(detailForm.tips || '').length}}/200</text>
+					</view>
+				</view>
+			</view>
+			<view class="form-step">
+				<view class="form-item">
+					<text class="form-label required">服务流程</text>
+					<text @click="addStep">添加</text>
+				</view>
+				<view class="step" v-for="(item, i) in formData.process">
+					<text class="form-label">第{{ i + 1 }}步</text>
+					<input type="text" class="step-inp" v-model="formData.process[i].text" />
+					<image src="https://mrrplus.oss-cn-beijing.aliyuncs.com/wxstaic/images/delete_icon.png"
+						class="delete-icon" mode="aspectFit" @click="deleteStep(i)"></image>
+				</view>
+			</view>
+
+			<!-- 购买须知 -->
+			<!-- <view class="form-item textarea-item">
+        <text class="form-label">购买须知</text>
+        <textarea 
+          v-model="formData.purchase_notes"
+          placeholder="详细描述商品的购买详情、使用情况及出售原因能够更快的出售商品哦~"
+          placeholder-class="placeholder"
+          class="form-textarea"
+		  maxlength="-1"
+        />
+      </view> -->
+			<!-- <circle-progress 
+	       :progress="progress"
+	       :size="300"
+	       :strokeWidth="15"
+	       color="rgba(252, 67, 124, 1)"
+	       backgroundColor="rgba(245, 245, 245, 1)"
+	     /> -->
+
+			<!-- 上传短视频 -->
+			<view class="form-item-up upload-item">
+				<view>
+					<text class="form-label">上传短视频</text>
+					<text class="upload-tip">(仅可上传1个视频)</text>
+				</view>
+				<!-- <upload-video
+			@addVideo="addVideo"
+			@deleteVideo="deleteVideo"
+			:video="formData.video"></upload-video> -->
+				<ali-oss-uploader :max-count="1" :max-size="100" :type="artisanType + 1"
+					:user-id="formData.publish_user_id" :width="'654rpx'" :kind="2" :file-string="formData.video"
+					accept="video/*" button-text="上传视频" @success="uploadVideoSuc" @error="uploadVideoErr"
+					@delete="uploadVideoDel" @ckeckisShowPer="ckeckisShowPer" @ckecknowQer="ckecknowQer">
+				</ali-oss-uploader>
+			</view>
+
+			<!-- 服务图片 -->
+			<view class="form-item-up upload-item">
+				<view>
+					<text class="form-label required">服务图片</text>
+					<text class="upload-tip">(仅可上传9个图片)</text>
+				</view>
+				<!-- <upload-img
+        	:photo="formData.photo"
+        	:maxNum="9"
+			:width="'654rpx'"
+        	@addImg="addImg"
+        	@deleteImage="deleteImage"></upload-img> -->
+				<ali-oss-uploader v-model="formData.photo" :max-count="9" :max-size="5" :width="'654rpx'"
+					:type="artisanType + 1" :user-id="formData.publish_user_id" button-text="上传图片"
+					tips="最多上传3张图片，每张不超过5MB" @success="onUploadSuccess" @error="onUploadError" @delete="onFileDelete"
+					@ckeckisShowPer="ckeckisShowPer" @ckecknowQer="ckecknowQer">
+				</ali-oss-uploader>
+			</view>
+		</view>
+
+		<!-- 底部按钮 -->
+		<view class="bottom-buttons">
+			<button class="btn-draft" @click="saveDraft" v-if="!state || state == 0">
+				存草稿
+			</button>
+			<button class="btn-submit" @click="submitForm">提交</button>
+		</view>
+
+		<!-- 服务类型选择器 -->
+		<popup-picker :show="showServiceTypePicker" title="选择服务类型" :columns="[serviceTypes]"
+			:value="[selectedServiceTypeIndex]" @close="showServiceTypePicker = false"
+			@confirm="handleServiceTypeConfirm" />
+
+		<!-- 服务分类选择器 -->
+		<PopupPickerMy :show="showCategoryPicker" title="选择服务分类" :columns="[categoryAll]" :value="selectedCategoryIndex"
+			@close="showCategoryPicker = false" @confirm="handleCategoryConfirm" />
+		<view class="mask" v-if="isShow" @click="isShow = false"></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>
+
+		<!-- 新增上门提醒弹窗-->
+		<transition name="fade">
+			<view class="popup-mask2" v-if="showReminderPopup" @click="closeReminderPopup(false)">
+				<view class="popup-content2" @click.stop>
+					<view class="popup-title">提示</view>
+					<view class="popup-message">此服务是需要上门服务的哦～</view>
+					<view class="popup-buttons">
+						<view class="popup-btn popup-btn-notshow" @click="closeReminderPopup(true)">不再提示</view>
+						<view class="popup-btn popup-btn-know" @click="closeReminderPopup(false)">我已知晓</view>
+					</view>
+				</view>
+			</view>
+		</transition>
+
+	</view>
+</template>
+
+<script>
+	import request from "../../utils/request";
+	import PopupPicker from "@/components/popup-picker/popup-picker.vue";
+	import PopupPickerMy from "@/components/popup-picker/PopupPickerMy.vue";
+	import CircleProgress from "@/components/circle-progress/circle-progress.vue";
+	import sparkMD5 from "spark-md5"; // 引入MD5计算库
+	import {
+		debounce
+	} from "@/utils/debounce.js";
+	import AliOssUploader from "../../components/ali-oss-uploader/ali-oss-uploader.vue";
+	import permissionUtils from "../../utils/per";
+	import locationService from "../../utils/locationService";
+	import _public from "../../utils/public";
+
+	export default {
+		components: {
+			PopupPicker,
+			CircleProgress,
+			AliOssUploader,
+			PopupPickerMy,
+		},
+		data() {
+			return {
+				showReminderPopup: false,
+				artisanType: getApp().globalData.artisanType,
+				nowQer: "xc",
+				progress: 0,
+				isShow: false,
+				state: null,
+				isShowPer: false,
+				formData: {
+					publish_user_id: null,
+					server_kind: getApp().globalData.artisanType,
+					title: "",
+					server_price: "",
+					line_price: '',
+					server_time: "",
+					first_class_id: "",
+					second_class_id: "",
+					detail: [],
+					process: [],
+					video: "",
+					photo: [],
+					graphic_details: "",
+					sj_see: null, // 1代表商家端不可见  2代表商家端可见
+					// 新增的五个独立字段
+					efficacy: "",
+					crowd: "",
+					product: "",
+					scope: "",
+					prompt: "",
+				},
+				ratio: null,
+				// 服务简介部分
+				detailForm: {
+					effect: "",
+					crowd: "",
+					product: "",
+					scope: "",
+					tips: "",
+				},
+				detailOtherList: [],
+
+				serviceTypes: [], // 服务分类
+				categoryAll: [],
+				showServiceTypePicker: false,
+				showCategoryPicker: false,
+				selectedServiceTypeIndex: 0,
+				selectedCategoryIndex: [0],
+				serviceType: "",
+				category: "",
+				imagesList: [], // 临时图片地址
+				addDetailList: [],
+				showCategory: false,
+				showProgress: false,
+				publish_user_id: null,
+				isAdd: false,
+				isDraft: false,
+			};
+		},
+		onShow() {
+			uni.$on("updateGraphicDetails", (data) => {
+				this.$set(this.formData, "graphic_details", JSON.stringify(data));
+				// 这里可以添加其他处理逻辑
+			});
+		},
+		onLoad(options) {
+			this.state = options.state || "";
+			if (options.id) {
+				this.formData.id = options.id;
+				this.getInit();
+			} else {
+				request.post("/sj/firstclass", {}).then((res) => {
+					this.serviceTypes = this.serviceTypes.concat(res.data);
+				});
+			}
+			// 判断是否显示上门提醒弹窗
+			const notShow = uni.getStorageSync('addServiceReminderNotShow');
+			// if (!notShow) {
+			// 	this.showReminderPopup = true;
+			// }
+			this.getUserInfo();
+		},
+		computed: {
+			showShopPrice() {
+				return (
+					this.artisanType == 1 &&
+					this.formData.sj_see == 2 &&
+					this.formData.server_price &&
+					this.formData.first_class_id
+				);
+			},
+			shopPrice() {
+				return _public.roundUpToTwoDecimals(
+					this.formData.server_price,
+					this.ratio
+				);
+			},
+		},
+		methods: {
+			inpPrice2(e) {
+				let that = this;
+				let value = e.detail.value;
+
+				// 1. 移除非数字和小数点
+				value = value.replace(/[^\d.]/g, '');
+
+				// 2. 确保只有一个小数点
+				const parts = value.split('.');
+				if (parts.length > 2) {
+					value = parts[0] + '.' + parts.slice(1).join('');
+				}
+
+				// 3. 限制小数点后最多一位
+				if (parts.length > 1) {
+					value = parts[0] + '.' + parts[1].slice(0, 2);
+				}
+				// 4. 如果以小数点开头，前面补0
+				if (value.startsWith('.')) {
+					value = '0' + value;
+				}
+				that.$set(that.formData, 'line_price', value);
+			},
+			// 服务简介部分
+			initDetailForm(detail = []) {
+				// 先重置 detailForm 为空
+				this.detailForm = {
+					effect: "",
+					crowd: "",
+					product: "",
+					scope: "",
+					tips: "",
+				};
+				this.detailOtherList = [];
+
+				// 优先从后端返回的新字段赋值
+				if (this.formData.efficacy) this.detailForm.effect = this.formData.efficacy;
+				if (this.formData.crowd) this.detailForm.crowd = this.formData.crowd;
+				if (this.formData.product) this.detailForm.product = this.formData.product;
+				if (this.formData.scope) this.detailForm.scope = this.formData.scope;
+				if (this.formData.prompt) this.detailForm.tips = this.formData.prompt;
+
+				// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
+				if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
+					(detail || []).forEach((item) => {
+						if (item.title === "服务功效") {
+							this.detailForm.effect = item.text || "";
+						} else if (item.title === "适用人群") {
+							this.detailForm.crowd = item.text || "";
+						} else if (item.title === "产品清单") {
+							this.detailForm.product = item.text || "";
+						} else if (item.title === "适用范围" || item.title === "使用范围") {
+							this.detailForm.scope = item.text || "";
+						} else if (item.title === "温馨提示") {
+							this.detailForm.tips = item.text || "";
+						} else {
+							this.detailOtherList.push({
+								title: item.title || "",
+								text: item.text || "",
+								photo: item.photo || "",
+							});
+						}
+					});
+				}
+			},
+
+			syncDetailForm() {
+				// 将 detailForm 的值映射到 formData 的新字段
+				this.formData.efficacy = (this.detailForm.effect || "").trim();
+				this.formData.crowd = (this.detailForm.crowd || "").trim();
+				this.formData.product = (this.detailForm.product || "").trim();
+				this.formData.scope = (this.detailForm.scope || "").trim();
+				this.formData.prompt = (this.detailForm.tips || "").trim();
+			},
+
+			checkDetailForm() {
+				if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
+					uni.showToast({
+						title: "请输入服务功效",
+						icon: "none",
+					});
+					return false;
+				}
+				if (!this.detailForm.crowd || !this.detailForm.crowd.trim()) {
+					uni.showToast({
+						title: "请输入适用人群",
+						icon: "none",
+					});
+					return false;
+				}
+				// if (!this.detailForm.product || !this.detailForm.product.trim()) {
+				// 	uni.showToast({
+				// 		title: "请输入产品清单",
+				// 		icon: "none",
+				// 	});
+				// 	return false;
+				// }
+				return true;
+			},
+
+
+			closeReminderPopup(notShowAgain) {
+				console.log('关闭弹窗，不再提示：', notShowAgain);
+				if (notShowAgain) {
+					uni.setStorageSync('addServiceReminderNotShow', true);
+				}
+				this.showReminderPopup = false;
+			},
+			goImgAndText() {
+				uni.navigateTo({
+					url: `/pages/shop/add-img-text?list=${this.formData.graphic_details}`,
+				});
+			},
+			ckeckisShowPer(value) {
+				console.log("ckeckisShowPer==========", value);
+				this.isShowPer = value;
+			},
+			ckecknowQer(value) {
+				this.nowQer = value;
+			},
+			addVideo(value) {
+				this.formData.video = value;
+			},
+			// addImg(arr) {
+			// 	this.formData.photo = this.formData.photo.concat(arr);
+			// },
+			// deleteImage(index) {
+			//   this.formData.photo.splice(index, 1)
+			// },
+			onUploadSuccess(file) {
+				console.log("添加的图片", this.formData.photo);
+			},
+			onUploadError(error) {
+				console.error("上传失败:", error);
+				uni.showToast({
+					title: "上传失败",
+					icon: "none",
+				});
+			},
+			onFileDelete(file, index) {
+				console.log("删除文件:", this.formData.photo, index);
+			},
+			uploadVideoSuc(file) {
+				this.formData.video = file;
+			},
+			uploadVideoErr() {},
+			uploadVideoDel() {
+				this.formData.video = null;
+			},
+			async getInit() {
+				const firstclass = await request.post("/sj/firstclass");
+				this.serviceTypes = this.serviceTypes.concat(firstclass.data);
+
+				await request
+					.post("/user/serverdetail", {
+						id: this.formData.id
+					})
+					.then((res) => {
+						// 直接合并所有字段，避免遗漏
+						this.formData = {
+							...this.formData,
+							...res.data
+						};
+						// 确保 detail 数组被保留（可能用于兼容）
+						this.formData.detail = res.data.detail || [];
+						// 调用初始化方法，它会优先使用新字段
+						this.initDetailForm(res.data.detail || []);
+						// 处理分类显示
+						firstclass.data.filter((item, i) => {
+							if (item.id == this.formData.first_class_id) {
+								this.selectedServiceTypeIndex = i;
+								this.serviceType = item.title;
+								this.ratio = item.ratio;
+							}
+						});
+					});
+				request
+					.post("/user/secondclass", {
+						id: this.formData.first_class_id,
+					})
+					.then((result) => {
+						if (result.data.length == 0 || !result.data) {
+							this.showCategory = false;
+						} else {
+							this.categoryAll = result.data;
+							this.categoryAll.filter((e, i) => {
+								if (e.id == this.formData.second_class_id) {
+									this.selectedCategoryIndex = i;
+									this.category = e.title;
+								}
+							});
+							this.showCategory = true;
+						}
+					});
+			},
+			getUserInfo() {
+				const type = this.artisanType == 1 ? 2 : this.artisanType == 2 ? 3 : 1;
+				request
+					.post("/user/getuser", {
+						type: type,
+					})
+					.then((result) => {
+						this.formData.publish_user_id = result.data.id;
+					});
+			},
+			// 是否在商家端售卖
+			changeSale(value) {
+				this.formData.sj_see = value;
+			},
+			// 输入价格
+			inpPrice(e) {
+				let that = this;
+				let value = e.detail.value;
+
+				// 1. 移除非数字和小数点
+				value = value.replace(/[^\d.]/g, "");
+
+				// 2. 确保只有一个小数点
+				const parts = value.split(".");
+				if (parts.length > 2) {
+					value = parts[0] + "." + parts.slice(1).join("");
+				}
+
+				// 3. 限制小数点后最多一位
+				if (parts.length > 1) {
+					value = parts[0] + "." + parts[1].slice(0, 2);
+				}
+				// 4. 如果以小数点开头，前面补0
+				if (value.startsWith(".")) {
+					value = "0" + value;
+				}
+				that.$set(that.formData, "server_price", value);
+			},
+			deleteStep(i) {
+				this.formData.process.splice(i, 1);
+			},
+			addStep() {
+				let i = this.formData.process.length + 1;
+				let arr = {
+					title: "第" + i + "步",
+					text: "",
+					photo: "",
+				};
+				this.formData.process.push(arr);
+			},
+
+			// 删除视频
+			deleteVideo() {
+				this.formData.video = "";
+			},
+
+			// 保存草稿
+			saveDraft: debounce(function() {
+				if (this.isDraft) return;
+				this.syncDetailForm();
+				const {
+					title,
+					server_price,
+					line_price,
+					server_time,
+					first_class_id,
+					second_class_id,
+					detail,
+					process,
+					video,
+					photo,
+				} = this.formData;
+				let item = {
+					title,
+					server_price,
+					line_price,
+					server_time,
+					first_class_id,
+					second_class_id,
+					detail,
+					process,
+					video,
+					photo,
+				};
+				// 检查是否所有字段都为空
+				const isEmpty = Object.values(item).every((value) => {
+					if (Array.isArray(value)) {
+						return value.length === 0;
+					}
+					return !value;
+				});
+
+				if (isEmpty) {
+					uni.showToast({
+						title: "请至少填写一项内容",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 实现保存草稿逻辑
+				this.formData.state = 0;
+				let url = null;
+				if (!this.formData.id) {
+					url = "/user/serveradd";
+				} else {
+					url = "/user/serverchange";
+				}
+				request.post(url, this.formData).then((res) => {
+					if (res.state == 1) {
+						this.isDraft = true;
+						const pages = getCurrentPages();
+						const prevPage = pages[pages.length - 2]; // 上一个页面
+						uni.showToast({
+							title: res.msg,
+							icon: "success",
+							duration: 1000,
+						});
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1,
+								success: () => {
+									prevPage.$vm.currentTab = 3;
+									prevPage.$vm.state = 0;
+									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+								},
+							});
+						}, 500);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+						});
+						this.isDraft = false;
+					}
+				});
+			}, 500),
+
+			// 提交表单
+			submitForm: debounce(function() {
+				if (this.isAdd) return;
+				this.syncDetailForm();
+				// 表单验证
+
+				if (!this.formData.title) {
+					uni.showToast({
+						title: "请输入服务名称",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.formData.line_price) {
+					uni.showToast({
+						title: '请输入服务定价',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.formData.server_price) {
+					uni.showToast({
+						title: '请输入服务售价',
+						icon: 'none'
+					})
+					return
+				}
+
+				if (!this.formData.first_class_id) {
+					uni.showToast({
+						title: "请选择服务分类",
+						icon: "none",
+					});
+					return;
+				}
+				if (this.showCategory && !this.formData.second_class_id) {
+					uni.showToast({
+						title: "请选择服务子类",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.formData.server_time) {
+					uni.showToast({
+						title: "请输入服务时长",
+						icon: "none",
+					});
+					return;
+				}
+				if (this.formData.server_time < 10) {
+					uni.showToast({
+						title: "服务时长最短为10分钟",
+						icon: "none",
+					});
+					return;
+				}
+				if (this.formData.server_time > 240) {
+					uni.showToast({
+						title: "服务时长最长为240分钟",
+						icon: "none",
+					});
+					return;
+				}
+				if (!this.formData.sj_see && this.artisanType == 1) {
+					uni.showToast({
+						title: "请选择是否允许在门店端售卖",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 检查服务简介
+				if (!this.checkDetailForm()) {
+					return;
+				}
+				this.syncDetailForm();
+
+				// 检查服务流程数组
+				if (this.formData.process && this.formData.process.length > 0) {
+					for (let item of this.formData.process) {
+						if (!item.text) {
+							uni.showToast({
+								title: "请完善服务流程内容",
+								icon: "none",
+							});
+							return;
+						}
+					}
+				} else {
+					uni.showToast({
+						title: "请添加服务流程内容",
+						icon: "none",
+					});
+					return;
+				}
+
+				// 检查视频和图片
+				// if (!this.formData.video) {
+				//   uni.showToast({
+				//     title: '请上传服务视频',
+				//     icon: 'none'
+				//   })
+				//   return
+				// }
+				if (!this.formData.photo || this.formData.photo.length === 0) {
+					uni.showToast({
+						title: "请上传服务图片",
+						icon: "none",
+					});
+					return;
+				}
+				if (this.artisanType == 2) {
+					delete this.formData.sj_see;
+				}
+				// 提交表单逻辑
+				delete this.formData.state;
+				let url = null;
+				if (!this.formData.id) {
+					url = "/user/serveradd";
+				} 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();
+						const prevPage = pages[pages.length - 2]; // 上一个页面
+						uni.showToast({
+							title: res.msg,
+							icon: "success",
+							duration: 600,
+							mask: true,
+						});
+						this.isAdd = true;
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1,
+								success: () => {
+									prevPage.$vm.currentTab = 1;
+									prevPage.$vm.state = 1;
+									prevPage.$vm.getServicesList(); // 直接调用上个页面的刷新方法
+								},
+							});
+						}, 500);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+						});
+						this.isAdd = false;
+					}
+				});
+			}, 500),
+
+			// 打开服务分类
+			openServiceTypePicker() {
+				console.log("open");
+				// 实现分类选择逻辑
+				this.showServiceTypePicker = true;
+			},
+
+			// 打开服务子类选择器
+			openCategoryPicker() {
+				// 实现子类选择逻辑
+				if (!this.formData.first_class_id) {
+					uni.showToast({
+						title: "请先选择服务分类",
+						icon: "none",
+					});
+				} else {
+					this.showCategoryPicker = true;
+				}
+			},
+
+			// 处理服务类型选择
+			handleServiceTypeConfirm(e) {
+				console.log("e", e);
+				const selectedType = e.items[0];
+				if (this.formData.first_class_id == selectedType.id) return;
+				this.formData.first_class_id = selectedType.id;
+				this.serviceType = selectedType.title;
+				this.ratio = selectedType.ratio;
+				let id = selectedType.id;
+				request
+					.post("/user/secondclass", {
+						id,
+					})
+					.then((res) => {
+						if (res.data.length == 0 || !res.data) {
+							this.showCategory = false;
+							this.selectedCategoryIndex = [0];
+						} else {
+							this.categoryAll = res.data;
+							this.showCategory = true;
+							this.selectedCategoryIndex = [0];
+						}
+					});
+			},
+
+			// 处理服务分类选择
+			handleCategoryConfirm(e) {
+				console.log(e, "selectedCategory", this.categoryAll);
+				const selectedCategory = e.item;
+				this.formData.second_class_id = selectedCategory.id;
+				this.category = selectedCategory.title;
+			},
+		},
+	};
+</script>
+
+<style lang="less">
+	.add-service {
+		padding: 24rpx 24rpx 0;
+		box-sizing: border-box;
+	}
+
+	.form-container {
+		margin-top: 20rpx;
+	}
+
+	.form-item {
+		background-color: #fff;
+		padding: 24rpx;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.price-tip {
+		width: 100%;
+		margin-top: 40rpx;
+
+		.price-tip-card {
+			padding: 8rpx 12rpx;
+			background: #FDF0F0;
+			border-radius: 8rpx;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #EE4853;
+			line-height: 33rpx;
+		}
+	}
+
+	.shopsale-box {
+		flex-flow: column;
+		justify-content: space-between;
+		align-items: space-between;
+	}
+
+	.shopsale-change {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 24rpx;
+	}
+
+	.shopsale-option {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.shopsale-option:last-child {
+		margin-left: 220rpx;
+	}
+
+	.option-text {
+		padding-left: 16rpx;
+	}
+
+	.form-item-up {
+		background-color: #fff;
+		padding: 24rpx;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: flex-start;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.form-label {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	.form-input {
+		flex: 1;
+		height: 40rpx;
+		font-size: 28rpx;
+		color: #333333;
+		align-items: center;
+		text-align: center;
+	}
+
+	.form-right {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.form-value {
+		font-size: 28rpx;
+		color: #333333;
+		margin-right: 16rpx;
+	}
+
+	.placeholder {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.textarea-item {
+		padding-bottom: 30rpx;
+	}
+
+	.form-textarea {
+		flex: 1;
+		height: 198rpx;
+		font-size: 28rpx;
+		color: #333333;
+		line-height: 1.5;
+		margin-left: 32rpx;
+	}
+
+	.upload-item {
+		padding-bottom: 30rpx;
+	}
+
+	.upload-tip {
+		font-size: 24rpx;
+		color: #999999;
+		margin-left: 10rpx;
+	}
+
+	.upload-content {
+		margin-top: 20rpx;
+		position: relative;
+	}
+
+	.progress-box {
+		width: 204rpx;
+		height: 204rpx;
+		background-color: rgba(0, 0, 0, 0.5);
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.progress-text {
+		font-size: 42rpx;
+		color: #ffffff;
+		font-weight: 500;
+	}
+
+	.progress-lable {
+		font-size: 28rpx;
+		color: #ffffff;
+	}
+
+	.progress-box progress {
+		/* width: 204rpx; */
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.video-preview,
+	.image-preview,
+	.upload-btn {
+		width: 200rpx;
+		height: 200rpx;
+		margin-right: 10rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+	}
+
+	.preview-video,
+	.preview-image {
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 8rpx;
+	}
+
+	.upload-btn {
+		border: 2rpx dashed #dddddd;
+		border-radius: 8rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.plus-icon {
+		font-size: 60rpx;
+		color: #999999;
+	}
+
+	.delete-btn {
+		position: absolute;
+		top: -20rpx;
+		right: -20rpx;
+		width: 40rpx;
+		height: 40rpx;
+		background-color: rgba(0, 0, 0, 0.5);
+		border-radius: 50%;
+		color: #ffffff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+	}
+
+	.bottom-buttons {
+		/* position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0; */
+		height: 100rpx;
+		padding: 40rpx 0 64rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.btn-draft,
+	.btn-submit {
+		width: 334rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		text-align: center;
+		font-size: 28rpx;
+		border-radius: 40rpx;
+		margin: 0 24rpx;
+	}
+
+	.btn-draft {
+		background-color: #ffffff;
+		color: #e8101e;
+		border: 2rpx solid #e8101e;
+		box-sizing: border-box;
+	}
+
+	.btn-submit {
+		background-color: #e8101e;
+		color: #ffffff;
+		width: 705rpx;
+		height: 76rpx;
+	}
+
+	.form-step {
+		background-color: #fff;
+		margin-bottom: 24rpx;
+	}
+
+	.form-step .form-item {
+		margin-bottom: 0;
+	}
+
+	.step {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 24rpx 24rpx;
+	}
+
+	.step-inp {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333333;
+		margin-left: 38rpx;
+		padding: 0 24rpx;
+		background-color: rgba(230, 230, 230, 0.5);
+	}
+
+	.step-textarea {
+		font-size: 24rpx;
+		flex: 1;
+		height: 70rpx;
+		border-radius: 6rpx;
+		margin-left: 38rpx;
+		padding: 24rpx;
+		background-color: rgba(230, 230, 230, 0.5);
+	}
+
+	/* 选择器触发按钮样式 */
+	.picker-trigger {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 24rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 12rpx;
+		margin-bottom: 24rpx;
+	}
+
+	.picker-label {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	.picker-value {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.picker-arrow {
+		width: 32rpx;
+		height: 32rpx;
+		margin-left: 16rpx;
+	}
+
+	.delete-icon {
+		width: 32rpx;
+		height: 32rpx;
+		margin-left: 24rpx;
+	}
+
+	.form-detail {
+		position: relative;
+	}
+
+	.required::before {
+		content: "*";
+		color: #ff0000;
+		margin-right: 4rpx;
+	}
+
+	.step-inp,
+	.form-input {
+		height: 60rpx;
+	}
+
+	// 服务简介相关
+	.detail-card {
+		background: #ffffff;
+		border-radius: 20rpx;
+		padding: 0 24rpx 8rpx;
+		margin-bottom: 24rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+	}
+
+	.detail-title {
+		padding: 24rpx 0 25rpx;
+	}
+
+	.detail-title .form-label {
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #333;
+		line-height: 40rpx;
+	}
+
+	.detail-row {
+		padding: 0 0 36rpx;
+	}
+
+	.detail-row .form-label {
+		display: block;
+		margin-bottom: 20rpx;
+		line-height: 40rpx;
+	}
+
+	.detail-textarea-wrap {
+		position: relative;
+		background: #f7f7f7;
+		border-radius: 16rpx;
+		padding: 24rpx 24rpx 52rpx;
+		box-sizing: border-box;
+	}
+
+	.detail-textarea {
+		width: 100%;
+		height: 108rpx;
+		min-height: 108rpx;
+		margin: 0;
+		padding: 0;
+		background: transparent;
+		border: 0;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		color: #333333;
+		box-sizing: border-box;
+	}
+
+	.detail-count {
+		position: absolute;
+		right: 24rpx;
+		bottom: 16rpx;
+		font-size: 22rpx;
+		color: #999999;
+		line-height: 32rpx;
+	}
+
+	/* 平台特定样式 */
+	/* #ifdef H5 */
+
+	.form-input,
+	.form-textarea {
+		outline: none;
+	}
+
+	.upload-btn {
+		cursor: pointer;
+	}
+
+	/* #endif */
+
+	/* #ifdef APP-PLUS */
+	.form-input {
+		height: 90rpx;
+	}
+
+	.permission.transform {
+		top: calc(var(--status-bar-height) + 88rpx + 30rpx);
+		opacity: 1;
+		visibility: visible;
+	}
+
+	/* #endif */
+
+	/* #ifdef MP-WEIXIN */
+	.form-input {
+		height: 80rpx;
+	}
+
+	.bottom-buttons {
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	/* #endif */
+	.tip {
+		padding: 20rpx 30rpx;
+		background: #feefec;
+		font-weight: 400;
+		font-size: 30rpx;
+		color: #f31d2f;
+		line-height: 42rpx;
+		text-align: left;
+		font-style: normal;
+
+		text-align: center;
+
+		.tip-icon {
+			width: 34rpx;
+			height: 34rpx;
+			margin-right: 10rpx;
+			transform: translateY(6rpx);
+		}
+	}
+
+	/* 淡入淡出动画 */
+	.fade-enter-active,
+	.fade-leave-active {
+		transition: opacity 0.3s;
+	}
+
+	.fade-enter,
+	.fade-leave-to {
+		opacity: 0;
+	}
+
+	.popup-mask2 {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		// z-index: 1000;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.popup-content2 {
+		width: 600rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		overflow: hidden;
+		padding: 40rpx 30rpx;
+		box-sizing: border-box;
+	}
+
+	.popup-title {
+		font-size: 36rpx;
+		font-weight: 600;
+		color: #333333;
+		text-align: center;
+		margin-bottom: 20rpx;
+	}
+
+	.popup-message {
+		font-size: 30rpx;
+		color: #666666;
+		text-align: center;
+		margin-top: 40rpx;
+		margin-bottom: 30rpx;
+		line-height: 1.5;
+	}
+
+	.popup-buttons {
+		display: flex;
+		flex-flow: row nowrap;
+		justify-content: space-between;
+		padding: 20rpx 0 0 0;
+		gap: 60rpx;
+	}
+
+	.popup-btn {
+		flex: 1;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: 26rpx;
+		border-radius: 40rpx;
+	}
+
+	.popup-btn-know {
+		background-color: #e8101e;
+		color: #ffffff;
+	}
+
+	.popup-btn-notshow {
+		background-color: #ffffff;
+		color: #e8101e;
+		border: 1rpx #e8101e solid;
+	}
 </style>
\ No newline at end of file
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..5e0c9f8 100644
--- a/pages/shop/photoAlbum/addPhoto.vue
+++ b/pages/shop/photoAlbum/addPhoto.vue
@@ -369,6 +369,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..cb871a2 100644
--- a/pages/shop/photoAlbum/photoManage.vue
+++ b/pages/shop/photoAlbum/photoManage.vue
@@ -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..eca34b6 100644
--- a/pages/shop/photoAlbum/videoList.vue
+++ b/pages/shop/photoAlbum/videoList.vue
@@ -1,486 +1,496 @@
-<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">{{ 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.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..1f7642c 100644
--- a/utils/albumUploadImage.js
+++ b/utils/albumUploadImage.js
@@ -173,7 +173,7 @@ 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('.')
@@ -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',

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 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=8D=E4=BF=AE=E6=94=B9=E3=80=81=E6=8F=90=E7=A4=BA=E6=A1=86?=
 =?UTF-8?q?=E4=BF=AE=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('.')