From 7e107a4ea4cdf39b8c57f3c9885786d83995f6b7 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Wed, 25 Mar 2026 15:41:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=9C=8D=E5=8A=A1=20=E6=9C=8D=E5=8A=A1=E7=AE=80?=
=?UTF-8?q?=E4=BB=8B=E6=96=B0=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/add-service.vue | 2484 ++++++++++++++++++++----------------
1 file changed, 1389 insertions(+), 1095 deletions(-)
diff --git a/pages/shop/add-service.vue b/pages/shop/add-service.vue
index 88274b6..228b6c7 100644
--- a/pages/shop/add-service.vue
+++ b/pages/shop/add-service.vue
@@ -1,80 +1,123 @@
-
-
-
-
+
+
- {{ formData.back_text }}
-
-
-
-
-
- 服务名称
-
-
+
+
+
+
+ 服务名称
+
+
-
-
- 服务价格
-
-
+
+
+ 服务价格
+
+
-
-
- 服务分类
-
-
- {{serviceType || '选择分类'}}
-
-
-
-
+
+
+ 服务分类
+
+
+ {{ serviceType || "选择分类" }}
+
+
+
+
-
-
- 服务子类
-
-
- {{category || '选择子类'}}
-
-
-
-
+
+
+ 服务子类
+
+
+ {{ category || "选择子类" }}
+
+
+
+
-
-
-
- 是否允许该服务在门店端售卖，以供门店下单购买。
- {{showShopPrice ? '门店下单购买后，您需到到家至门店进行服务，门店端展示价格为' : ''}}
- {{shopPrice}}
- {{showShopPrice ? '元。' : ''}}
-
-
-
-
- 允许
-
-
-
- 不允许
-
-
-
+
+
+
+ 是否允许该服务在门店端售卖，以供门店下单购买。
+ {{
+ showShopPrice
+ ? "门店下单购买后，您需到上门至门店进行服务，门店端展示价格为"
+ : ""
+ }}
+ {{
+ shopPrice
+ }}
+ {{ showShopPrice ? "元。" : "" }}
+
+
+
+
+ 允许
+
+
+
+ 不允许
+
+
+
-
-
- 服务时长
-
- 分钟
-
+
+
+ 服务时长
+
+ 分钟
+
-
-
+
-
-
- 图文详情
-
- {{ formData.graphic_details?"已设置":"去设置" }}
-
-
-
-
-
- 服务简介
-
- 添加
-
-
- {{item.detailItem}}
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
- 服务流程
- 添加
-
-
- 第{{i+1}}步
-
-
-
-
+
+
+ 图文详情
+
+ {{
+ formData.graphic_details ? "已设置" : "去设置"
+ }}
+
+
+
-
-
+
+
+ 服务简介
+
+
+
+ 服务功效
+
+
+ {{(detailForm.effect || '').length}}/200
+
+
+
+
+ 适用人群
+
+
+ {{(detailForm.crowd || '').length}}/200
+
+
+
+
+ 产品清单
+
+
+ {{(detailForm.product || '').length}}/200
+
+
+
+
+ 适用范围
+
+
+ {{(detailForm.scope || '').length}}/200
+
+
+
+
+ 温馨提示
+
+
+ {{(detailForm.tips || '').length}}/200
+
+
+
+
+
+ 服务流程
+ 添加
+
+
+ 第{{ i + 1 }}步
+
+
+
+
+
+
+
-
-
-
-
- 上传短视频
- (仅可上传1个视频)
-
-
+
+
+ 上传短视频
+ (仅可上传1个视频)
+
+
-
-
-
+
+
+
-
-
-
- 服务图片
- (仅可上传9个图片)
-
-
+
+
+ 服务图片
+ (仅可上传9个图片)
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
- 美融融plus 对储存空间/照片权限申请说明
- 便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。
-
-
- 美融融plus 对相机拍摄权限申请说明
- 便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。
-
-
+
+
+ 美融融plus 对储存空间/照片权限申请说明
+ 便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中读取相册和文件内容。
+
+
+ 美融融plus 对相机拍摄权限申请说明
+ 便于您使用该功能上传您的照片/图片/视频以及用于更换头像、发布商品等场景中所需内容。
+
+
+
+
+
+
+
+
\ No newline at end of file
+/* #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;
+}
+
From cbbcb0c5a3d48a1369b3c69047c2061144acea7e Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 31 Mar 2026 16:04:35 +0800
Subject: [PATCH 2/4] 1
---
.gitignore | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..853f861
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# 忽略依赖目录
+/node_modules/
+
+# 忽略 UniApp 编译输出目录
+/unpackage/
+
+# 忽略 VS Code 配置目录
+/.vscode/
\ No newline at end of file
From 4eedf350fa54123c650c4f738b0b032f0f0d1b83 Mon Sep 17 00:00:00 2001
From: BAKEYi <16298417+bakeyi@user.noreply.gitee.com>
Date: Tue, 31 Mar 2026 18:07:22 +0800
Subject: [PATCH 3/4] 1
---
pages/shop/userorder-detail.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 329f097..46c2b82 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -144,7 +144,8 @@
From d6fda784a8834420a2bd04705b31e35bb1673515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=9D=B0?= <727475508@qq.com>
Date: Wed, 1 Apr 2026 13:50:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=9B=B8=E5=86=8C/=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/artisan/profile.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/artisan/profile.vue b/pages/artisan/profile.vue
index 62d89dd..e73858c 100644
--- a/pages/artisan/profile.vue
+++ b/pages/artisan/profile.vue
@@ -78,22 +78,22 @@
-
+
-
+