Merge branch 'master' of http://122.51.230.86:3000/sunliwei/lanan-repair

# Conflicts:
#	config.js

config.js

@@ -2,7 +2,8 @@
 module.exports = {
 	// baseUrl: 'https://www.nuoyunr.com',
 	// baseUrl: 'http://192.168.1.17:48080',
-	baseUrl: "http://192.168.1.4:48080",
+	// baseUrl: "http://192.168.1.4:48080",
+	baseUrl: "http://localhost:48080",
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio/',
 	wsUrl: 'wss://www.nuoyunr.com',

pages/myReservation/addReservation.vue

@@ -70,7 +70,7 @@
 					</picker> -->
 					<view class="formItem_content" @click="selectServer">
 						<view class="label">预约项目</view>
-						<input disabled class="formItemInput" placeholder="请选择预约项目" type="text" v-model="service.name" />
+						<input disabled class="formItemInput" placeholder="请选择预约项目" type="text" v-model="service.label" />
 						<image v-if="!service.name" class="formItemBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit">
 						</image>
 					</view>
@@ -154,7 +154,7 @@
 				formData:{
 					userName: null,
 					userMobile: null,
-					projectId:  null,
+					repairType:  null,
 					carId: null,
 					carNo: null,
 					bookingTime: null,
@@ -266,7 +266,6 @@
 						url: '/pages/myReservation/reservationSuccess?info=' + encodeURIComponent(JSON.stringify(this.info))
 					})
 				}).catch(() => {})
-
 			},
 			async initCarList() {
 				const res = await request({
@@ -308,23 +307,20 @@
 			// 取服务
 			async getServer(corpId) {
 				const res = await request({
-					url: "/userClient/base/company/get",
+					url: "/userClient/dict/type?type=repair_type",
-					method: 'get',
+					method: 'get'
-					params: {
-						id: corpId
-					}
 				})
-				this.serviceList = res.data.servicePackages
+				this.serviceList = res.data
 			},
 			// 选择服务
 			selectServer(){
-				const servers = this.serviceList.map(item => item.name)
+				const servers = this.serviceList.map(item => item.label)
 				uni.showActionSheet({
 					itemList: servers,
 					success: (res) => {
 						this.service = this.serviceList[res.tapIndex]
-						this.formData.projectId = this.service.id
+						this.formData.repairType = this.service.value
-						this.info.serviceName = this.service.name
+						this.info.serviceName = this.service.label
 					},
 					fail: (err) => {
 						console.error('选择框显示失败：', err);