Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

common/helper.js

@@ -98,7 +98,7 @@ const contactCustomerService = (phone) => {
 	console.log(phone)
 	//客服
 	if (!phone) {
-		phone = '400123123'
+		phone = '13304979986'
 	}
 	const res = uni.getSystemInfoSync();
 	// ios系统默认有个模态框

components/master-keyboard/master-keyboard.vue

@@ -121,7 +121,7 @@
 			return {
 				numberArr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
 				carProvinceArr: ['京', '津', '渝', '沪', '冀', '晋', '辽', '吉', '黑', '苏', '浙', '皖', '闽', '赣', '鲁', '豫',
-					'鳄', '湘', '粤', '琼', '川', '贵', '云', '陕', '甘', '青', '蒙', '桂', '宁', '新', '藏', '使',
+					'鄂', '湘', '粤', '琼', '川', '贵', '云', '陕', '甘', '青', '蒙', '桂', '宁', '新', '藏', '使',
 					'领', '警', '学', '港', '澳'
 				],
 				carLatterArr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',
 	// baseUrlNew: 'http://192.168.1.119:8999',
 	h5Appid: 'wxb66b599f7f61b46f',

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智运",
+    "name" : "畅运通",
     "appid" : "__UNI__9C76CB6",
     "description" : "",
-    "versionName" : "1.0.8",
-    "versionCode" : 108,
+    "versionName" : "1.0.9",
+    "versionCode" : 109,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -65,6 +65,9 @@
                         "__platform__" : [ "ios", "android" ],
                         "appkey_ios" : "450806e9eef29de257faad3a06ec7e9a",
                         "appkey_android" : "dc40c1be0513c1c8e01eb560318dbc68"
+                    },
+                    "system" : {
+                        "__platform__" : [ "ios", "android" ]
                     }
                 }
             },

pages/goodSource/index.vue

@@ -62,7 +62,6 @@
 							</view>
 						</view>
 						<view class="right gray">
-							<!-- {{good.createDate}} -->
 							{{$helper.changeTime(good.updateDate)}}
 						</view>
 						<view class="flex flex-space-between yf-style">
@@ -352,7 +351,7 @@
 			carType(good) {
 				let _val = '';
 				if (good.carModel == 1) {
-					_val = '不限'
+					_val = ''
 				} else {
 					if (good.carModel.includes(2)) {
 						_val += '高栏/'

pages/mine/driverCertification.vue

@@ -748,10 +748,7 @@
 													'/driverInfo/bankShibie', {
 														bankImg: result,
 													}).then(res => {
-													console.log(res)
-													_this.dataDetails.hyDriverPayeeInfoList[_this
-															.index]
-														.payeeAddressUrl = result
+													_this.dataDetails.hyDriverPayeeInfoList[_this.index].payeeAddressUrl = result
 													if (res.data.bankNo) {
 														_this.dataDetails.hyDriverPayeeInfoList[_this
 															.index].bankCard = res.data.bankNo
@@ -760,12 +757,10 @@
 														_this.dataDetails.hyDriverPayeeInfoList[_this
 															.index].bankDeposit = res.data.bankName
 													}
-
 													// 开户支行LIst
 													if (res.data.bankNameZhihang) {
 														_this.bankType[_this.index].push(res.data
 															.bankNameZhihang)
-
 													}
 													_this.$forceUpdate()
 												})

pages/mine/index.vue

@@ -416,6 +416,7 @@
 			margin-right: 10rpx;
 			width: 40rpx;
 			height: 40rpx;
+			margin-top: 4rpx;
 		}
 
 		.flex-space-between {

pages/mine/often/oftenRoute.vue

@@ -19,18 +19,14 @@
 				<view class="flex btns">
 					<view class="btn_css" @click="addRoute(item)">修改</view>
 					<view class="btn_css" @click="del(item.id)">删除</view>
-					<view  @click="showChane(item)">
-						<!-- <img src="../../static/images/exhibit.png" alt=""> -->
-						<image src="../../../static/images/riders/exhibit.png" mode="" v-if="item.displayFlag == 1"
-						style="width: 40rpx;height: 40rpx;margin:14rpx 0 0 20rpx;"></image>
-						<image src="../../../static/images/riders/hide.png" mode="" v-else
-						style="width: 40rpx;height: 40rpx;margin:14rpx 0 0 20rpx;"></image>
-					</view>
+					<view class="btn_css" @click="showChane(item)">{{item.displayFlag == 1?"显示中":"已隐藏"}}</view>
 				</view>
 			</view>
-			<u-loadmore :status="status"  :nomore-text="nomoreText" />
+			<u-loadmore :status="status" :nomore-text="nomoreText" />
 		</view>
 		<u-toast ref="uToast"></u-toast>
+		<u-modal :show="tipsShow" :title="tipsText" :closeOnClickOverlay='true' :showCancelButton='true'
+			confirmColor='#2772FB' @confirm="delSubmit" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<view class="bottom_add">
 			<view class="add_btn" @click="addRoute(1)">添加常用路线</view>
 			<span class="tips">最多可创建50条</span>
@@ -45,7 +41,10 @@
 			return {
 				routeData: [],
 				status: 'loadmore',
-				 nomoreText: '实在没有了'
+				nomoreText: '实在没有了~',
+				tipsShow: false,
+				tipsText: "",
+				delId: "",
 			}
 		},
 		onShow() {},
@@ -56,15 +55,16 @@
 			this.addRoute(1)
 		},
 		methods: {
-			del(ids) {
+			delSubmit() {
 				this.$request.baseRequest('post', '/commonRoute/api/delete', {
-						id: ids
+						id: this.delId
 					}).then(res => {
 						if (res.code == 200) {
 							this.$refs.uToast.show({
 								type: 'success',
 								message: "删除成功！",
 							})
+							this.tipsShow = false
 							this.getList()
 						}
 					})
@@ -72,6 +72,14 @@
 						uni.$u.toast(res.message);
 					});
 			},
+			del(ids) {
+				this.tipsText = "确定删除改常用路线？"
+				this.tipsShow = true
+				this.delId = ids
+			},
+			cancelClick() {
+				this.tipsShow = false
+			},
 			getList() {
 				this.status = 'loading';
 				this.$request.baseRequest('get', '/commonRoute/select', {
@@ -81,9 +89,9 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.routeData = res.data.records
-							if(res.data.total == 0){
+							if (res.data.total == 0) {
 								this.status = 'nomore'
-							}else{
+							} else {
 								this.status = 'loadmore'
 							}
 						}
@@ -92,26 +100,23 @@
 						uni.$u.toast(res.message);
 					});
 			},
-			showChane(item){
-				console.log(item)
-				if(item.displayFlag == 1){
+			showChane(item) {
+				if (item.displayFlag == 1) {
 					item.displayFlag = 2
-				}else{
+				} else {
 					item.displayFlag = 1
-				} 
+				}
 				this.$request.baseRequest('post', '/commonRoute/api/edit', item).then(res => {
 						if (res.code == 200) {
-							if(item.displayFlag == 1){
+							if (item.displayFlag == 1) {
 								this.$refs.uToast.show({
 									type: 'success',
 									message: "路线展示中！",
-									
 								})
-							}else{
+							} else {
 								this.$refs.uToast.show({
 									type: 'success',
 									message: "路线已隐藏！",
-									
 								})
 							}
 						}
@@ -131,7 +136,6 @@
 						id: item.id
 					})
 				}
-
 			},
 		}
 	}
@@ -139,6 +143,7 @@
 
 <style lang="scss" scoped>
 	.center {
+		height: calc(100vh - 25vh);
 		padding: 30rpx 30rpx 200rpx;
 		background: #F2F4F7;
 		position: flex;
@@ -218,10 +223,11 @@
 		bottom: 0;
 		width: 100%;
 		height: 160rpx;
-		padding-top: 30rpx ;
+		padding-top: 30rpx;
 		background: #FFFFFF;
 		text-align: center;
-		.add_btn{
+
+		.add_btn {
 			width: 90%;
 			height: 70rpx;
 			line-height: 70rpx;
@@ -233,11 +239,12 @@
 			// height: 60rpx;
 			margin: 0 auto;
 		}
-		.tips{
+
+		.tips {
 			text-align: center;
 			color: #ABABAB;
 			font-size: 24rpx;
 		}
-		
+
 	}
 </style>

pages/mine/set.vue

@@ -232,6 +232,7 @@ color: #333333;
 	.picture {
 		width: 35px;
 		height: 35px;
+		border-radius: 18px;
 	}
 
 	.arrow {

pages/mine/settings/editAvatar.vue

@@ -4,7 +4,6 @@
 			<image class="xj-image" v-if="!deptListurl.avatarUrl" src="@/static/images/common/tianjiazhaopian@2x.png">
 			</image>
 			<image  :src="deptListurl.avatarUrl" v-if="deptListurl.avatarUrl" style="width: 100%;height: 100%;"></image>
-
 		</view>
 		<view @click="submit" class="submit">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
@@ -40,25 +39,21 @@
 		},
 		methods: {
 			upload() {
-				this.isShowimgType = true
+				this.imgTypeSelect()
 			},
 			imgTypeSelect(val) {
-				console.log(val)
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: that.$helper.chooseImage.sourceType,
+						// sourceType: that.$helper.chooseImage.sourceType,
 						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
-									console.log('图片地址', result)
 									that.$request.baseRequest('get', '/BDAccessToken/getAuth', {
 											apiKey: 'yNWLRW6unoUxo2KXiCZxOxGS',
 											secretKey: 'E8hqzKWdFdTGnFnpAwZ7ixtL89SN3deR'
 										}).then(res => {
-											console.log(res)
 											that.$request.baseRequest('post',
 													'/commonUser/getUserDefinedBean', {
 														accessToken: res.data,
@@ -73,51 +68,48 @@
 										.catch(res => {
 											uni.$u.toast(res.message);
 										});
-
-
-
 								}
 							)
 						}
 					});
 
-				} else {
-					uni.chooseImage({
-						count: 1,
-						sourceType: ['camera'],
-						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
-								result => {
-									// 上传成功
-									console.log('图片地址', result)
-									that.$request.baseRequest('get', '/BDAccessToken/getAuth', {
-											apiKey: 'yNWLRW6unoUxo2KXiCZxOxGS',
-											secretKey: 'E8hqzKWdFdTGnFnpAwZ7ixtL89SN3deR'
-										}).then(res => {
-											console.log(res)
-											that.$request.baseRequest('post',
-													'/commonUser/getUserDefinedBean', {
-														accessToken: res.data,
-														imagePath: result
-													}).then(res1 => {
-													that.deptListurl.avatarUrl = result
-												})
-												.catch(res => {
-													uni.$u.toast(res.message);
-												});
-										})
-										.catch(res => {
-											uni.$u.toast(res.message);
-										});
+				// } else {
+				// 	uni.chooseImage({
+				// 		count: 1,
+				// 		sourceType: ['camera'],
+				// 		success: function(res) {
+				// 			console.log(JSON.stringify(res.tempFilePaths));
+				// 			uploadImage(res.tempFilePaths[0], 'appData/',
+				// 				result => {
+				// 					// 上传成功
+				// 					console.log('图片地址', result)
+				// 					that.$request.baseRequest('get', '/BDAccessToken/getAuth', {
+				// 							apiKey: 'yNWLRW6unoUxo2KXiCZxOxGS',
+				// 							secretKey: 'E8hqzKWdFdTGnFnpAwZ7ixtL89SN3deR'
+				// 						}).then(res => {
+				// 							console.log(res)
+				// 							that.$request.baseRequest('post',
+				// 									'/commonUser/getUserDefinedBean', {
+				// 										accessToken: res.data,
+				// 										imagePath: result
+				// 									}).then(res1 => {
+				// 									that.deptListurl.avatarUrl = result
+				// 								})
+				// 								.catch(res => {
+				// 									uni.$u.toast(res.message);
+				// 								});
+				// 						})
+				// 						.catch(res => {
+				// 							uni.$u.toast(res.message);
+				// 						});
 					
 					
 					
-								}
-							)
-						}
-					});
-				}
+				// 				}
+				// 			)
+				// 		}
+				// 	});
+				// }
 
 			},
 			submit() {

pages/order/signContract.vue

@@ -49,14 +49,14 @@
 				完善信息
 			</view>
 			<view class='row-between'>
-				<view class="gray">运费</view>
+				<view class="gray">运费(元/车)</view>
 				<!-- <view class="">{{dataDetails.freight}}{{dataDetails.illingMethod==0?'元/吨':'元/车'}}</view> -->
 				<!-- 				<view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
 						class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
 				<view class="flex">
 					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight"
 						inputAlign='right' clearable></u--input>
-					<!-- <span>元/车</span> -->
+					<!-- <span> 元/车</span> -->
 				</view>
 			</view>
 			<view class='row-between'>
@@ -269,8 +269,8 @@
 				title: '加载中'
 			})
 			this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
-					driverId: that.userInfo.driverId,
-					// driverId:this.firstAuthentication.id
+					// driverId: that.userInfo.driverId,
+					commonId:this.userInfo.id
 				}).then(res => {
 					if (res.code == '200') {
 						uni.hideLoading()
@@ -411,9 +411,6 @@
 					})
 					return
 				}
-				
-				
-				
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.startDates = that.dataDetails.startDates
 				_obj.endDates = that.dataDetails.endDates

pages/riders/index.vue

@@ -430,13 +430,20 @@
 			getList() {
 				this.status = 'loading';
 				if (this.indexbtn == 1) {
+					// if(this.sendInfo.sendProvince == "北京"||this.sendInfo.sendProvince == "重庆"||this.sendInfo.sendProvince == "天津"||this.sendInfo.sendProvince == "上海"){
+					// 	this.sendInfo.sendCity = this.sendInfo.sendProvince
+					// 	this.sendInfo.sendProvince = ""
+					// }
+					if(this.unloadInfo.unloadProvince =="全国"){
+						this.unloadInfo.unloadProvince= ""
+					}
 					this.$request.baseRequest('get', '/commonRoute/driverList', {
 							pageSize: 10,
 							currentPage: 1,
 							sendProvince: this.sendInfo.sendProvince,
 							sendCity: this.sendInfo.sendCity,
 							sendArea: this.sendInfo.sendArea,
-							unloadProvince: this.unloadInfo.unloadProvince,
+							unloadProvince: this.unloadInfo.unloadProvince ,
 							unloadCity: this.unloadInfo.unloadCity,
 							unloadArea: this.unloadInfo.unloadArea
 						}).then(res => {
@@ -539,8 +546,7 @@
 			justify-content: flex-end;
 
 			.flex-end {
-				margin-top: 50rpx;
-				margin-right: 30rpx;
+				margin: 60rpx 30rpx 0 0;
 			}
 
 			.center_top {