前端

hybrid/html/map.html

@@ -48,8 +48,10 @@
 				}
 				return null;
 			}
-			// let starLnglat = getQuery('lat').toString().split(',');
-			let starLnglat = [40.243655, 122.114407]
+			let starLnglat = getQuery('lat').toString().split(',');
+			let endLnglat = getQuery('unsendaddress').toString().split(',')
+			console.log(endLnglat,111111111)
+			// let starLnglat = [40.243655, 122.114407]
 			console.log('---------------------')
 			console.log(starLnglat)
 			var map = new AMap.Map('container', {
@@ -78,34 +80,35 @@
 				hideMarkers: false, // 设置隐藏路径规划的起始点图标
 				autoFitView: true
 			}
-			var dis = getDistance(122.114407, 40.243655, 122.114407, 42.243655)
+			// var dis = getDistance(starLnglat[1], starLnglat[0], endLnglat[1], endLnglat[0])
+			var dis = '距离'+getQuery('distance')+'公里'
 			document.getElementById("distance").innerHTML = dis
-			console.log(dis)
-			render(122.114407, 42.243655)
+			// console.log(dis)
+			render(endLnglat[1], endLnglat[0])
 
-			function getDistance(lat1, lng1, lat2, lng2) {
-				function Rad(d) {
-					return d * Math.PI / 180.0;
-				}
-				if (!lat1 || !lng1) {
-					return '';
-				}
-				// lat1用户的纬度
-				// lng1用户的经度
-				// lat2商家的纬度
-				// lng2商家的经度
-				let radLat1 = Rad(lat1);
-				let radLat2 = Rad(lat2);
-				let a = radLat1 - radLat2;
-				let b = Rad(lng1) - Rad(lng2);
-				let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) *
-					Math.pow(
-						Math.sin(b / 2), 2)));
-				s = s * 6378.137;
-				s = Math.round(s * 10000) / 10000;
-				s = '距离' + s.toFixed(2) + '公里' //保留两位小数
-				return s
-			}
+			// function getDistance(lat1, lng1, lat2, lng2) {
+			// 	function Rad(d) {
+			// 		return d * Math.PI / 180.0;
+			// 	}
+			// 	if (!lat1 || !lng1) {
+			// 		return '';
+			// 	}
+			// 	// lat1用户的纬度
+			// 	// lng1用户的经度
+			// 	// lat2商家的纬度
+			// 	// lng2商家的经度
+			// 	let radLat1 = Rad(lat1);
+			// 	let radLat2 = Rad(lat2);
+			// 	let a = radLat1 - radLat2;
+			// 	let b = Rad(lng1) - Rad(lng2);
+			// 	let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) *
+			// 		Math.pow(
+			// 			Math.sin(b / 2), 2)));
+			// 	s = s * 6378.137;
+			// 	s = Math.round(s * 10000) / 10000;
+			// 	s = '距离' + s.toFixed(2) + '公里' //保留两位小数
+			// 	return s
+			// }
 
 			function render(endLng, endLat) {
 				// 构造路线导航类

pages/goodSource/cargoOwnerSee.vue

@@ -41,9 +41,12 @@
 		<!-- 货主信息 -->
 		<view v-if="indexBtn == 1" class="enterprise">
 			<view>
-				<view class="enterprise_title" v-if="objectInfo.cargoOwner">所属企业</view>
-				<view class="enterprise_title" v-if="!objectInfo.cargoOwner">个人货主，暂未代理企业</view>
-				<view class="enterprise_name" v-if="objectInfo.cargoOwner">{{objectInfo.cargoOwner}}</view>
+				<view class="enterprise_title" v-if="companyList.length>0">所属企业:</view>
+				<view class="enterprise_title" v-else>个人货主，暂未代理企业</view>
+				<view v-for='item in companyList'>
+					{{item.company?item.company:item.companyName}}
+				</view>
+			<!-- 	<view class="enterprise_name" v-if="companyList.length>0">{{objectInfo.cargoOwner}}</view> -->
 			</view>
 		</view>
 		<!-- 评价信息 -->
@@ -135,6 +138,8 @@
 				],
 				id: "",
 				objectInfo: {},
+				companyList:[],
+				commonId:'',
 				indexBtn: 1,
 				btnData: 1,
 				totalPL:'0'
@@ -148,6 +153,7 @@
 		},
 		onLoad(options) {
 			that = this
+			this.commonId=options.commonId
 			this.objectInfo = options
 			console.log(options)
 
@@ -162,6 +168,39 @@
 				this.show = false
 			},
 			upCallback(page) {
+				console.log(this.commonId,11111111)
+				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {
+						commonId: this.commonId
+					}).then(res => {
+						console.log(res)
+						// 可用企业货主
+						this.companyList = []
+						// 自己法人
+						// let _self = res.data.companyInfoList
+						let _self = res.data.hyCompanyInfoList
+						//代理货主
+						// let _dlhz = res.data.cargoOwnerCompInfoList
+						let _dlhz = res.data.hyCargoOwnerCompInfoList
+						if (!_dlhz) _dlhz = []
+						if (!_self) _self = []
+						if (_self.length > 0) {
+							for (let i = 0; i < _self.length; i++) {
+								if (_self[i].status == '已认证') {
+									this.companyList.push(_self[i])
+								}
+							}
+						}
+						if (_dlhz.length > 0) {
+							for (let i = 0; i < _dlhz.length; i++) {
+								if (_dlhz[i].status == '已认证') {
+									this.companyList.push(_dlhz[i])
+								}
+							}
+						}
+						console.log(this.companyList)
+						this.$forceUpdate()
+					})
+					.catch(res => {});
 				that.$request.baseRequest('get', '/evaluateInfo/selectEvaluateInfo', {
 						evaluatoredId: this.objectInfo.commonId,
 						flag: 2,

pages/goodSource/index.vue

@@ -420,11 +420,23 @@
 					geocode: true,
 					success: res => {
 						if (res.latitude) {
+							console.log(res)
 							if(res.address.city){
 								if(res.address.city.indexOf('市')!=-1){
 									res.address.city=res.address.city.substring(0,res.address.city.length-1)
 								}
 							}
+							if(res.address.province){
+								if(res.address.province.indexOf('省')!=-1){
+									res.address.province=res.address.province.substring(0,res.address.province.length-1)
+								}
+							}
+							uni.setStorageSync('fPlaceObj',{
+								fchoosearea:'全部',
+								fchoosecity:res.address.city,
+								fchooseprovince:res.address.province,
+								selected:res.address.city
+							})
 							let _pickerSelect;
 							if (that.pickerSelect == '运费先付') {
 								_pickerSelect = 1
@@ -449,6 +461,7 @@
 							that.lat = res.latitude;
 							that.$request.baseRequest('get', '/publishTaskInfo/selectGoodsSource', _data).then(res => {
 									if (res.code == 200) {
+										console.log(res.data.records)
 										uni.hideLoading()
 										that.mescroll.endBySize(res.data.records.length, res.data.total);
 										that.goods = res.data.records
@@ -610,8 +623,30 @@
 							mask: true,
 							title: '加载中'
 						})
+						console.log(_data)
 						this.$request.baseRequest('get', '/publishTaskInfo/selectGoodsSource', _data).then(res => {
 								if (res.code == 200) {
+									console.log(res.data.records)
+									// if(res.data.records){
+										
+									// }
+									for(var i=0;i<res.data.records.length;i++){
+										if(res.data.records[i].cargoDistance){
+											if(res.data.records[i].cargoDistance>10){
+												res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(0)
+											}else{
+												res.data.records[i].cargoDistance=res.data.records[i].cargoDistance.toFixed(1)
+											}	
+										}
+										if(res.data.records[i].distance){
+											if(res.data.records[i].distance>10){
+												res.data.records[i].distance=res.data.records[i].distance.toFixed(0)
+											}else{
+												res.data.records[i].distance=res.data.records[i].distance.toFixed(1)
+											}
+											
+										}
+									}
 									uni.hideLoading()
 									this.mescroll.endBySize(res.data.records.length, res.data.total);
 									// for (var i = 0; i < res.data.records.length; i++) {

pages/goodSource/map.vue

@@ -25,7 +25,9 @@
 				})
 			},
 			srcHandler() {
-				return `/hybrid/html/map.html?lat=${this.lat}`
+				var unsendaddress=uni.getStorageSync('unsendaddress').unsendLatitude+','+uni.getStorageSync('unsendaddress').unsendLongitude
+				console.log(this.lat,)
+				return `/hybrid/html/map.html?lat=${this.lat}&unsendaddress=${unsendaddress}&distance=${uni.getStorageSync('distance')}`
 			},
 			getLngLat() {
 				uni.getLocation({

pages/goodSource/selectCity.vue

@@ -148,10 +148,65 @@
 			} else {
 				this.historyScityList = []
 			}
-
-
 			//赋值地区
 		},
+		mounted() {
+			if (uni.getStorageSync('fPlaceObj')) {
+				this.fchooseprovince=uni.getStorageSync('fPlaceObj').fchooseprovince
+				this.fchoosecity=uni.getStorageSync('fPlaceObj').fchoosecity
+				this.fchoosearea=uni.getStorageSync('fPlaceObj').fchoosearea
+				for (var i = 0; i < this.fprovincelist.length; i++) {
+					if(this.fprovincelist[i].label==this.fchooseprovince){
+						this.fprovincelist[i].checked=true
+						this.fcitylist = this.fprovincelist[i].child
+						for (var q = 0; q < this.fcitylist.length; q++) {
+							if(this.fcitylist[q].label==this.fchoosecity){
+								this.fcitylist[q].checked=true
+								this.farealist = this.fcitylist[i].child
+								for (var area = 0; area < this.farealist.length; area++) {
+									if(this.farealist[area].label==this.fchoosearea){
+										this.farealist[area].checked=true
+									}
+								}
+							}
+						}
+					}
+				}
+				this.fstatus=2
+			}
+			if (uni.getStorageSync('sPlaceObj')) {
+				// sprovincelist
+				// console.log(this.sprovincelist)
+				this.schooseprovince=uni.getStorageSync('sPlaceObj').schooseprovince
+				this.schoosecity=uni.getStorageSync('sPlaceObj').schoosecity
+				this.schoosearea=uni.getStorageSync('sPlaceObj').schoosearea
+				
+				if(this.schooseprovince=='全国'){
+					this.sstatus=0
+					this.$set(this.sprovincelist[0],'checked',true)
+					this.issprovince=0
+				}else{
+					for (var i = 0; i < this.sprovincelist.length; i++) {
+						if(this.sprovincelist[i].label==this.schooseprovince){
+							this.sprovincelist[i].checked=true
+							this.scitylist = this.sprovincelist[i].child
+							for (var q = 0; q < this.scitylist.length; q++) {
+								if(this.scitylist[q].label==this.schoosecity){
+									this.scitylist[q].checked=true
+									this.sarealist = this.scitylist[i].child
+									for (var area = 0; area < this.sarealist.length; area++) {
+										if(this.sarealist[area].label==this.schoosearea){
+											this.sarealist[area].checked=true
+										}
+									}
+								}
+							}
+						}
+					}
+					this.sstatus=2
+				}
+			}
+		},
 		methods: {
 			historyClick(type,val){
 				console.log(type)
@@ -228,18 +283,26 @@
 			confirmBtn() {
 				
 				//设置地区 0发货地 1收货地
-				if (this.type == 0) {
 					if (this.fchooseprovince == '选择' ||(this.fchoosearea == '请选择区'&&this.fchoosecity!='全部')|| (this.fchoosecity == '请选择市' && this.fchooseprovince != '全国')) {
 							this.$refs.uToast.show({
 								type: 'error',
-								message: "请选择区域！",
+								message: "请选择发货地区域！",
 							})
 					return
 					}
+					
+					//收货地
+					if (this.schooseprovince == '选择' ||(this.schoosearea == '请选择区'&&this.schoosecity!='全部'&& this.schooseprovince != '全国')|| (this.schoosecity == '请选择市' && this.schooseprovince != '全国')) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择收货地区域！",
+						})
+						return
+					}
 					// }
-					console.log("省", this.fchooseprovince)
-					console.log("市", this.fchoosecity)
-					console.log("区", this.fchoosearea)
+					// console.log("省", this.fchooseprovince)
+					// console.log("市", this.fchoosecity)
+					// console.log("区", this.fchoosearea)
 					let _obj = {
 						fchooseprovince: this.fchooseprovince,
 						fchoosecity: this.fchoosecity,
@@ -297,21 +360,12 @@
 						});
 					}
 					console.log(this.historyFcityList)
-					uni.switchTab({
-						url: '/pages/goodSource/index'
-					});
-				} else {
-					//收货地
-					if (this.schooseprovince == '选择' ||(this.schoosearea == '请选择区'&&this.schoosecity!='全部')|| (this.schoosecity == '请选择市' && this.schooseprovince != '全国')) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "请选择区域！",
-						})
-					}
-					console.log(this.schooseprovince)
-					console.log(this.schoosecity)
-					console.log(this.schoosearea)
-					let _obj = {
+					// uni.switchTab({
+					// 	url: '/pages/goodSource/index'
+					// });
+				// } else {
+					
+					let _obj1 = {
 						schooseprovince: this.schooseprovince,
 						schoosecity: this.schoosecity,
 						schoosearea: this.schoosearea,
@@ -319,44 +373,44 @@
 					}
 					//选中全国
 					if (this.schoosecity == '请选择市' && this.schooseprovince == '全国') {
-						_obj.selected = this.schooseprovince
-						this.historyScityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
+						_obj1.selected = this.schooseprovince
+						this.historyScityList.unshift(_obj1)
+						let _newList = this.makeHistoryList(_obj1)
 						uni.setStorageSync('sPlaceList', _newList);
 					}
 					//选择省
 					if (this.schoosearea == '请选择区' && this.schoosecity == '全部') {
-						_obj.selected = this.schooseprovince
-						this.historyScityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
+						_obj1.selected = this.schooseprovince
+						this.historyScityList.unshift(_obj1)
+						let _newList = this.makeHistoryList(_obj1)
 
 						uni.setStorageSync('sPlaceList', _newList);
 					}
 					//选择市
 					if (this.schoosearea == '全部') {
 						if(this.schoosecity=='市辖区'){
-							_obj.selected = this.schooseprovince
+							_obj1.selected = this.schooseprovince
 						}else{
-							_obj.selected = this.schoosecity
+							_obj1.selected = this.schoosecity
 						}
 						
-						this.historyScityList.unshift(_obj)
-						let _newList = this.makeHistoryList(_obj)
+						this.historyScityList.unshift(_obj1)
+						let _newList = this.makeHistoryList(_obj1)
 						uni.setStorageSync('sPlaceList', _newList);
 					}
-					uni.setStorageSync('sPlaceObj', _obj);
+					uni.setStorageSync('sPlaceObj', _obj1);
 					//选择区
 					if (this.schoosearea != '请选择区' && this.schoosearea != '全部') {
 						let _list = this.schoosearea.split(',')
 						let _newList
 						for (let i = 0; i < _list.length; i++) {
 
-							let _deepObj = uni.$u.deepClone(_obj)
+							let _deepObj = uni.$u.deepClone(_obj1)
 							_deepObj.selected = _list[i]
 							this.historyScityList.unshift(_deepObj)
 							_newList = this.makeHistoryList(_deepObj)
 						}
-						console.log(_newList)
+						// console.log(_newList)
 						uni.setStorageSync('sPlaceList', this.historyScityList);
 						uni.setStorageSync('sPlaceObj', {
 							schooseprovince: this.schooseprovince,
@@ -366,10 +420,15 @@
 						});
 					}
 					console.log(this.historyScityList)
+					this.schooseprovince='选择'
+					this.schoosecity='请选择市'
+					this.schoosearea='请选择区'
+					this.fchooseprovince='选择'
+					this.fchoosecity='请选择市'
+					this.fchoosearea='请选择区'
 					uni.switchTab({
 						url: '/pages/goodSource/index'
 					});
-				}
 			},
 			//返回上一级
 			backLevel() {
@@ -449,6 +508,7 @@
 			},
 			// 选择省
 			selectProvince(item, i, statusIndex) {
+				console.log(this.type)
 				this.count = 0;
 				if (this.type == 0) {
 					if (i == 0) {

pages/goodSource/shippingDetails.vue

@@ -14,7 +14,7 @@
 					<view class="left flex">
 						<u--image :src="detailData.cargoOwnerPortrait?detailData.cargoOwnerPortrait:'../../static/images/mine/tx.png'" width='122rpx' height='122rpx' shape="circle">
 						</u--image>
-						<view class="fontsize-46 ml20">{{detailData.cargoOwnerName}}</view>
+						<view class="fontsize-46 ml20">{{detailData.cargoOwnerCall}}</view>
 					</view>
 					<view class="right">
 						<view class="flex">
@@ -90,13 +90,14 @@
 						</view>
 						<view class="in-row flex">
 							<view class="text">装车</view>
-							<view class="time">{{detailData.loadingDateStart}}~{{detailData.loadingDateEnd}}</view>
+							<view class="time" v-if='detailData.loadingDateStart=="随时"&&detailData.loadingDateEnd=="随时"'>{{detailData.loadingDateStart}}</view>
+							<view class="time" v-else>{{detailData.loadingDateStart}}~{{detailData.loadingDateEnd}}</view>
 						</view>
 					</view>
 				</view>
 				<view class="flex align-center">
 					<view class="left">车型</view>
-					<view class="right">{{carLength}} | {{carType}} | {{carWeight}}</view>
+					<view class="right"><text v-if='carLength!="不限"'>{{carLength}} </text> <text v-if='carType!="不限"'>| {{carType}} </text><text v-if='carWeight!="不限"'>| {{carWeight}} </text></view>
 				</view>
 				<view class="flex mt20">
 					<view class="left">描述</view>
@@ -217,6 +218,11 @@
 					});
 			},
 			toMap() {
+				uni.setStorageSync('unsendaddress',{
+					unsendLatitude:this.detailData.unsendLatitude,
+					unsendLongitude:this.detailData.unsendLongitude,
+					})
+				uni.setStorageSync('distance',this.detailData.distance,)
 				uni.$u.route('/pages/goodSource/map', {
 					id: 1,
 				});
@@ -240,6 +246,7 @@
 				let _obj = {
 					driverCommonId: this.firstAuthentication.commonId,
 					commonId: item.commonId,
+					id:item.id,
 					cargoOwnerName: item.cargoOwnerName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,

pages/mine/manageVehicles/addVehicle.vue

@@ -230,12 +230,12 @@
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
 				<view class="left-text">总质量（千克）</view>
-				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
+				<u--input type='number' placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">整备质量（千克）</view>
-				<u--input placeholder="输入整备质量" inputAlign='left' border="none" v-model="dataDetails.servicingWeight">
+				<u--input type='number' placeholder="输入整备质量" inputAlign='left' border="none" v-model="dataDetails.servicingWeight">
 				</u--input>
 			</view>
 			<view class="flex row noborder" v-if="sign == '挂车'">
@@ -246,7 +246,7 @@
 			</view>
 			<view class="flex row noborder input-ckg">
 				<view class="input-positon">
-					<u--input class="input" placeholder="长" inputAlign='left' border="none"
+					<u--input type='number' class="input" placeholder="长" inputAlign='left' border="none"
 						v-model="dataDetails.carLong">
 					</u--input>
 					<view class="position-right">
@@ -255,7 +255,7 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
-					<u--input placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.carWidth">
+					<u--input type='number' placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.carWidth">
 					</u--input>
 					<view class="position-right">
 						mm
@@ -263,7 +263,7 @@
 				</view>
 				<view class="star">*</view>
 				<view class="input-positon">
-					<u--input placeholder="高" inputAlign='left' border="none" v-model="dataDetails.carHeight">
+					<u--input type='number' placeholder="高" inputAlign='left' border="none" v-model="dataDetails.carHeight">
 					</u--input>
 					<view class="position-right">
 						mm
@@ -284,7 +284,7 @@
 					<view class="left left-text">挂车车牌号</view>
 					<view class="right flex">
 						<input class="car-uumber" v-model='dataDetails.guaCarNumber'
-							@click.stop="handleShowKeyboard1(index)" :disabled="true" placeholder="输入挂车牌号"
+							@click.stop="handleShowKeyboard1(index)" :disabled="true" placeholder-class= "phsy" placeholder="输入挂车牌号"
 							name="input"></input>
 					</view>
 				</view>
@@ -296,13 +296,13 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">整备质量（千克）</view>
-					<u--input placeholder="输入整备质量" inputAlign='left' border="none"
+					<u--input type='number' placeholder="输入整备质量" inputAlign='left' border="none"
 						v-model="dataDetails.guaServicingWeight">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">核定载质量（千克）</view>
-					<u--input placeholder="输入核定载质量" inputAlign='left' border="none"
+					<u--input type='number' placeholder="输入核定载质量" inputAlign='left' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
 				</view>
@@ -311,7 +311,7 @@
 				</view>
 				<view class="flex row noborder input-ckg">
 					<view class="input-positon">
-						<u--input class="input" placeholder="长" inputAlign='left' border="none"
+						<u--input type='number' class="input" placeholder="长" inputAlign='left' border="none"
 							v-model="dataDetails.guaCarLong">
 						</u--input>
 						<view class="position-right">
@@ -320,7 +320,7 @@
 					</view>
 					<view class="star">*</view>
 					<view class="input-positon">
-						<u--input placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.guaCarWidth">
+						<u--input type='number' placeholder="宽" inputAlign='left' border="none" v-model="dataDetails.guaCarWidth">
 						</u--input>
 						<view class="position-right">
 							mm
@@ -328,7 +328,7 @@
 					</view>
 					<view class="star">*</view>
 					<view class="input-positon">
-						<u--input placeholder="高" inputAlign='left' border="none" v-model="dataDetails.guaCarHeight">
+						<u--input type='number' placeholder="高" inputAlign='left' border="none" v-model="dataDetails.guaCarHeight">
 						</u--input>
 						<view class="position-right">
 							mm
@@ -1204,12 +1204,15 @@
 							// })
 							// uni.$u.route('/pages/mine/manageVehicles/index');
 
-						} else {
+						} else if (res.code == '400'){
+							uni.$u.toast('您输入的内容有问题，请检查后重新提交');
+						}else{
 							uni.$u.toast(res.message);
 						}
 
 					})
 					.catch(res => {
+						console.log(res)
 						uni.$u.toast(res.message);
 					});
 
@@ -1406,6 +1409,10 @@
 		z-index: 9;
 	}
 	/deep/.uni-input-input:disabled{
-		background:#fff;
+		background:transparent;
 	}
+	.phsy {
+			// font-size: 20px !important;
+			color: #999 !important
+		}
 </style>

pages/order/confirmLoading.vue

@@ -77,7 +77,7 @@
 			<view class='s-flex'>
 				<view class="" style="margin:20rpx 0;">上传装车照片</view>
 				<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
-					name="1" multiple :maxCount="3"></u-upload>
+					name="1" multiple='true' :maxCount="3"></u-upload>
 			</view>
 			<!-- 			<view class='s-flex'>
 				<view class="">上传装车磅单</view>
@@ -169,8 +169,12 @@
 			// a(){},
 			toSignContract() {
 				console.log(this.detailData)
-				uni.$u.route('/pages/order/signContract', {
-					obj: JSON.stringify(this.detailData),
+				this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
+					id: this.id,
+				}).then(res => {
+					uni.$u.route('/pages/order/signContract', {
+						obj: JSON.stringify(res.data),
+					});
 				});
 			},
 			selectDate() {
@@ -193,6 +197,17 @@
 							orderId: this.detailData.id,
 						}).then(res => {
 							if (res.data) {
+								if(res.data.loadingImg){
+									var data=res.data.loadingImg.split(',')
+									this.imgList=res.data.loadingImg.split(',')
+									for (var i = 0; i < data.length; i++) {
+										if(data[i]!=''){
+											this.fileList1.push({url:data[i]})
+										}
+									}
+									
+								}
+								console.log(this.fileList1)
 								this.detailData.carNo = res.data.carNo
 								this.detailData.loadingDate = res.data.loadingDate
 								this.detailData.weight = res.data.loadingWeight
@@ -462,7 +477,7 @@
 				// 	return true
 				// }
 			
-				if(this.fileList1.length == 0){
+				if(this.imgList.length == 0){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "装车照片不能为空！",

pages/order/confirmUnloading.vue

@@ -143,8 +143,8 @@
 			this.getNowTime()
 		},
 		methods: {
-			deletePic(){
-				
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			getNowTime() {
 				let now = new Date();

pages/order/signContract.vue

@@ -88,7 +88,7 @@
 			<view class='row-between'>
 				<view class="gray">运输开始日期</view>
 				<view class="">
-					<view @click="dateShow">{{dataDetails.startDates?dataDetails.startDates:'请选择运输开始日期'}}
+					<view @click="dateShow">{{dataDetails.tranStartDate?dataDetails.tranStartDate:'请选择运输开始日期'}}
 					</view>
 
 					<u-calendar :show="startShow" mode="single" @confirm="startDate" @close="startShow= false">
@@ -100,7 +100,7 @@
 				<view class="">
 					<!-- 	<u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
 						clearable></u--input> -->
-					<view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}
+					<view class="" @click="endShow = true">{{dataDetails.tranEndDate?dataDetails.tranEndDate:'请选择运输截止日期'}}
 					</view>
 					<u-calendar :show="endShow" mode="single" @confirm="endDate" @close="endShow= false"></u-calendar>
 				</view>
@@ -123,8 +123,8 @@
 				<view class="gray">装车后预付款</view>
 				<view class="">
 					<u--input placeholder="自动获取,不可编辑" v-if="dataDetails.freightAdvance == 1" border="none"
-						v-model="dataDetails.loadingAdvancePayment" inputAlign='right' clearable disabled></u--input>
-					<u--input placeholder="请输入装车后预付款" v-else border="none" v-model="dataDetails.loadingAdvancePayment"
+						v-model="dataDetails.advanceCharge" inputAlign='right' clearable disabled></u--input>
+					<u--input placeholder="请输入装车后预付款" v-else border="none" v-model="dataDetails.advanceCharge"
 						inputAlign='right' clearable></u--input>
 				</view>
 			</view>
@@ -203,7 +203,7 @@
 				lineSize: 5, // 笔记倍数
 				value: true,
 				dataDetails: {
-					carrierInfo: {carNo:''},
+					carrierInfo: {carNo:'',loadingAdvancePayment:''},
 					serviceCharge:'50'
 				},
 				radiolist1: [{
@@ -246,8 +246,11 @@
 				
 				})
 			}
-			this.$set(this.dataDetails.carrierInfo,'carNo',this.dataDetails.carNo)
-			
+			console.log(this.dataDetails.advanceCharge)
+			this.$set(this.dataDetails.carrierInfo,'carNo',this.dataDetails.carNumber)
+			this.preMoney()
+			// this.$set(this.dataDetails,'advanceCharge',this.dataDetails.advanceCharge)
+			// this.$set(this.dataDetails.carrierInfo,'carNo',this.dataDetails.carNo)
 			console.log(this.dataDetails)
 		},
 		onLoad(options) {
@@ -274,7 +277,7 @@
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
 			if(this.dataDetails.freightAdvance == 1){
-				this.proportion = this.dataDetails.driverAdvancePayment > this.dataDetails.ownerAdvancePayment ? this.dataDetails.ownerAdvancePayment:this.dataDetails.driverAdvancePayment
+				this.proportion = this.dataDetails.driverAdvancePayment >= this.dataDetails.ownerAdvancePayment ? this.dataDetails.ownerAdvancePayment:this.dataDetails.driverAdvancePayment
 			}
 			console.log(this.dataDetails)
 			this.dataDetails.carrierInfo = {}
@@ -319,7 +322,7 @@
 		methods: {
 			preMoney(){
 				if(this.dataDetails.freightAdvance == 1){
-					this.dataDetails.loadingAdvancePayment = this.dataDetails.freight * this.proportion
+					this.dataDetails.advanceCharge = this.dataDetails.freight * this.proportion
 				}
 			},
 			collection() {
@@ -375,10 +378,10 @@
 			},
 			startDate(e) {
 				this.startShow = false
-				this.dataDetails.startDates = e[0]
+				this.dataDetails.tranStartDate = e[0]
 			},
 			endDate(e) {
-				this.dataDetails.endDates = e[0]
+				this.dataDetails.tranEndDate = e[0]
 				this.endShow = false
 			},
 			submit(num) {
@@ -407,14 +410,14 @@
 					})
 					return
 				}
-				if (uni.$u.test.isEmpty(that.dataDetails.startDates)) {
+				if (uni.$u.test.isEmpty(that.dataDetails.tranStartDate)) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "运输起始日期不能为空！",
 					})
 					return
 				}
-				if (uni.$u.test.isEmpty(that.dataDetails.endDates)) {
+				if (uni.$u.test.isEmpty(that.dataDetails.tranEndDate)) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "运输截止日期不能为空！",
@@ -435,7 +438,8 @@
 					})
 					return
 				}
-				if (uni.$u.test.isEmpty(that.dataDetails.loadingAdvancePayment)) {
+				console.log(that.dataDetails.advanceCharge)
+				if (uni.$u.test.isEmpty(that.dataDetails.advanceCharge)&&that.dataDetails.advanceCharge!=0) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "装车后预付款不能为空！",
@@ -443,8 +447,8 @@
 					return
 				}
 				_obj.trailerNumber = that.dataDetails.trailerNumber
-				_obj.startDates = that.dataDetails.startDates
-				_obj.endDates = that.dataDetails.endDates
+				_obj.tranStartDate = that.dataDetails.tranStartDate
+				_obj.tranEndDate = that.dataDetails.tranEndDate
 
 				_obj.contactPersonName = that.dataDetails.driverName
 				_obj.contactPersonPhone = that.dataDetails.driverPhone
@@ -453,7 +457,7 @@
 				_obj.id = that.dataDetails.id
 				_obj.carNumber = that.dataDetails.carrierInfo.carNo
 				_obj.weight = that.dataDetails.weight
-				_obj.loadingAdvancePayment = that.dataDetails.loadingAdvancePayment
+				_obj.advanceCharge = that.dataDetails.advanceCharge
 				_obj.typeFlag = 2
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
@@ -878,4 +882,7 @@
 		top: 120rpx;
 		left: 10rpx;
 	} */
+	// /deep/.uni-input-input:disabled {
+	//    background:#fff;
+	// }
 </style>

uni_modules/mescroll-uni/components/mescroll-diy/beibei/mescroll-uni-option.js

@@ -27,7 +27,7 @@ const GlobalOption = {
 		zh: {
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 暂无相关数据 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -35,7 +35,7 @@ const GlobalOption = {
 			},
 			up: {
 				textLoading: '加载中 ...', // 加载中的提示文本
-				textNoMore: '-- 没有更多了~ --', // 没有更多数据的提示文本
+				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
 					tip: '~ 空空如也 ~' // 空提示
 				}