前端

components/upload.vue

@@ -33,7 +33,8 @@
 					width: width + 'rpx',
 					height: width + 'rpx'
 				}">
-				<u-icon v-if="custom&&!customBtn" name="camera-fill" class="" size="100" color="#617E8B"></u-icon>
+				<image style='width:23px;height:23px;' v-if="custom&&!customBtn" src="../static/images/tianjiazhaopian.png" mode=""></image>
+				<!-- <u-icon v-if="custom&&!customBtn" name="camera-fill" class="" size="100" color="#617E8B"></u-icon> -->
 				<image v-if="custom&&customBtn" :style="{
 				width: customBtnWidth + 'px',
 				height: customBtnHeight + 'px'
@@ -177,7 +178,7 @@
 				type: String,
 				default: '#fff'
 			},
-			// 成功icon颜色
+			// 成功icon
 			checkIcon:{
 				type: String,
 				default: 'checkbox-mark'

config/index.js

@@ -9,5 +9,4 @@ const dev = {
 
 export function def() {
 	return dev
-}
-
+}

pages/goodSource/index.vue

@@ -117,7 +117,7 @@
 		</mescroll-body>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -453,6 +453,7 @@
 					let _obj = {
 						driverCommonId: res2.data.commonId,
 						commonId: item.commonId,
+						compId:item.compId,
 						cargoOwnerName: item.cargoOwnerName,
 						cargoOwner: item.cargoOwner,
 						sendPrivate: item.sendPrivate,

pages/goodSource/shippingDetails.vue

@@ -19,7 +19,7 @@
 					<view class="right">
 						<view class="flex">
 							<view class="call fontsize-28" @click="$helper.contactCustomerService(detailData.cargoOwnerPhone)">
-								<u-icon name="phone-fill" color="#2772FB"></u-icon>联系货主
+								<image style='width:12px;height:12px;margin-right:4px;' src="../../static/images/goodSource/dianhua.png" mode=""></image>联系货主
 							</view>
 						</view>
 					</view>
@@ -72,9 +72,9 @@
 				</view>
 				<view class="flex align-center msx20">
 					<view class="left">距离</view>
-					<view class="right flex">
+					<view class="right flex align-center">
 						<view>运输距离约{{detailData.distance}}公里</view>
-						<u-icon name="map-fill" color="#2772FB" @click="toMap()"></u-icon>
+						<image @click="toMap()" style='width:14px;height:14px;margin-left:4px;' src="../../static/images/goodSource/dituzuobiao.png" mode=""></image>
 					</view>
 				</view>
 				<view class="flex align-center">
@@ -125,7 +125,7 @@
 			</view>
 			 <u-toast ref="uToast"></u-toast>
 			<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		</view>
 	</view>
 </template>
@@ -261,6 +261,7 @@
 					driverCommonId: this.firstAuthentication.commonId,
 					commonId: item.commonId,
 					id:item.id,
+					compId:item.compId,
 					cargoOwnerName: item.cargoOwnerName,
 					cargoOwner: item.cargoOwner,
 					sendPrivate: item.sendPrivate,

pages/mine/driverCertification.vue

@@ -38,51 +38,55 @@
 			
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard" maxlength="18">
+					<u--input placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard" maxlength="18">
 					</u--input>
 				</view>
 			
-				<view class="flex row ">
+				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row">
 					<view class="left-text">身份证地址</view>
-					<u--input placeholder="请输入身份证地址" inputAlign='left' border="none" v-model="dataDetails.cardAddress" maxlength="18">
-					</u--input>
+					<!-- <u--input placeholder="请输入身份证地址" inputAlign='right' border="none" v-model="dataDetails.cardAddress" maxlength="18">
+					</u--input> -->
+					<u--textarea v-model="dataDetails.cardAddress" border="none"  placeholder="请输入身份证地址" autoHeight  maxlength="30"></u--textarea>
 				</view>
-				<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
-					@confirm="confirmValidityPeriod" @change="changeHandler">
+				<u-picker  :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
+				 @cancel='isShowcardValidity=false'	@confirm="confirmValidityPeriod" @change="changeHandler">
 				</u-picker>
 			</view>
 			<view class="content1 content-other">
 				<view class="flex row">
 					<view class="left-text">姓名</view>
-					<u--input placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.driverName">
+					<u--input placeholder="输入姓名" inputAlign='right' border="none" v-model="dataDetails.driverName">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">性别</view>
 					<u-radio-group v-model="dataDetails.driverSex" placement="row">
 						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-							:label="item.name" :name="item.name" @change="radioChange" style="margin: 0 20rpx;">
+							:label="item.name" :name="item.name" @change="radioChange" style="margin: 0 0 0 20rpx;">
 						</u-radio>
 					</u-radio-group>
 				</view>
 
-				<view class="flex row row-ch">
+				<view class="flex row">
 					<view class="left-text">称呼</view>
-					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
+					<view class="flex">
+						<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
 						v-model="dataDetails.driverCall" maxlength="1">
-					</u--input>
-					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
-					<view class="flex align-center" v-else>女士</view>
+						</u--input>
+						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
+						<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-else>女士</view>
+					</view>
+					
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone"
+					<u--input placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone"
 						maxlength="11">
 					</u--input>
 				</view>
@@ -210,22 +214,22 @@
 					</view>
 					<image class="" :src="item.payeeAddressUrl" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">银行卡卡号</view>
 					<view class="flex">
-						<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="item.bankCard">
+						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard">
 						</u--input>
 					</view>
 				</view>
 				<view class="flex row">
 					<view class="left-text">开户行</view>
-					<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="item.bankDeposit">
+					<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="item.bankDeposit">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text khzh-styel">开户支行</view>
 					<view class="flex" v-if="isShowManualInput">
-						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='left' border="none"
+						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='right' border="none"
 							v-model="item.bankDepositBranch">
 						</u--input>
 						<view @click="manualInput" class="type">选择支行</view>
@@ -242,8 +246,9 @@
 				<view class="flex row noborder">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<u--input disabled placeholder="输入收款人姓名" inputAlign='left' border="none" v-model="item.payeeName">
-						</u--input>
+						<view>{{item.payeeName}}</view>
+						<!-- <u--input disabled placeholder="输入收款人姓名" inputAlign='right' border="none" v-model="item.payeeName">
+						</u--input> -->
 					</view>
 				</view>
 				<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'
@@ -1321,6 +1326,7 @@
 			padding: 4rpx 10rpx;
 			font-size: 26rpx;
 			display: flex;
+			margin-left:4px;
 			justify-content: center;
 			align-items: center;
 		}
@@ -1371,4 +1377,14 @@
 		height: 80rpx;
 		z-index: 9;
 	}
+	/deep/.u-radio-group--row {
+	    justify-content: flex-end;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/driverCertificationNext.vue

@@ -49,7 +49,7 @@
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">准驾车型</view>
 					<view class="" @click="driveType">
 						{{dataDetails.quasiDrivingVehicle?dataDetails.quasiDrivingVehicle:'选择准驾车型>'}}
@@ -57,7 +57,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">驾驶证发证机关</view>
-					<u--input placeholder="请输入驾驶证发证机关" inputAlign='left' border="none" v-model="dataDetails.lssuingAuthority" >
+					<u--input placeholder="请输入驾驶证发证机关" inputAlign='right' border="none" v-model="dataDetails.lssuingAuthority" >
 					</u--input>
 				</view>
 <!--
@@ -164,9 +164,9 @@
 						{{dataDetails.qualificationCertificateValidityDate?dataDetails.qualificationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row ">
 					<view class="left-text">从业资格证号</view>
-					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 <!--
@@ -225,9 +225,10 @@
 				</view>
 			
 				-->
-				<view class="flex row">
+				<view class="flex row noborder">
 					<view class="left-text">通讯地址</view>
-					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress"></u--input>
+					<u--textarea v-model="dataDetails.postalAddress" border="none"  placeholder="输入通讯地址" autoHeight  maxlength="30"></u--textarea>
+					<!-- <u--input placeholder="输入通讯地址" inputAlign='right' border="none" v-model="dataDetails.postalAddress"></u--input> -->
 				</view>
 			</view>
 			
@@ -997,4 +998,11 @@
 	.path{
 		color: #2772FB;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/editDriverCertification.vue

@@ -5,7 +5,7 @@
 			<view class="content1 content-other">
 				<view class="flex row">
 					<view class="left-text">姓名</view>
-					<u--input placeholder="输入姓名" inputAlign='left' border="none" v-model="dataDetails.driverName">
+					<u--input placeholder="输入姓名" inputAlign='right' border="none" v-model="dataDetails.driverName">
 					</u--input>
 				</view>
 				<view class="flex row">
@@ -17,17 +17,17 @@
 					</u-radio-group>
 				</view>
 
-				<view class="flex row row-ch">
+				<view class="flex row">
 					<view class="left-text">称呼</view>
-					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
+					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='right' border="none"
 						v-model="dataDetails.driverCall" maxlength="1">
 					</u--input>
-					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
-					<view class="flex align-center" v-else>女士</view>
+					<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
+					<view style='margin-left:4px;font-size:15px;' class="flex align-center" v-else>女士</view>
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">联系电话</view>
-					<u--input placeholder="请输入联系电话" inputAlign='left' border="none" v-model="dataDetails.driverPhone">
+					<u--input placeholder="请输入联系电话" inputAlign='right' border="none" v-model="dataDetails.driverPhone">
 					</u--input>
 				</view>
 				<view class="flex row noborder" v-if="dataDetails.driverPhone!=userInfo.phone">
@@ -62,11 +62,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard" maxlength="18">
+					<u--input disabled placeholder="请输入身份证号" inputAlign='right' border="none" v-model="dataDetails.numberCard" maxlength="18">
 					</u--input>
 				</view>
 
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">身份证截止日期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
@@ -74,8 +74,9 @@
 				</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>
+					<u--textarea v-model="dataDetails.cardAddress" border="none"  placeholder="请输入身份证地址" autoHeight  maxlength="30"></u--textarea>
+					<!-- <u--input placeholder="请输入身份证地址" inputAlign='right' border="none" > 
+					</u--input>-->
 				</view>
 			</view>
 			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
@@ -393,7 +394,7 @@
 													}).then(res => {
 													if(res.data){
 														_this.dataDetails.cardAddress=res.data.recPersonAddr
-														_this.dataDetails.numberCard = res.data.recPersonNo
+														// _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)
@@ -805,6 +806,19 @@
 		z-index: 9;
 	}
 	/deep/.u-radio{
-		margin-right:10px;
+		margin-left:10px;
+	}
+	/deep/.uni-input-input:disabled {
+		background: #fff;
+	}
+	/deep/.u-radio-group--row {
+	    justify-content: flex-end;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
 	}
 </style>

pages/mine/editDriverCertificationNext.vue

@@ -49,7 +49,7 @@
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'结束时间'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row flex-space-between">
 					<view class="left-text">准驾车型</view>
 					<view class="" @click="driveType">
 						{{dataDetails.quasiDrivingVehicle?dataDetails.quasiDrivingVehicle:'选择准驾车型>'}}
@@ -57,7 +57,7 @@
 				</view>
 				<view class="flex row noborder">
 					<view class="left-text">驾驶证发证机关</view>
-					<u--input placeholder="请输入驾驶证发证机关" inputAlign='left' border="none" v-model="dataDetails.lssuingAuthority" >
+					<u--input placeholder="请输入驾驶证发证机关" inputAlign='right' border="none" v-model="dataDetails.lssuingAuthority" >
 					</u--input>
 				</view>
 				<!--
@@ -158,16 +158,16 @@
 					</view>
 					<image class="" :src="dataDetails.qualificationCertificate" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">从业资格证有效期</view>
 					<view></view>
 					<view class="" @click="selectValidityPeriod(3)">
 						{{dataDetails.qualificationCertificateValidityDate?dataDetails.qualificationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
-				<view class="flex row noborder">
+				<view class="flex row">
 					<view class="left-text">从业资格证号</view>
-					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='left' border="none" v-model="dataDetails.qualificationCertificateNumber">
+					<u--input maxlength='19' placeholder="请输入从业资格证号" inputAlign='right' border="none" v-model="dataDetails.qualificationCertificateNumber">
 					</u--input>
 				</view>
 				<!--
@@ -228,15 +228,13 @@
 				</view>
 				
 				-->
-				<view class="flex row">
+				<view class="flex row noborder align-center">
 					<view class="left-text">通讯地址</view>
-					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress">
-					</u--input>
+					<u--textarea v-model="dataDetails.postalAddress" border="none"  placeholder="输入通讯地址" autoHeight  maxlength="30"></u--textarea>
 				</view>
 			</view>
 			<view class="flex service align-center">
-				<u--image @click='consent'
-					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
+				<u--image @click='consent' :src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
 					width="12px" height="12px"></u--image>
 				我已阅读并同意
 				<navigator
@@ -987,4 +985,14 @@
 	}
 
 	.btn-color {}
+	/deep/.uni-input-input:disabled {
+		background: #fff;
+	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/mine/manageVehicles/addVehicle.vue

@@ -15,7 +15,7 @@
 				<view class="text">上传道路运输证</view>
 			</view>
 			<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)" class="preview-card-img picture">
-				<view @click.stop="delCard(8)">
+				<view @click.stop="delCard(1)">
 					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 					</image>
 				</view>
@@ -30,7 +30,10 @@
 			<view class="flex row flex-space-between">
 				<view class="left-text">道路运输证有效期</view>
 				<view class="" @click="selectValidityPeriod(4)">
-					{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
+					<view :style="{'color':dataDetails.operationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期'}}
+						<image v-if='!dataDetails.operationCertificateValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view v-if="sign == '挂车'">
@@ -41,7 +44,7 @@
 				</view>
 				<view v-if="dataDetails.trailerOperationCertificate" @click.stop="uploadImg(9)"
 					class="preview-card-img picture">
-					<view @click.stop="delCard(9)">
+					<view @click.stop="delCard(2)">
 						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
 						</image>
 					</view>
@@ -58,7 +61,10 @@
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车道路运输证有效期</view>
 				<view class="" @click="selectValidityPeriod(5)">
-					{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
+					<view :style="{'color':dataDetails.trailerOperationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期'}}
+						<image v-if='!dataDetails.trailerOperationCertificateValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="title" v-if="sign == '挂车'">牵引车行驶证主页</view>
@@ -104,20 +110,29 @@
 			<view class="flex row flex-space-between">
 				<view class="left-text">注册日期</view>
 				<view class="" @click="selectValidityPeriod(6)">
-					{{dataDetails.drivingLicenseRegistrationDate?dataDetails.drivingLicenseRegistrationDate:'选择注册日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseRegistrationDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseRegistrationDate?dataDetails.drivingLicenseRegistrationDate:'选择注册日期'}}
+						<image v-if='!dataDetails.drivingLicenseRegistrationDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">发证日期</view>
 				<view class="" @click="selectValidityPeriod(7)">
-					{{dataDetails.drivingLicenseIssueDate?dataDetails.drivingLicenseIssueDate:'选择发证日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseIssueDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseIssueDate?dataDetails.drivingLicenseIssueDate:'选择发证日期'}}
+						<image v-if='!dataDetails.drivingLicenseIssueDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证有效期</view>
 				<view class="" @click="selectValidityPeriod(1)">
-					{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期>'}}
+					<view :style="{'color':dataDetails.drivingLicenseValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期'}}
+						<image v-if='!dataDetails.drivingLicenseValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 			</view>
 			<view class="flex row flex-space-between">
@@ -134,7 +149,11 @@
 			<view class="flex row noborder">
 				<view class="left-text">车辆能源类型</view>
 				<view style='text-align:right;width:50%;' class="" @click="driveType">
-					{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}>
+					<view :style="{'color':dataDetails.energyType?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型'}}
+						<image v-if='!dataDetails.energyType' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+				<!-- 	{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}> -->
 				</view>
 			</view>
 
@@ -178,20 +197,32 @@
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">注册日期</view>
 				<view class="" @click="selectValidityPeriod(8)">
-					{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseRegistrationDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期'}}
+						<image v-if='!dataDetails.trailerLicenseRegistrationDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+<!-- 					{{dataDetails.trailerLicenseRegistrationDate?dataDetails.trailerLicenseRegistrationDate:'选择注册日期>'}} -->
 				</view>
 			</view> 
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">发证日期</view>
 				<view class="" @click="selectValidityPeriod(9)">
-					{{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseIssueDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期'}}
+						<image v-if='!dataDetails.trailerLicenseIssueDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+					<!-- {{dataDetails.trailerLicenseIssueDate?dataDetails.trailerLicenseIssueDate:'选择发证日期>'}} -->
 				</view>
 			</view>
 
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证有效期</view>
 				<view class="" @click="selectValidityPeriod(2)">
-					{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}}
+					<view :style="{'color':dataDetails.trailerLicenseValidityDate?'#000':'rgb(192, 196, 204)'}">
+						{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期'}}
+						<image v-if='!dataDetails.trailerLicenseValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
+					<!-- {{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}} -->
 				</view>
 			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
@@ -225,7 +256,8 @@
 				<view class="left-text">车牌颜色</view>
 				<view class='flex'>
 					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-					<view>></view>	
+					<view>
+						<image v-if='!dataDetails.carNumberColour' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image></view>	
 				</view>
 			</view>
 

pages/mine/manageVehicles/editVehicle.vue

@@ -219,7 +219,9 @@
 				<view class="left-text">车牌颜色</view>
 				<view class='flex'>
 					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-					<view>></view>
+					<view>
+						<image v-if='!dataDetails.carNumberColour' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+					</view>
 				</view>
 				
 				

pages/order/confirmLoading.vue

@@ -67,6 +67,12 @@
 				<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
 						placeholder="请输入运费"></view> -->
 			</view>
+			<view class='row-between'>
+				<view class="">预付款（元）</view>
+				{{detailData.advanceCharge ? detailData.advanceCharge:"来自合同"}}
+				<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
+						placeholder="请输入运费"></view> -->
+			</view>
 			<view class='row-between'>
 				<view class="">定位</view>
 				<view class="flex align-center">{{localtion.city}}

pages/order/index.vue

@@ -15,7 +15,7 @@
 									fontWeight: 'bold',
 									transform: 'scale(1.05)'
 								}"></u-tabs>
-					<view class="right-btn flex align-center" @click="showMenu=true">
+					<view class="right-btn flex align-center" @click="showMenu=!showMenu">
 						<view class="">
 							全部类型
 						</view>

pages/order/orderDetails.vue

@@ -148,6 +148,10 @@
 				<view class=" gray">运费</view>
 				<view class="">{{carrierInfo.estimatedFreight}}元</view>
 			</view>
+			<view class='row-between'>
+				<view class="">预付款（元）</view>
+				{{detailData.advanceCharge}}元
+			</view>
 			<view class='row-between'>
 				<view class=" gray">装车时间</view>
 				<view class="">{{carrierInfo.loadingDate1}}</view>
@@ -334,7 +338,7 @@
 			checkfreight(num){
 				this.tips = num
 				if(num == 1){
-					this.freightContent = "合计应付运费 "+ this.dataObj.hyCarrierInfo.totalFreight + " 元，确定无误？"
+					this.freightContent = "合计应付运费 "+ this.dataObj.hyCarrierInfo.totalFreight + " 元，确认无误？"
 				}else{
 					this.freightContent = "确认驳回运费信息？"
 				}

pages/order/signContract.vue

@@ -54,7 +54,7 @@
 				<!-- 				<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"
+					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight1"
 						inputAlign='right' clearable @input="preMoney"></u--input>
 					<!-- <span> 元/车</span> -->
 				</view>
@@ -286,8 +286,13 @@
 			this.carList = []
 			that = this
 			// this.dataDetails = JSON.parse(options.obj)
-
+			
 			this.dataDetails = JSON.parse(options.obj)
+			if(this.dataDetails.billingMethod==1){
+				this.dataDetails.freight1=this.dataDetails.freight
+			}else{
+				this.dataDetails.freight1=''
+			}
 			// console.log(this.dataDetails.carNo,this.dataDetails.carrierInfo)
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
@@ -340,7 +345,7 @@
 		methods: {
 			preMoney() {
 				if (this.dataDetails.freightAdvance == 1) {
-					this.dataDetails.advanceCharge = this.dataDetails.freight * this.proportion
+					this.dataDetails.advanceCharge = this.dataDetails.freight1 * this.proportion
 				}
 			},
 			collection() {
@@ -403,6 +408,7 @@
 				this.endShow = false
 			},
 			submit(num) {
+				this.dataDetails.freight=this.dataDetails.freight1
 				let _obj = {}
 				if (num == 1) { //预览合同
 					_obj.submitFlag = 1

pages/riders/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="center">
+	<view @touchend="end" @touchmove="move" :class="{popupShow:tipsShow}" class="center">
 		<view class="flex row1">
 			<view class="flex center_top">
 				<view class="center_top_btn" :class="indexbtn == 1? '':'center_top_btn1'" @click="changebtn(1)">司机
@@ -183,7 +183,8 @@
 				},
 				status: 'loadmore',
 				nomoreText: '实在没有了',
-				mescroll:{}
+				mescroll:{},
+				popupShow:false
 			}
 		},
 		created() {},
@@ -885,4 +886,10 @@
 		// margin-top: 10rpx;
 
 	}
+	.popupShow {
+		overflow: hidden;
+		position: fixed;
+		height: 100vh;
+		width: 100%;
+	}
 </style>