diff --git a/api/homeService.js b/api/homeService.js
new file mode 100644
index 00000000..553af1e9
--- /dev/null
+++ b/api/homeService.js
@@ -0,0 +1,26 @@
+export const apiArr = {
+ // 到家服务
+ categoryList: "/api/v2/wechat/service/category/list", // 服务分类列表
+ serviceList: "/api/v2/wechat/service/list", // 服务商品列表
+ serviceInfo: "/api/v2/wechat/service/info", // 服务详情(含SKU+师傅)
+ orderCreate: "/api/v2/wechat/service/order/create", // 下单(定金单)
+ orderList: "/api/v2/wechat/service/order/list", // 我的服务订单列表
+ orderInfo: "/api/v2/wechat/service/order/info", // 服务订单详情
+ orderCancel: "/api/v2/wechat/service/order/cancel", // 取消服务订单
+ preorder: "/api/v2/wechat/service/order/preorder", // 预下单(拉卡拉)
+ tradeQuery: "/api/v2/wechat/service/order/trade-query", // 查单
+ // 师傅端
+ workerOrderList: "/api/v2/wechat/service/worker/order-list", // 师傅服务单列表
+ workerOrderStatus: "/api/v2/wechat/service/worker/order-status", // 师傅更新状态
+ workerExtraOrder: "/api/v2/wechat/service/worker/extra-order", // 师傅代客补差单
+ workerMyInfo: "/api/v2/wechat/service/worker/my-info", // 解析当前用户的师傅信息
+ // 家政合同(客户端)
+ contractList: "/api/v2/wechat/service/contract/list", // 我的家政合同列表
+ contractInfo: "/api/v2/wechat/service/contract/info", // 家政合同详情
+ // 月账单
+ workerMonthlyBillList: "/api/v2/wechat/service/worker/monthly-bill-list", // 师傅月账单列表
+ workerPushBill: "/api/v2/wechat/service/worker/push-bill", // 师傅推送/拒绝月账单
+ userMonthlyBillList: "/api/v2/wechat/service/user/monthly-bill-list", // 用户月账单列表
+ userMonthlyBillPreOrder: "/api/v2/wechat/service/user/monthly-bill/preorder", // 用户月账单预下单
+ userMonthlyBillTradeQuery: "/api/v2/wechat/service/user/monthly-bill/trade-query", // 用户月账单查单
+}
diff --git a/packages/community/myCommunity/index.vue b/packages/community/myCommunity/index.vue
index 0973dd1f..77ff81e4 100644
--- a/packages/community/myCommunity/index.vue
+++ b/packages/community/myCommunity/index.vue
@@ -91,6 +91,9 @@ export default {
this.currentCommunity = e
uni.setStorageSync('changeCommData', { id: e.community_id, name: e.name });
uni.setStorageSync('currentCommunityAddr', e.addr);
+ // 缓存该小区已绑定房产的门牌号(room_name,如「1栋1单元1层103」),供到家服务等下单页缺省填写
+ const owner = (e.room_owner_list && e.room_owner_list.length) ? e.room_owner_list[0] : null
+ uni.setStorageSync('currentRoomNo', owner && owner.room_name ? owner.room_name : '');
NavgateTo("1")
},
},
diff --git a/packages/homeService/contractDetail/index.vue b/packages/homeService/contractDetail/index.vue
new file mode 100644
index 00000000..1c513924
--- /dev/null
+++ b/packages/homeService/contractDetail/index.vue
@@ -0,0 +1,79 @@
+
+
+
+ {{ statusText(info.status) }}
+ {{ info.contract_name }}
+ 合同编号:{{ info.contract_no }}
+
+
+ 月薪¥{{ info.month_amount }}
+ 账单日每月 {{ info.pay_day }} 号
+ 结算方式{{ info.settle_mode === 1 ? '平台月账单' : '线下自付' }}
+ 合同开始{{ fmtDate(info.start_date) }}
+ 合同结束{{ fmtDate(info.end_date) }}
+ 联系人{{ info.contact_name || '-' }}
+ 联系电话{{ info.contact_phone || '-' }}
+ 服务地址{{ info.service_address || '-' }}
+ 备注{{ info.remark }}
+
+
+ 查看已签合同
+
+
+
+
+
+
+
diff --git a/packages/homeService/detail/index.vue b/packages/homeService/detail/index.vue
new file mode 100644
index 00000000..3633c762
--- /dev/null
+++ b/packages/homeService/detail/index.vue
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+ {{ info.service_name }}
+ {{ info.price_desc }}
+
+
+
+
+ 选择规格
+
+
+ {{ sku.sku_name }}
+ 月薪 ¥{{ sku.month_salary }}
+ 定金 ¥{{ sku.deposit }}
+
+
+
+
+
+
+ 选择师傅
+
+
+
+ {{ w.employee_name }}
+ {{ w.expertise }}
+
+
+
+
+
+
+ 服务详情
+
+
+
+
+
+ 月薪 ¥{{ currentSku ? currentSku.month_salary : '--' }}
+ 咨询预约
+
+
+ 定金 ¥{{ currentSku ? currentSku.deposit : '--' }}
+ 立即预约
+
+
+
+
+
+
+
+
diff --git a/packages/homeService/index/index.vue b/packages/homeService/index/index.vue
new file mode 100644
index 00000000..2f120e71
--- /dev/null
+++ b/packages/homeService/index/index.vue
@@ -0,0 +1,124 @@
+
+
+
+
+ 到家服务
+ 家政服务
+
+
+
+
+
+ 全部
+
+ {{ item.category_name }}
+
+
+
+
+
+
+
+
+ {{ item.service_name }}
+ {{ item.price_desc }}
+
+
+
+ 暂无服务
+
+
+
+
+
+
+
+
diff --git a/packages/homeService/myContracts/index.vue b/packages/homeService/myContracts/index.vue
new file mode 100644
index 00000000..2eea64e9
--- /dev/null
+++ b/packages/homeService/myContracts/index.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+ {{ c.contract_no }}
+ {{ statusText(c.status) }}
+
+
+ {{ c.contract_name }}
+ 月薪:¥{{ c.month_amount }}
+ 结算:{{ c.settle_mode === 1 ? '平台月账单' : '线下自付' }}
+ 合同期:{{ fmtDate(c.start_date) }} ~ {{ fmtDate(c.end_date) }}
+
+
+ 暂无家政合同
+
+
+
+
+
+
+
diff --git a/packages/homeService/myMonthlyBills/index.vue b/packages/homeService/myMonthlyBills/index.vue
new file mode 100644
index 00000000..5f89a5d8
--- /dev/null
+++ b/packages/homeService/myMonthlyBills/index.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+ {{ b.bill_no }}
+ {{ statusText(b.pay_status) }}
+
+
+
+
+ {{ b.service_name }}
+ {{ b.bill_month }} 月度账单
+ ¥{{ b.amount }}
+
+
+
+
+ 暂无待支付月账单
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/homeService/myOrders/index.vue b/packages/homeService/myOrders/index.vue
new file mode 100644
index 00000000..ddccbcfe
--- /dev/null
+++ b/packages/homeService/myOrders/index.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+ {{ o.order_no }}
+ {{ statusText(o) }}
+
+
+
+
+ {{ o.service_name }}
+ {{ kindText(o.order_kind) }}
+ ¥{{ o.amount }}
+
+
+
+
+ 暂无服务订单
+
+
+
+
+
+
+
diff --git a/packages/homeService/order/index.vue b/packages/homeService/order/index.vue
new file mode 100644
index 00000000..4d4c84e1
--- /dev/null
+++ b/packages/homeService/order/index.vue
@@ -0,0 +1,221 @@
+
+
+
+ {{ params.service_name }}
+ 定金 ¥{{ params.deposit }}
+
+
+
+ 联系人
+
+
+
+ 联系电话
+
+
+
+ 小区地址
+
+ 地图选点
+
+
+ 门牌号
+
+
+
+ 上门时间
+ {{ serviceTime || '请选择上门时间' }}
+
+
+ 备注
+
+
+
+
+
+ 定金 ¥{{ params.deposit }}
+ 提交并支付
+
+
+
+
+
+
+
+
+
diff --git a/packages/homeService/orderDetail/index.vue b/packages/homeService/orderDetail/index.vue
new file mode 100644
index 00000000..2ead449d
--- /dev/null
+++ b/packages/homeService/orderDetail/index.vue
@@ -0,0 +1,66 @@
+
+
+ {{ statusText }}
+
+
+
+ {{ order.service_name }}
+ {{ kindText(order.order_kind) }}
+ ¥{{ order.amount }}
+
+
+
+ 订单号{{ order.order_no }}
+ 联系人{{ order.contact_name }}
+ 联系电话{{ order.contact_phone }}
+ 服务地址{{ order.service_address }}
+ 上门时间{{ order.service_time }}
+ 备注{{ order.remark }}
+ 支付状态{{ order.pay_status === 2 ? '已支付' : '待支付' }}
+
+
+
+
+
+
+
diff --git a/packages/homeService/worker/index.vue b/packages/homeService/worker/index.vue
new file mode 100644
index 00000000..202b8a0a
--- /dev/null
+++ b/packages/homeService/worker/index.vue
@@ -0,0 +1,307 @@
+
+
+
+
+ {{ item.t }}
+
+
+
+ {{ item.t }}
+
+
+
+
+
+
+
+
+ {{ o.order_no }}
+ {{ kindText(o.order_kind) }}
+
+ 服务{{ o.service_name }}
+ 客户{{ o.contact_name }} {{ o.contact_phone }}
+ 地址{{ o.service_address }}
+ 金额¥{{ o.amount }}
+
+
+ 暂无服务单
+
+
+
+
+
+ {{ b.bill_no }}
+ {{ pushStatusText(b.push_status) }}
+
+ 服务{{ b.service_name }}
+ 客户{{ b.contact_name }} {{ b.contact_phone }}
+ 地址{{ b.service_address }}
+ 账单月份{{ b.bill_month }}
+ 金额¥{{ b.amount }}
+
+
+ 暂无月账单
+
+
+
+
+
+
+ 代客生成补差单
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+ 推送月账单
+ 确认推送至用户端?用户支付后该账单生效。
+
+ 取消
+ 确认推送
+
+
+
+
+
+
+
+ 拒绝月账单
+
+
+ 取消
+ 确认拒绝
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 4740f247..8d767e57 100644
--- a/pages.json
+++ b/pages.json
@@ -134,6 +134,47 @@
}
]
},
+ {
+ "root": "packages/homeService",
+ "pages": [
+ {
+ "path": "index/index",
+ "style": { "navigationBarTitleText": "到家服务", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "detail/index",
+ "style": { "navigationBarTitleText": "服务详情", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "order/index",
+ "style": { "navigationBarTitleText": "确认预约", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "myOrders/index",
+ "style": { "navigationBarTitleText": "我的服务订单", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "orderDetail/index",
+ "style": { "navigationBarTitleText": "订单详情", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "worker/index",
+ "style": { "navigationBarTitleText": "我的接单", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "myContracts/index",
+ "style": { "navigationBarTitleText": "我的家政合同", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "contractDetail/index",
+ "style": { "navigationBarTitleText": "合同详情", "navigationBarBackgroundColor": "#fff" }
+ },
+ {
+ "path": "myMonthlyBills/index",
+ "style": { "navigationBarTitleText": "我的月账单", "navigationBarBackgroundColor": "#fff" }
+ }
+ ]
+ },
{
"root": "packages/customerService",
"pages": [
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 7957af8f..db1e3570 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -92,7 +92,7 @@
-
+
门店服务
@@ -192,18 +192,18 @@ export default {
],
visitList: [{
image: "https://static.hshuishang.com/property-img-file/page_user_Group_1572.png",
- name: "服务工单",
- url: "",
+ name: "到家服务订单",
+ url: "/packages/homeService/myOrders/index",
},
{
image: "https://static.hshuishang.com/property-img-file/page_user_Group_1573.png",
- name: "服务地址",
- url: "",
+ name: "我的月账单",
+ url: "/packages/homeService/myMonthlyBills/index",
},
{
image: "https://static.hshuishang.com/property-img-file/page_user_Group_1574.png",
- name: "服务卡",
- url: "",
+ name: "我的家政合同",
+ url: "/packages/homeService/myContracts/index",
}
],
shopList: [{
@@ -240,6 +240,12 @@ export default {
name: "物业端",
url: "/packages/workOrderDashboard/guide/index",
isShow: uni.getStorageSync("is_worker"),
+ },
+ {
+ image: "https://static.hshuishang.com/property-img-file/userPageWuye.png",
+ name: "师傅端",
+ url: "/packages/homeService/worker/index",
+ isShow: uni.getStorageSync("is_merchant"),
}
],
parkList: [
@@ -347,6 +353,12 @@ export default {
name: "物业端",
url: "/packages/workOrderDashboard/guide/index",
isShow: loginRes.is_worker,
+ },
+ {
+ image: "https://static.hshuishang.com/property-img-file/userPageWuye.png",
+ name: "师傅端",
+ url: "/packages/homeService/worker/index",
+ isShow: loginRes.is_merchant,
}
];
diff --git a/project.config.json b/project.config.json
index b6f14a5e..0e0c897e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,7 +1,7 @@
{
"appid": "wx1addb25675dd8e70",
"compileType": "miniprogram",
- "libVersion": "3.9.1",
+ "libVersion": "3.16.0",
"packOptions": {
"ignore": [],
"include": []