提交第二个版本

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))
+				// 	}
+				// })
 			},
 
 			//跳转技师详情

service-uniapp-client/pages/index/order.vue

@@ -41,10 +41,10 @@
 								下单时间：{{item.createTime}}
 							</view>
 							<view class="text-hidden-1">
-								下单地址：{{item.addressId_dictText}}
+								下单地址：{{item.address}}{{item.addressDetails || ''}}
 							</view>
 							<view class="text-hidden-1">
-								总计时间：{{item.useTime}}分钟
+								服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟
 							</view>
 							<view class="price">
 								总价格：<text class="num">{{item.money}}元</text>

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) {

service-uniapp-client/pages/order/orderDetail.vue

@@ -98,7 +98,7 @@
 						</view>
 						
 						<view class="sales-volume" style="margin-top: 5px;">
-							<view class="desc">服务时间：{{msgOrder.startServiceTime}}</view>
+							<view class="desc">服务时间：{{msgOrder.serviceDate}} {{msgOrder.serviceTime}}</view>
 						</view>
 						
 					</view>
@@ -139,12 +139,14 @@
 						服务地址
 					</view>
 					<view class="copy">
-						<image @click="copy(msgOrder.name + ' ' + msgOrder.phone + ' ' + msgOrder.address)" src="/static/order/copy.png"></image>
+						<image @click="copy(msgOrder.name + ' ' + 
+						msgOrder.phone + ' ' + msgOrder.address 
+						+  ' ' + (msgOrder.addressDetails || ''))" src="/static/order/copy.png"></image>
 					</view>
 				</view>
 				<view class="addressDetail">
 					<view class="">{{msgOrder.name}} {{msgOrder.phone}}</view>
-					<view class="">{{msgOrder.address}}</view>
+					<view class="">{{msgOrder.address}}{{msgOrder.addressDetails || ''}}</view>
 				</view>
 			</view>
 

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')//服务时间

service-uniapp-client/pages/technician/selectTechnician.vue

@@ -2,7 +2,9 @@
 	<view class="technician-select-list">
 		<mNavbar title="选择技师" :leftClick="leftClick"></mNavbar>
 		<view class="technician-list">
-			<selectTechnicianCompoents :technicianList="technicianList" :select="toPayOrder" />
+			<selectTechnicianCompoents 
+			v-if="loading"
+			:technicianList="technicianList" :select="toPayOrder" />
 		</view>
 	</view>
 </template>
@@ -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

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;

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]
 				}
 			})
 		},

service-uniapp-technician/pages/index/index.vue

@@ -95,7 +95,7 @@
 									<view>¥ {{ item.money }}</view>
 								</view>
 								<view class="flex-sb item-font2">
-									<view>总计时间：{{ item.useTime }}</view>
+									<view>服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟</view>
 									<view>{{ item.createTime }}</view>
 								</view>
 							</view>

service-uniapp-technician/pages/index/order.vue

@@ -85,10 +85,10 @@
 									下单时间：{{item.createTime}}
 								</view>
 								<view class="text-hidden-1">
-									下单地址：{{item.addressId_dictText}}
+									下单地址：{{item.address}}{{item.addressDetails || ''}}
 								</view>
 								<view class="text-hidden-1">
-									总计时间：{{item.useTime}}分钟
+									服务时间：{{item.serviceDate}} {{item.serviceTime}}服务{{item.useTime}}分钟
 								</view>
 								<view class="price">
 									总价格：<text class="num">{{item.money}}元</text>
@@ -178,7 +178,7 @@
 			this.dateList = []
 
 			let today = this.dayjs()
-			this.selectDate = today;
+			// this.selectDate = today;
 
 			this.dateList.push(today)
 

service-uniapp-technician/pages/order/orderDetail.vue

@@ -108,7 +108,7 @@
 							</view>
 						</view>
 						<view class="sales-volume" style="margin-top: 5px;">
-							<view class="desc">服务时间：{{msgOrder.startServiceTime}}</view>
+							<view class="desc">服务时间：{{msgOrder.serviceDate}} {{msgOrder.serviceTime}}</view>
 						</view>
 					</view>
 				</view>