更新

pages/goodSource/index.vue

@@ -68,15 +68,15 @@
 						<view class="flex flex-space-between yf-style">
 							<view class="left">
 								<view class="flex">
-									<view class="gray mr20">货距 {{good.cargoDistance}}km</view>
-									<view class="gray ">运距 {{good.distance}}km</view>
+									<view class="gray mr20" v-if="good.cargoDistance">货距 {{good.cargoDistance}}km</view>
+									<view class="gray " v-if="good.distance">运距 {{good.distance}}km</view>
 								</view>
 								<view class="u-flex-wrap flex gray row ">
 									<view>{{good.goodsName}} | </view>
 									<!-- <u-line direction="col"></u-line> -->
-									<view> {{carLength(good)}} | </view>
-									<view>{{carType(good)}} | </view>
-									<view>{{carWeight(good)}}</view>
+									<view v-if="carLength(good)"> {{carLength(good)}} | </view>
+									<view v-if="carType(good)">{{carType(good)}} | </view>
+									<view v-if="carWeight(good)">{{carWeight(good)}}</view>
 								</view>
 								<view class="flex row">
 									<view class="row-tips">{{good.taskDescription}}</view>

pages/mine/manageBankCards/addBankCard.vue

@@ -204,7 +204,6 @@
 											'/driverInfo/bankShibie', {
 												bankImg: result,
 											}).then(res => {
-											console.log(res)
 											_this.dataDetails.payeeAddressUrl = result
 											if (res.data.bankNo) {
 												_this.dataDetails.bankCard = res.data.bankNo
@@ -212,33 +211,23 @@
 											if (res.data.bankName) {
 												_this.dataDetails.bankDeposit = res.data.bankName
 											}
-
 											// 开户支行LIst
 											if (res.data.bankNameZhihang) {
 												_this.columns.push(res.data
 													.bankNameZhihang)
-
-
 											}
 											_this.$forceUpdate()
 										})
 										.catch(res => {
 											uni.$u.toast(res.message);
 										});
-
-
-
-
-
 								}
 							)
 						}
 					});
-
 				} else {
 					uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
 				}
-
 			},
 			//身份证正面
 			getImgUrl1(src) {

pages/mine/manageVehicles/addVehicle.vue

@@ -41,7 +41,7 @@
 				</view>
 				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -69,7 +69,7 @@
 				<view class="text" v-else>上传行驶证主页</view>
 			</view>
 			<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(1)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
+				<view @click.stop="delCard(3)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -83,7 +83,7 @@
 				<view class="text" v-else>上传行驶证副页</view>
 			</view>
 			<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(1)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
+				<view @click.stop="delCard(4)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -141,7 +141,7 @@
 				</view>
 				<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(5)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -156,7 +156,7 @@
 				</view>
 				<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(6)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -280,8 +280,6 @@
 
 			<!-- 挂车 -->
 			<view v-if="sign == '挂车'">
-
-
 				<view class="flex row">
 					<view class="left left-text">挂车车牌号</view>
 					<view class="right flex">
@@ -471,33 +469,25 @@
 			delCard(type) {
 				switch (type) {
 					case 1:
-						_this.dataDetails.driverLicenseHomePage = ""
+						_this.dataDetails.operationCertificate = ""  //道路运输证
 						break;
 					case 2:
-						_this.dataDetails.driverLicenseBackPage = ""
+						_this.dataDetails.trailerOperationCertificate = ""  //挂车道路运输证
 						break;
 					case 3:
-						_this.dataDetails.drivingLicenseHomePage = ""
+						_this.dataDetails.drivingLicenseHomePage = ""  //牵引车行驶证
 						break;
 					case 4:
-						_this.dataDetails.drivingLicenseBackPage = ""
+						_this.dataDetails.drivingLicenseBackPage = "" //牵引车行驶证副页
 						break;
 					case 5:
-						_this.dataDetails.trailerLicenseHomePage = ""
+						_this.dataDetails.trailerLicenseHomePage = ""  //挂车行驶证
 						break;
 					case 6:
-						_this.dataDetails.trailerLicenseBackPage = ""
-						break;
-					case 7:
-						_this.dataDetails.qualificationCertificate = ""
-						break;
-					case 8:
-						_this.dataDetails.operationCertificate = ""
-						break;
-					case 9:
-						_this.dataDetails.trailerOperationCertificate = ""
+						_this.dataDetails.trailerLicenseBackPage = ""//挂车行驶证副页
 						break;
 				}
+				_this.$forceUpdate()
 			},
 			uploadImg(type) {
 				this.uploadType = type
@@ -509,14 +499,11 @@
 			},
 			// 上传图片
 			imgTypeSelect(val) {
-				console.log(val)
-				console.log(this.uploadType)
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
-							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage("images", res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数

pages/mine/manageVehicles/editVehicle.vue

@@ -41,7 +41,7 @@
 				</view>
 				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -69,7 +69,7 @@
 				<view class="text" v-else>上传行驶证主页</view>
 			</view>
 			<view v-if="dataDetails.drivingLicenseHomePage" @click.stop="uploadImg(1)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
+				<view @click.stop="delCard(3)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -83,7 +83,7 @@
 				<view class="text" v-else>上传行驶证副页</view>
 			</view>
 			<view v-if="dataDetails.drivingLicenseBackPage" @click.stop="uploadImg(1)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
+				<view @click.stop="delCard(4)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -141,7 +141,7 @@
 				</view>
 				<view v-if="dataDetails.trailerLicenseHomePage" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(5)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -156,7 +156,7 @@
 				</view>
 				<view v-if="dataDetails.trailerLicenseBackPage" @click.stop="uploadImg(1)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(1)">
+					<view @click.stop="delCard(6)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -475,33 +475,25 @@
 			delCard(type) {
 				switch (type) {
 					case 1:
-						_this.dataDetails.driverLicenseHomePage = ""
+						_this.dataDetails.operationCertificate = ""  //道路运输证
 						break;
 					case 2:
-						_this.dataDetails.driverLicenseBackPage = ""
+						_this.dataDetails.trailerOperationCertificate = ""  //挂车道路运输证
 						break;
 					case 3:
-						_this.dataDetails.drivingLicenseHomePage = ""
+						_this.dataDetails.drivingLicenseHomePage = ""  //牵引车行驶证
 						break;
 					case 4:
-						_this.dataDetails.drivingLicenseBackPage = ""
+						_this.dataDetails.drivingLicenseBackPage = "" //牵引车行驶证副页
 						break;
 					case 5:
-						_this.dataDetails.trailerLicenseHomePage = ""
+						_this.dataDetails.trailerLicenseHomePage = ""  //挂车行驶证
 						break;
 					case 6:
-						_this.dataDetails.trailerLicenseBackPage = ""
-						break;
-					case 7:
-						_this.dataDetails.qualificationCertificate = ""
-						break;
-					case 8:
-						_this.dataDetails.operationCertificate = ""
-						break;
-					case 9:
-						_this.dataDetails.trailerOperationCertificate = ""
+						_this.dataDetails.trailerLicenseBackPage = ""//挂车行驶证副页
 						break;
 				}
+				this.$forceUpdate()
 			},
 			uploadImg(type) {
 				this.uploadType = type

pages/order/confirmLoading.vue

@@ -494,53 +494,53 @@
 							} else {
 								_title = '提交成功！'
 							}
-							that.$helper.fUN_AmapLocation.start({
-									// intervalTime: 1000 * 60,
-									intervalTime: 5000,
-									// locationCacheEnable:true,
-									isReport: false
-									// url: 'http://192.168.0.66/fun/open/test_json.do',
-									// params: {
-									// 	a: 1,
-									// 	B: '测试',
-									// 	c: true
-									// },
-									// headers: {
-									// 	a: '123',
-									// 	B: 'abcd'
-									// }
-								},
-								res => {
-									console.log('====确认装车开启连续定位====');
-									console.log(res)
-									let _data = {
-										orderId: that.id,
-										longitude: res.longitude,
-										latitude: res.latitude,
-										province: res.province,
-										city: res.city,
-										area: res.district
-									}
-									this.$helper.gjList.push(_data)
-									uni.setStorageSync('mapGJ', this.$helper.gjList);
-									console.log('this.$helper.gjList')
-									console.log(this.$helper.gjList)
-									console.log("条数", uni.getStorageSync('mapGJ').length)
-									if (uni.getStorageSync('mapGJ').length > 100) {
-										console.log(uni.getStorageSync('mapGJ'))
-										this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
-												hyOrderTravelPaths: uni.getStorageSync('mapGJ')
-											}).then(res => {
-												uni.removeStorageSync('mapGJ');
-												this.$helper.gjList = []
-											})
-											.catch(res => {
-												uni.$u.toast(res.message);
-											});
-									}
-									//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
-								}
-							);
+							// that.$helper.fUN_AmapLocation.start({
+							// 		// intervalTime: 1000 * 60,
+							// 		intervalTime: 5000,
+							// 		// locationCacheEnable:true,
+							// 		isReport: false
+							// 		// url: 'http://192.168.0.66/fun/open/test_json.do',
+							// 		// params: {
+							// 		// 	a: 1,
+							// 		// 	B: '测试',
+							// 		// 	c: true
+							// 		// },
+							// 		// headers: {
+							// 		// 	a: '123',
+							// 		// 	B: 'abcd'
+							// 		// }
+							// 	},
+								// res => {
+								// 	console.log('====确认装车开启连续定位====');
+								// 	console.log(res)
+								// 	let _data = {
+								// 		orderId: that.id,
+								// 		longitude: res.longitude,
+								// 		latitude: res.latitude,
+								// 		province: res.province,
+								// 		city: res.city,
+								// 		area: res.district
+								// 	}
+								// 	this.$helper.gjList.push(_data)
+								// 	uni.setStorageSync('mapGJ', this.$helper.gjList);
+								// 	console.log('this.$helper.gjList')
+								// 	console.log(this.$helper.gjList)
+								// 	console.log("条数", uni.getStorageSync('mapGJ').length)
+								// 	if (uni.getStorageSync('mapGJ').length > 100) {
+								// 		console.log(uni.getStorageSync('mapGJ'))
+								// 		this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {
+								// 				hyOrderTravelPaths: uni.getStorageSync('mapGJ')
+								// 			}).then(res => {
+								// 				uni.removeStorageSync('mapGJ');
+								// 				this.$helper.gjList = []
+								// 			})
+								// 			.catch(res => {
+								// 				uni.$u.toast(res.message);
+								// 			});
+								// 	}
+								// 	//判断缓存数据条数，超过reportInterval时清空缓存，重新存入缓存
+								// }
+							// );
 							this.$refs.uToast.show({
 								type: 'success',
 								message: _title,

pages/order/confirmUnloading.vue

@@ -98,7 +98,8 @@
 				validityPeriod: [],
 				sourceType: ['camera'],
 				detailData: {
-					addressUrl: ''
+					addressUrl: '',
+					hyCarrierInfo:{}
 				},
 				action: this.$helper.ossUploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -106,6 +107,7 @@
 				isShowAlert: false,
 				alertContent: '',
 				alertTitle: '',
+				localtion:{},
 			}
 		},
 		onLoad(options) {
@@ -129,6 +131,9 @@
 			this.getNowTime()
 		},
 		methods: {
+			deletePic(){
+				
+			},
 			getNowTime() {
 				let now = new Date();
 				let year = now.getFullYear(); //得到年份
@@ -145,25 +150,52 @@
 				this.isShowValidity = true
 			},
 			getLngLat() {
+				let that = this
 				uni.showLoading({
 					title: '获取定位中',
 					mask: true
 				})
+				// this.$helper.fUN_AmapLocation.start({
+				// 		intervalTime: 1000 * 3,
+				// 		isReport: false,
+				// 	},
+				// 	res => {
+				// 		//见下方定位返回示例
+				// 		console.log('====fUN_AmapLocation定位====', JSON.stringify(res));
+				// 		if (res.latitude) {
+				// 			this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
+				// 			this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
+				// 			this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.city)
+				// 			this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.district);
+				// 			console.log(this.detailData.carrierInfo.sendCity)
+				// 			console.log(this.detailData.carrierInfo.sendArea)
+				// 			this.$forceUpdate()
+			
+				// 		}
+			
+			
+				// 		this.$helper.fUN_AmapLocation.stop({}, result => {
+				// 				uni.hideLoading()
+				// 			console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+				// 		});
+				// 	}
+				// );
 				uni.getLocation({
 					type: 'gcj02',
 					geocode: true,
 					success: res => {
-						console.log('定位地址')
-						console.log(res)
 						if (res.latitude) {
-							this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
-							this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
-							this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.address.city)
-							this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.address
-								.district);
-							console.log(this.detailData.carrierInfo.sendCity)
-							console.log(this.detailData.carrierInfo.sendArea)
-							this.$forceUpdate()
+							// that.detailData.hyCarrierInfo.loadingAreaLongitude = res.longitude;
+							// that.detailData.hyCarrierInfo.loadingAreaLatitude = res.latitude;
+							
+							that.detailData.carrierInfo.unloadingAreaLongitude = res.longitude;
+							that.detailData.carrierInfo.unloadingAreaLatitude = res.latitude;
+							console.log("1234567890")
+							that.detailData.carrierInfo.unloadCity = that.$helper.filterUrban(res.address.city)
+							that.detailData.carrierInfo.unloadArea = that.$helper.filterUrban(res.address.district)
+							that.localtion.city = that.$helper.filterUrban(res.address.city)
+							that.localtion.sendArea = that.$helper.filterUrban(res.address.district)
+							that.$forceUpdate()
 							uni.hideLoading()
 						} else {
 							if (uni.getSystemInfoSync().platform == 'android') {
@@ -172,9 +204,9 @@
 									"android.location.LocationManager");
 								var main = plus.android.runtimeMainActivity();
 								var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
-								this.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
+								that.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
 							}
-							if (this.bool === false) {
+							if (that.bool === false) {
 								uni.showModal({
 									title: '提示',
 									content: '请打开定位服务',
@@ -196,8 +228,14 @@
 										}
 									}
 								});
+								uni.hideLoading()
 							}
 						}
+					},
+					fail: res => {
+						console.log('定位失败')
+						console.log(res)
+						uni.hideLoading()
 					}
 				});
 			},
@@ -270,7 +308,6 @@
 			},
 
 			submit(type) {
-				console.log(type)
 				if (type == 1) {
 					this.alertContent = '确定暂存卸车信息？'
 				} else {

pages/order/orderDetails.vue

@@ -12,7 +12,6 @@
 		<view class="content1">
 			<view class="item1">
 				<view class="status">{{dataObj.orderStatus}}</view>
-
 			</view>
 			<!-- flex flex-space-between -->
 			<view class="item2">
@@ -39,7 +38,7 @@
 				</view>
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
-						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon>
+						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)"></u-icon>
 					</view>
 
 					<view class="hz-name">联系货主</view>