From 119bbb3d9a51130baf30ae17ddd025bd2283d667 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 6 Feb 2025 17:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AC=AC=E4=BA=8C=E4=B8=AA?=
=?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
service-uniapp-client/pages/index/index.vue | 23 +++++++++--------
service-uniapp-client/pages/index/order.vue | 4 +--
service-uniapp-client/pages/index/technician.vue | 11 +++++++-
service-uniapp-client/pages/order/orderDetail.vue | 8 +++---
service-uniapp-client/pages/order/payOrder.vue | 2 +-
.../pages/technician/selectTechnician.vue | 29 ++++++++++++++++++----
.../pages/technician/subscribeService.vue | 11 ++++++--
service-uniapp-client/store/store.js | 6 +++--
service-uniapp-technician/pages/index/index.vue | 2 +-
service-uniapp-technician/pages/index/order.vue | 6 ++---
.../pages/order/orderDetail.vue | 2 +-
11 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/service-uniapp-client/pages/index/index.vue b/service-uniapp-client/pages/index/index.vue
index 590c9d4..79dc42e 100644
--- a/service-uniapp-client/pages/index/index.vue
+++ b/service-uniapp-client/pages/index/index.vue
@@ -172,18 +172,21 @@
})
},
- //获取技师详情
+ //获取项目详情
selectTechnician(id) {
- this.$api('getProjectDetail', {
- id
- }, res => {
- if (res.code == 200) {
- uni.navigateTo({
- url: `/pages/technician/selectTechnician?serviceId=${id}`
- })
- sessionStorage.setItem('technicianList', JSON.stringify(res.result.tenPageList))
- }
+ uni.navigateTo({
+ url: `/pages/technician/selectTechnician?serviceId=${id}`
})
+ // this.$api('getProjectDetail', {
+ // id
+ // }, res => {
+ // if (res.code == 200) {
+ // uni.navigateTo({
+ // url: `/pages/technician/selectTechnician?serviceId=${id}`
+ // })
+ // sessionStorage.setItem('technicianList', JSON.stringify(res.result.tenPageList))
+ // }
+ // })
},
//跳转技师详情
diff --git a/service-uniapp-client/pages/index/order.vue b/service-uniapp-client/pages/index/order.vue
index 2eca4cb..ea2b3b6 100644
--- a/service-uniapp-client/pages/index/order.vue
+++ b/service-uniapp-client/pages/index/order.vue
@@ -41,10 +41,10 @@
下单时间：{{item.createTime}}
- 下单地址：{{item.addressId_dictText}}
+ 下单地址：{{item.address}}{{item.addressDetails || ''}}
- 总计时间：{{item.useTime}}分钟
+ 服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟
总价格：{{item.money}}元
diff --git a/service-uniapp-client/pages/index/technician.vue b/service-uniapp-client/pages/index/technician.vue
index caee04e..d4346e3 100644
--- a/service-uniapp-client/pages/index/technician.vue
+++ b/service-uniapp-client/pages/index/technician.vue
@@ -81,7 +81,16 @@
//获取技师列表
getTechnicianList() {
- this.$api('getTechnicianList', this.queryParams, res => {
+
+ let queryParams = {
+ ...this.queryParams,
+ }
+
+ if(this.$store.state.selectArea.id){
+ queryParams.county = this.$store.state.selectArea.id
+ }
+
+ this.$api('getTechnicianList', queryParams, res => {
if (res.code == 200) {
this.technicianList = res.result.records
if (this.queryParams.pageSize > res.result.total) {
diff --git a/service-uniapp-client/pages/order/orderDetail.vue b/service-uniapp-client/pages/order/orderDetail.vue
index 0f09c4b..86d6490 100644
--- a/service-uniapp-client/pages/order/orderDetail.vue
+++ b/service-uniapp-client/pages/order/orderDetail.vue
@@ -98,7 +98,7 @@
- 服务时间：{{msgOrder.startServiceTime}}
+ 服务时间：{{msgOrder.serviceDate}} {{msgOrder.serviceTime}}
@@ -139,12 +139,14 @@
服务地址
-
+
{{msgOrder.name}} {{msgOrder.phone}}
- {{msgOrder.address}}
+ {{msgOrder.address}}{{msgOrder.addressDetails || ''}}
diff --git a/service-uniapp-client/pages/order/payOrder.vue b/service-uniapp-client/pages/order/payOrder.vue
index 50bd903..40de708 100644
--- a/service-uniapp-client/pages/order/payOrder.vue
+++ b/service-uniapp-client/pages/order/payOrder.vue
@@ -375,7 +375,7 @@
orderId: this.order.id, //订单id
payType: this.payMethod, // 支付类型
remark: this.remark, //备注
- serviceTime: this.time.id, //服务时间
+ serviceTime: this.time.timeName, //服务时间
travelType: 1, //出行方式
travelDistance: this.distance, //技师距离
serviceDate : this.selectDay.format('YYYY-MM-DD')//服务时间
diff --git a/service-uniapp-client/pages/technician/selectTechnician.vue b/service-uniapp-client/pages/technician/selectTechnician.vue
index 9010c63..9139883 100644
--- a/service-uniapp-client/pages/technician/selectTechnician.vue
+++ b/service-uniapp-client/pages/technician/selectTechnician.vue
@@ -2,7 +2,9 @@
-
+
@@ -22,15 +24,32 @@
pageSize: 10,
title: ''
},
- technicianList: sessionStorage.getItem('technicianList') ? JSON.parse(sessionStorage.getItem(
- 'technicianList')) : [],
+ technicianList: [],
loading: false,
finished: false
}
},
+ onLoad() {
+ this.getProjectDetail()
+ },
methods: {
- onLoad() {
-
+ //获取项目详情
+ getProjectDetail() {
+
+ let queryParams = {
+ id: this.$route.query.serviceId
+ }
+
+ if(this.$store.state.selectArea.id){
+ queryParams.county = this.$store.state.selectArea.id
+ }
+
+ this.$api('getProjectDetail', queryParams, res => {
+ this.loading = true
+ if (res.code == 200) {
+ this.technicianList = res.result.tenPageList;
+ }
+ })
},
leftClick() {
let { current , active } = this.$route.query
diff --git a/service-uniapp-client/pages/technician/subscribeService.vue b/service-uniapp-client/pages/technician/subscribeService.vue
index e947abb..0efc599 100644
--- a/service-uniapp-client/pages/technician/subscribeService.vue
+++ b/service-uniapp-client/pages/technician/subscribeService.vue
@@ -118,9 +118,16 @@
//获取项目详情
getProjectDetail() {
- this.$api('getProjectDetail', {
+
+ let queryParams = {
id: this.$route.query.id
- }, res => {
+ }
+
+ if(this.$store.state.selectArea.id){
+ queryParams.county = this.$store.state.selectArea.id
+ }
+
+ this.$api('getProjectDetail', queryParams, res => {
if (res.code == 200) {
this.projectDetail = res.result.details;
this.technicianList = res.result.tenPageList;
diff --git a/service-uniapp-client/store/store.js b/service-uniapp-client/store/store.js
index 04c11c6..87498aa 100644
--- a/service-uniapp-client/store/store.js
+++ b/service-uniapp-client/store/store.js
@@ -10,7 +10,9 @@ const store = new Vuex.createStore({
configList: {}, //配置列表
userInfo : {}, //用户信息
areaList : [],//地区列表信息
- selectArea : {},//当前选择的地区
+ selectArea : {
+ name : '全部'
+ },//当前选择的地区
},
getters: {
},
@@ -60,7 +62,7 @@ const store = new Vuex.createStore({
state.areaList = handleTree(res.result, 'id', 'pid')
fn && fn(res.result)
- state.selectArea = state.areaList[0].children[0].children[0]
+ // state.selectArea = state.areaList[0].children[0].children[0]
}
})
},
diff --git a/service-uniapp-technician/pages/index/index.vue b/service-uniapp-technician/pages/index/index.vue
index 1258ab8..18b03e3 100644
--- a/service-uniapp-technician/pages/index/index.vue
+++ b/service-uniapp-technician/pages/index/index.vue
@@ -95,7 +95,7 @@
¥ {{ item.money }}
- 总计时间：{{ item.useTime }}
+ 服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟
{{ item.createTime }}
diff --git a/service-uniapp-technician/pages/index/order.vue b/service-uniapp-technician/pages/index/order.vue
index 35d82cb..b4f9b61 100644
--- a/service-uniapp-technician/pages/index/order.vue
+++ b/service-uniapp-technician/pages/index/order.vue
@@ -85,10 +85,10 @@
下单时间：{{item.createTime}}
- 下单地址：{{item.addressId_dictText}}
+ 下单地址：{{item.address}}{{item.addressDetails || ''}}
- 总计时间：{{item.useTime}}分钟
+ 服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟
总价格：{{item.money}}元
@@ -178,7 +178,7 @@
this.dateList = []
let today = this.dayjs()
- this.selectDate = today;
+ // this.selectDate = today;
this.dateList.push(today)
diff --git a/service-uniapp-technician/pages/order/orderDetail.vue b/service-uniapp-technician/pages/order/orderDetail.vue
index 7875bae..79f3e5c 100644
--- a/service-uniapp-technician/pages/order/orderDetail.vue
+++ b/service-uniapp-technician/pages/order/orderDetail.vue
@@ -108,7 +108,7 @@
- 服务时间：{{msgOrder.startServiceTime}}
+ 服务时间：{{msgOrder.serviceDate}} {{msgOrder.serviceTime}}