diff --git a/components/home/HomeMallContent.uvue b/components/home/HomeMallContent.uvue
new file mode 100644
index 00000000..414f18a7
--- /dev/null
+++ b/components/home/HomeMallContent.uvue
@@ -0,0 +1,767 @@
+
+
+
+
+
+
+ {{ getCategoryDisplayIcon(item) }}
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+ {{ product.shortName }}
+
+ {{ product.tag }}
+ ¥{{ formatChannelPrice(product.price) }}
+
+ ¥{{ formatChannelPrice(product.marketPrice) }}
+
+
+
+
+
+
+
+
+
+ {{ channel.icon }}
+ {{ channel.title }}
+
+ {{ channel.subtitle }}
+
+
+
+
+
+ {{ cover }}
+
+
+
+
+
+
+
+
+
+
+
+ handleProductImageError(product.id)"
+ mode="aspectFill"
+ />
+
+
+
+
+ {{ tag }}
+
+
+ {{ getProductTitle(product) }}
+ {{ getProductHighlight(product) }}
+
+
+ {{ tag }}
+
+
+
+ ¥{{ formatProductPrice(product) }}
+ ¥{{ formatMarketPrice(product) }}
+
+ {{ getProductSalesText(product) }}
+
+
+
+
+
+ 正在加载商品...
+
+
+
+
+
+ 正在加载更多商品...
+
+
+
+ 已经到底了
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/home/HomeServiceContent.uvue b/components/home/HomeServiceContent.uvue
new file mode 100644
index 00000000..f2338cb7
--- /dev/null
+++ b/components/home/HomeServiceContent.uvue
@@ -0,0 +1,301 @@
+
+
+
+
+ 居家服务
+ 围绕护理、康复、陪诊、助餐和健康管理,先把用户最常用的入口集中到首页。
+
+
+ 医养到家
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{ item.icon }}
+
+ {{ item.title }}
+ {{ item.desc }}
+ {{ item.linkText }}
+
+
+
+
+ 服务流程
+
+
+
+ {{ item }}
+
+
+
+
+
+ 服务提醒
+ 当前首页先开放用户可直接触达的服务入口,评估、派单、执行等环节会在进入服务单后继续展示。
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/home/JdLikeHomeHeader.uvue b/components/home/JdLikeHomeHeader.uvue
new file mode 100644
index 00000000..28253beb
--- /dev/null
+++ b/components/home/JdLikeHomeHeader.uvue
@@ -0,0 +1,240 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/homeService/ServicePageHeader.uvue b/components/homeService/ServicePageHeader.uvue
new file mode 100644
index 00000000..2f8ff38b
--- /dev/null
+++ b/components/homeService/ServicePageHeader.uvue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
diff --git a/components/homeService/ServicePageScaffold.uvue b/components/homeService/ServicePageScaffold.uvue
new file mode 100644
index 00000000..84e205c5
--- /dev/null
+++ b/components/homeService/ServicePageScaffold.uvue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index f10ef6db..26ae4f1d 100644
--- a/pages.json
+++ b/pages.json
@@ -336,6 +336,55 @@
"navigationBarTitleText": "添加银行卡"
}
},
+ {
+ "path": "home-service/index",
+ "style": {
+ "navigationBarTitleText": "居家上门服务",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/apply",
+ "style": {
+ "navigationBarTitleText": "提交服务申请",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/order-detail",
+ "style": {
+ "navigationBarTitleText": "服务单详情",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/feedback",
+ "style": {
+ "navigationBarTitleText": "验收反馈",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/assessment",
+ "style": {
+ "navigationBarTitleText": "上门评估",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/service-plan",
+ "style": {
+ "navigationBarTitleText": "服务方案",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/settlement-archive",
+ "style": {
+ "navigationBarTitleText": "结算归档",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "bank-cards/verify",
"style": {
@@ -373,6 +422,93 @@
}
}
]
+ },
+ {
+ "root": "pages/mall/merchant",
+ "pages": [
+ {
+ "path": "home-service/tasks",
+ "style": {
+ "navigationBarTitleText": "执行任务",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/task-detail",
+ "style": {
+ "navigationBarTitleText": "任务详情",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/check-in",
+ "style": {
+ "navigationBarTitleText": "到岗签到",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/service-record",
+ "style": {
+ "navigationBarTitleText": "服务记录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "home-service/exception-report",
+ "style": {
+ "navigationBarTitleText": "异常上报",
+ "navigationStyle": "custom"
+ }
+ }
+ ]
+ },
+ {
+ "root": "pages/mall/admin/home-service",
+ "pages": [
+ {
+ "path": "application-management/index",
+ "style": {
+ "navigationBarTitleText": "服务申请管理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "dispatch-center/index",
+ "style": {
+ "navigationBarTitleText": "派单调度中心",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "assessment-form/index",
+ "style": {
+ "navigationBarTitleText": "上门评估",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "service-plan/index",
+ "style": {
+ "navigationBarTitleText": "服务方案",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "rectification/index",
+ "style": {
+ "navigationBarTitleText": "整改处理",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "settlement-archive/index",
+ "style": {
+ "navigationBarTitleText": "结算归档",
+ "navigationStyle": "custom"
+ }
+ }
+ ]
}
],
"tabBar": {
diff --git a/pages/main/index.uvue b/pages/main/index.uvue
index 1458c7b5..e6ac2b2f 100644
--- a/pages/main/index.uvue
+++ b/pages/main/index.uvue
@@ -1,81 +1,26 @@
-
diff --git a/pages/mall/consumer/home-service/feedback.uvue b/pages/mall/consumer/home-service/feedback.uvue
index d83ea6a7..8f671cd8 100644
--- a/pages/mall/consumer/home-service/feedback.uvue
+++ b/pages/mall/consumer/home-service/feedback.uvue
@@ -1,5 +1,5 @@
-
+
未找到验收信息
@@ -43,12 +43,13 @@
-
+
+
+
diff --git a/pages/mall/consumer/home-service/settlement-archive.uvue b/pages/mall/consumer/home-service/settlement-archive.uvue
new file mode 100644
index 00000000..d7437681
--- /dev/null
+++ b/pages/mall/consumer/home-service/settlement-archive.uvue
@@ -0,0 +1,88 @@
+
+
+
+ 未找到结算信息
+
+
+
+
+
+
+
+
+ 服务总额:{{ detail.totalAmount }}
+ 长护险 / 补贴:{{ detail.insuranceAmount }}
+ 个人自付:{{ detail.selfPayAmount }}
+
+
+
+
+
+ 已包含执行记录、验收反馈、结算单与电子档案索引,方便家属追踪服务闭环。
+
+
+
+
+
+
+
+
+
diff --git a/pages/mall/merchant/home-service/check-in.uvue b/pages/mall/merchant/home-service/check-in.uvue
index eafde882..633be9f9 100644
--- a/pages/mall/merchant/home-service/check-in.uvue
+++ b/pages/mall/merchant/home-service/check-in.uvue
@@ -1,5 +1,5 @@
-
+
任务编号:{{ taskNo }}
当前状态:{{ taskStatus }}
@@ -17,12 +17,13 @@
确认签到
-
+