Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/goodSource/shippingDetails.vue

@@ -82,14 +82,17 @@
 					<view class="right">{{detailData.freightPrice}}元/吨</view>
 				</view>
 				<view class="flex msx20">
-					<view class="left">日期</view>
+					<view class="left">发布</view>
 					<view class="right">
 						<view class="in-row flex">
-							<view class="text">发布</view>
 							<view class="time">{{detailData.createDate}}</view>
 						</view>
+					</view>
+				</view>
+				<view class="flex msx20">
+					<view class="left">装车</view>
+					<view class="right">
 						<view class="in-row flex">
-							<view class="text">装车</view>
 							<view class="time" v-if='detailData.loadingDateStart=="随时"&&detailData.loadingDateEnd=="随时"'>{{detailData.loadingDateStart}}</view>
 							<view class="time" v-else>{{detailData.loadingDateStart}}~{{detailData.loadingDateEnd}}</view>
 						</view>
@@ -101,7 +104,7 @@
 						{{carLength}} | 
 						<text v-if='carType!="不限"'> {{carType}} </text>
 						| {{carWeight}}</view>
-						<view class="right" v-else>空</view>
+						<view class="right" v-else>不限</view>
 				</view>
 				<view class="flex mt20">
 					<view class="left">描述</view>

pages/mine/driverCertification.vue

@@ -42,12 +42,17 @@
 					</u--input>
 				</view>
 			
-				<view class="flex row noborder">
+				<view class="flex row ">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
 					</view>
 				</view>
+				<view class="flex row noborder">
+					<view class="left-text">身份证地址</view>
+					<u--input placeholder="请输入身份证地址" inputAlign='left' border="none" v-model="dataDetails.cardAddress" maxlength="18">
+					</u--input>
+				</view>
 				<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
 					@confirm="confirmValidityPeriod" @change="changeHandler">
 				</u-picker>
@@ -763,6 +768,7 @@
 														flag:1
 													}).then(res => {
 														if(res.data){
+															_this.dataDetails.cardAddress=res.data.recPersonAddr
 															_this.dataDetails.numberCard = res.data.recPersonNo
 															if (res.data.recPerson) {
 																_this.dataDetails.driverName = res.data.recPerson
@@ -1042,7 +1048,13 @@
 					})
 					return true
 				}
-
+				if (uni.$u.test.isEmpty(this.dataDetails.cardAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份证地址为空！",
+					})
+					return true
+				}
 				for (let i = 0; i < this.dataDetails.hyDriverPayeeInfoList.length; i++) {
 					let _item = this.dataDetails.hyDriverPayeeInfoList[i]
 					if (uni.$u.test.isEmpty(_item.payeeAddressUrl)) {

pages/mine/editDriverCertification.vue

@@ -66,12 +66,17 @@
 					</u--input>
 				</view>
 
-				<view class="flex row noborder">
+				<view class="flex row">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
 					</view>
 				</view>
+				<view class="flex row noborder">
+					<view class="left-text">身份证地址</view>
+					<u--input placeholder="请输入身份证地址" inputAlign='left' border="none" v-model="dataDetails.cardAddress" maxlength="18">
+					</u--input>
+				</view>
 			</view>
 			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
 				@confirm="confirmValidityPeriod" @change="changeHandler" @cancel='isShowcardValidity= false'>
@@ -386,7 +391,15 @@
 														personImg: result,
 														flag:1
 													}).then(res => {
-													_this.dataDetails.numberCard = res.data.recPersonNo
+													if(res.data){
+														_this.dataDetails.cardAddress=res.data.recPersonAddr
+														_this.dataDetails.numberCard = res.data.recPersonNo
+														if (res.data.recPerson) {
+															_this.dataDetails.driverName = res.data.recPerson
+															_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
+														}
+														_this.dataDetails.driverBirthday=res.data.recPersonBrithday
+													}
 												})
 												.catch(res => {
 													uni.$u.toast(res.message);
@@ -511,6 +524,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.cardAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "身份证地址为空！",
+					})
+					return true
+				}
 				return false
 			}
 		},

pages/order/confirmUnloading.vue

@@ -125,6 +125,7 @@
 			this.detailData = JSON.parse(options.obj)
 			console.log(this.detailData)
 			this.fileList1=[]
+			this.fileList2=[]
 			if(this.detailData.hyCarrierInfo.unloadingImg){
 				this.imgList=this.detailData.hyCarrierInfo.unloadingImg.split(',')
 				var data=this.detailData.hyCarrierInfo.unloadingImg.split(',')
@@ -134,6 +135,15 @@
 					}
 				}
 			}
+			if(this.detailData.hyCarrierInfo.receiptImg){
+				this.imgList1=this.detailData.hyCarrierInfo.receiptImg.split(',')
+				var data=this.detailData.hyCarrierInfo.receiptImg.split(',')
+				for (var i = 0; i < data.length; i++) {
+					if(data[i]!=''){
+						this.fileList2.push({url:data[i]})
+					}
+				}
+			}
 			if(this.detailData.hyCarrierInfo.totalFreight){
 				this.$set(this.detailData,'totalFreight',String(this.detailData.hyCarrierInfo.totalFreight))
 				// this.detailData.totalFreight=String(this.detailData.hyCarrierInfo.totalFreight)
@@ -152,7 +162,7 @@
 				// totalFreight: '',
 				unloadingImg:this.detailData.hyCarrierInfo.unloadingImg,
 				receiptImg:this.detailData.hyCarrierInfo.receiptImg,
-				id: this.detailData.carrierId,
+				id: this.detailData.carrierId?this.detailData.carrierId:this.detailData.hyCarrierInfo.id,
 			}
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 			// #ifdef APP-PLUS
@@ -162,10 +172,13 @@
 		},
 		methods: {
 			deletePic(event) {
+				console.log(this[`fileList${event.name}`])
 				this[`fileList${event.name}`].splice(event.index, 1)
+				this.imgList.splice(event.index, 1)
 			},
 			deletePic1(event) {
 				this[`fileList${event.name}`].splice(event.index, 1)
+				this.imgList1.splice(event.index, 1)
 			},
 			getNowTime() {
 				let now = new Date();
@@ -315,6 +328,7 @@
 			async afterRead(event) {
 				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 				let lists = [].concat(event.file)
+				
 				let fileListLen = this[`fileList${event.name}`].length
 				lists.map((item) => {
 					this[`fileList${event.name}`].push({
@@ -438,6 +452,14 @@
 					});
 					return
 				}
+				if (!this.detailData.carrierInfo.receiptImg) {
+					uni.showToast({
+						title: '请上传回单照片！',
+						icon: "none",
+						duration: 2000
+					});
+					return
+				}
 				this.isShowAlert = false
 				uni.showLoading({
 					title:'加载中'

pages/order/index.vue

@@ -27,12 +27,13 @@
 			<view class="all-menu">
 				<u-transition :show="showMenu" mode="fade">
 					<view class="transition">
-						<view v-for="(item,index) in tabList" :key='index' class="transition-item-style"
+						<view v-for="(item,index) in tabList" class="transition-item-style"
 							:class="tabIndex==index?'menu-active':''" @click="clickTab({index:index})">
 							{{item.name}}
 						</view>
 					</view>
 				</u-transition>
+				<view @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu" ></view>
 			</view>
 
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -46,7 +47,7 @@
 						<u-icon size="20" name="arrow-right"></u-icon>
 					</view>
 				</view>
-				<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
+				<view :id="'good'+good.id" class="good-list" v-for="good in goods" 
 					@click="toDetail(good)">
 					<view style="padding: 0 35rpx 20rpx 35rpx;">
 						<view class="flex flex-space-between row1">
@@ -211,7 +212,7 @@
 			           
 			</u-popup>
 		<u-toast ref="uToast"></u-toast>
-		<view class="modal-black" v-show="showMenu" @click="closeMenu"></view>
+	<!-- 	<view class="modal-black" v-show="showMenu" @click="closeMenu"></view> -->
 	</view>
 </template>
 
@@ -394,6 +395,9 @@
 
 		},
 		methods: {
+			moveHandle(){
+				// console.log(1111)
+			},
 			closepopup(){
 				this.show=false
 			},
@@ -960,10 +964,16 @@
 		background: black;
 		height: 100vh;
 		width: 100vw;
-		position: absolute;
+		position: fixed;
 		z-index: 999;
 		opacity: 0.3;
 	}
+	
+	.all-menu {
+		position: fixed;
+		z-index: 99;
+		top: 200rpx;
+	}
 
 	.menu-active {
 		background: #2772FB;

pages/order/orderDetails.vue

@@ -185,7 +185,7 @@
 		<!-- v-if="status2 -->
 		<!-- dataObj.orderStatus!="待货主确认"&&dataObj.orderStatus!="未装车"&&dataObj.orderStatus!="待货主确认装车"&&dataObj.orderStatus!="货主驳回装车信息"&&dataObj.orderStatus!="待平台确认装车"&&dataObj.orderStatus!="平台驳回装车信息"&&dataObj.orderStatus!="已终止" -->
 		<view class="content4" v-if='status2'>
-			<view class="level2-title gray">运费信息（单位：元）</view>
+			<view class="level2-title">运费信息（单位：元）</view>
 			<view class='row-between'>
 				<view class=" gray">预付运费</view>
 				<view class="">{{freightInfo.prepaidFreight}}</view>
@@ -743,9 +743,9 @@
 	.content3,
 	.content4 {
 		background: white;
-		margin: 20rpx;
+		margin: 20rpx 0;
 		border-radius: 20rpx;
-		padding: 20rpx;
+		padding: 20rpx 0;
 	}
 	.content3{
 		padding: 20rpx 0;

pages/order/signContract.vue

@@ -61,10 +61,10 @@
 			</view>
 			<view class='row-between'>
 				<view class="gray">车牌号</view>
-				<view class="" style="color:#BBBBBB;" @click="carClick">
-					<!-- {{dataDetails.carrierInfo.carNo?dataDetails.carrierInfo.carNo:'请选择车牌号'}} -->
-					<u--input placeholder="请输入挂车号" border="none" readOnly v-model="dataDetails.carrierInfo.carNo"
-						inputAlign='right' clearable></u--input>
+				<view class=""  :style="{'color':dataDetails.carrierInfo.carNo?'#000':':#BBBBBB'}" @click="carClick">
+					{{dataDetails.carrierInfo.carNo?dataDetails.carrierInfo.carNo:'请选择车牌号'}}
+					<!--< u--input placeholder="请输入车牌号" border="none" readOnly v-model="dataDetails.carrierInfo.carNo"
+						inputAlign='right' clearable></u--input> -->
 				</view>
 
 				<!-- <view class="flex">
@@ -76,8 +76,9 @@
 			<view class='row-between'>
 				<view class="gray">挂车号（选填）</view>
 				<view class="flex">
-					<u--input placeholder="请输入挂车号" border="none" readOnly v-model="dataDetails.trailerNumber"
-						inputAlign='right' clearable></u--input>
+					<view :style="{'color':dataDetails.trailerNumber?'#000':':#BBBBBB'}">{{dataDetails.trailerNumber?dataDetails.trailerNumber:'请输入挂车号'}}</view>
+					<!-- <u--input placeholder="请输入挂车号" border="none" readOnly v-model="dataDetails.trailerNumber"
+						inputAlign='right' clearable></u--input> -->
 				</view>
 			</view>
 			<view class='row-between'>