前端

common/components/uni-rate.vue

@@ -82,9 +82,21 @@
 			};
 		},
 		created() {
-console.log(this.is_score)
 			this.valueSync = Number(this.value);
 		},
+		mounted() {
+			this.valueSync = Number(this.value);
+		},
+		
+		watch: {
+		　　value: {
+		　　　　handler(newValue, oldValue) {
+		　　　　　　//do ...
+					this.valueSync = Number(this.value);
+		　　　　},
+		　　　　deep: true
+		　　}
+		},
 		methods: {
 			clickStars(i){
 			  if (this.disabled) {

pages.json

@@ -136,7 +136,7 @@
 			"path": "pages/carSource/driverSee",
 			"style": {
 				"navigationBarTitleText": "司机详情",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
@@ -145,6 +145,11 @@
 							// "fontSrc": "/static/gengduo/iconfont.ttf",
 							// "fontSize": "20"
 						}]
+					},
+					"pullToRefresh": {
+					    "support": true,
+					    "color": "#2772FB", //小圈圈的颜色
+					    "style": "circle" //小圈圈的样式
 					}
 				}
 			}
@@ -539,7 +544,7 @@
 			"path": "pages/order/driverDetail",
 			"style": {
 				"navigationBarTitleText": "司机详情",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
@@ -548,6 +553,11 @@
 							// "fontSrc": "/static/gengduo/iconfont.ttf",
 							// "fontSize": "20"
 						}]
+					},
+					"pullToRefresh": {
+					    "support": true,
+					    "color": "#2772FB", //小圈圈的颜色
+					    "style": "circle" //小圈圈的样式
 					}
 				}
 			}

pages/mine/cargoowner/cargoowner.vue

@@ -278,7 +278,7 @@
 		width: 100%;
 		margin: 0 auto;
 		text-align: center;
-		height: 48px;
+		height: 50px;
 		line-height: 48px;
 		color: #fff;
 		background: url(../../../static/mine/huozhurenzheng/Mask@3x.png) no-repeat;

pages/mine/cargoowner/editpersonalinformation.vue

@@ -384,6 +384,21 @@
 					})
 					return true
 				}
+				
+				if (uni.$u.test.isEmpty(this.dataDetails.cardAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请上传身份证人像面！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataDetails.cardBackAddressUrl)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请上传身份证国徽面！",
+					})
+					return true
+				}
 				if (this.dataDetails.cardNumber.length != 18) {
 					this.$refs.uToast.show({
 						type: 'error',

pages/mine/company/addcompany.vue

@@ -126,7 +126,7 @@
 			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">卡号</view>
 				<view class="flex right">
-					<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="dataDetails.bankCard">
+					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="dataDetails.bankCard">
 					</u--input>
 					<view class="" @click="uploadImg(5)" style="display: flex;align-items: center;margin-left: 20rpx;">
 						<image src="../../../static/images/xiangji-2.png" mode="" style="width: 40rpx ;height: 40rpx;">
@@ -144,13 +144,13 @@
 			</view>
 			<view class="flex row border-bottom mt20 flex-space-between noborder">
 				<view class="left-text khzh-styel">开户支行</view>
-				<view class="flex align-center flex-space-between" v-if="isShowManualInput">
+				<view class="flex align-center" v-if="isShowManualInput">
 					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
 					<view @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex align-center flex-space-between" v-if="!isShowManualInput">
+				<view class="flex align-center" v-if="!isShowManualInput">
 					<view class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
 					</view>
@@ -332,7 +332,7 @@
 			}
 		},
 		onShow() {
-			debugger
+			// debugger
 			console.log(uni.getStorageSync("videoSrc"))
 			var viderSrc = uni.getStorageSync("videoSrc")
 			if (viderSrc) {
@@ -341,7 +341,7 @@
 
 		},
 		onLoad(options) {
-			debugger
+			// debugger
 			this.dataDetails.videoAddressUrl = options.videoSrc
 			// #ifdef APP-PLUS
 			this.get_camera_permission()
@@ -625,22 +625,21 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
-							console.log(this)
+							console.log(this,res.data)
 							if (uni.getStorageSync('companydata')) {
-								this.dataDetails = JSON.parse(uni.getStorageSync('companydata'))
+								this.dataDetails = uni.getStorageSync('companydata')
 								if (!this.dataDetails.businessLicenseAddressUrl) {
 									this.dataDetails.businessLicenseAddressUrl = ""
 								}
 							}
-							this.dataDetails.commonId = this.userInfo.id
-							this.dataDetails.phone = this.userInfo.phone
+							that.dataDetails.commonId = that.userInfo.id
+							that.dataDetails.phone = that.userInfo.phone
 							that.dataDetails.legalPersonName = res.data.name
 							that.dataDetails.cardAddressUrl = res.data.cardAddressUrl
 							that.dataDetails.cardBackAddressUrl = res.data.cardBackAddressUrl
 							that.dataDetails.cardNumber = res.data.cardNumber
 							that.dataDetails.cardValidityDate = res.data.cardValidityDate
-
-
+							
 						}
 					})
 					.catch(res => {
@@ -735,13 +734,20 @@
 					})
 					return true
 				}
-				// if (!uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [18, 18])) {
-				// 	this.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "统一社会信用代码输出错误！",
-				// 	})
-				// 	return true
-				// }
+				if (this.dataDetails.unifiedSocialCreditCode.length!=18) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "统一社会信用代码输出错误！",
+					})
+					return true
+				}
+				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "卡号输出错误！",
+					})
+					return true
+				}
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -856,7 +862,7 @@
 			// 	this.isShowcardValidity = false
 			// },
 			imgTypeSelect(val) {
-				debugger
+				// debugger
 				var _this = this
 				// if (val.name == '相册') {
 				uni.chooseImage({

pages/mine/company/companyvideo.nvue

@@ -19,7 +19,7 @@
 					<u-button @click="startVideoCapture" class="btn" v-if='!isAlreadyRecord' type="primary" text="开始录像"></u-button>
 					<u-button @click="stopVideoCapture" class="btn" v-if='isAlreadyRecord' text="停止录像" type="primary"></u-button>
 				<!-- <u-button @click="saveVideo" class="btn" v-if='isSaveVideo' type="primary" text="保存视频"></u-button> -->
-				<u-button @click="switchCamera" class="btn" type="primary" text="切换摄像头"></u-button>
+				<u-button :disabled="changeCamera" @click="switchCamera" class="btn" type="primary" text="切换摄像头"></u-button>
 				<!-- <button @click="setZoomFactor" class="btn" type="primary">
 				    设置焦距
 				</button> -->
@@ -84,6 +84,7 @@
 				return {
 					isSaveVideo: false,
 					isAlreadyRecord: false,
+					changeCamera:false,
 					cameraWidth: "100vw",
 					cameraHeight: "100vh",
 					src: '',
@@ -188,6 +189,7 @@
 				 * 开始录像
 				 * */
 				startVideoCapture() {
+					
 					var _this = this;
 					var dic = {
 						"savePath": plus.io.convertLocalFileSystemURL("_doc/KJ-Camera"), //保存视频位置，一定要是_doc绝对路径
@@ -198,6 +200,7 @@
 					this.$refs.Camera.startVideoCapture(dic, (res) => {
 						console.log("startVideoCapture: " + JSON.stringify(res))
 						if (res.status == "start") {
+							this.changeCamera=true
 							console.log("开始录像")
 							setTimeout(()=>{
 								this.isAlreadyRecord = true
@@ -262,8 +265,11 @@
 				 * 前后摄像头切换
 				 * */
 				switchCamera() {
-					this.$refs.Camera.switchCamera();
-					this.android_setCameraParams(); //因为andorid前后摄像头，设置相机参数不一样，需要重置
+					if(!this.changeCamera){
+						this.$refs.Camera.switchCamera();
+						this.android_setCameraParams(); //因为andorid前后摄像头，设置相机参数不一样，需要重置
+					}
+					
 				},
 				/**
 				 * 设置焦距
@@ -357,6 +363,10 @@
 				 * 其它等于0的话，不设置这个参数
 				 * */
 				android_setCameraParams() {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
 					const res = uni.getSystemInfoSync();
 					var screenBiLi = res.screenWidth / res.screenHeight
 					screenBiLi = Math.floor(screenBiLi * 10) / 10;
@@ -431,6 +441,10 @@
 										.height, //视频编码比特率，如果设置了视频分辨率，这个一定要设置，否则视频不清晰
 								}
 								this.$refs.Camera.android_setCameraParams(dic);
+								
+								setTimeout(()=>{
+									uni.hideLoading()
+								},1000)
 								console.log(JSON.stringify(dic));
 							});
 						});

pages/mine/company/editcompany.vue

@@ -21,9 +21,9 @@
 					<image class="" :src="dataDetails.businessLicenseAddressUrl" mode="aspectFit"></image>
 				</view>
 			</view>
-			<view class="flex row">
+			<view class="flex row flex-space-between">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectData(0)">
+				<view style='font-size:14px;' class='flex align-center' @click="selectData(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
 					</view>
@@ -34,7 +34,7 @@
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">统一社会信用代码</view>
-				<u--input placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
+				<u--input placeholder="请输入统一社会信用代码" inputAlign='right' border="none"
 					v-model="dataDetails.unifiedSocialCreditCode" maxlength='18'>
 				</u--input>
 			</view>
@@ -44,28 +44,24 @@
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">企业名称</view>
 				<view class="flex right">
-					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none"
+					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='right' border="none"
 						v-model="dataDetails.companyName" @blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view style='padding-top:10rpx;' class="flex border-bottom mt20 align-center flex-space-between">
 				<view class="left">法定代表人姓名</view>
-				<view class="flex right">
-					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
-						v-model="dataDetails.legalPersonName">
-					</u--input>
-				</view>
+				<view>{{dataDetails.legalPersonName}}</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view style='padding-top:10rpx;' class="flex border-bottom mt20 align-center">
 				<view class="left">联系电话</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入联系电话" maxlength="15" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入联系电话" maxlength="15" inputAlign='right' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
 			</view>
-			<view class="title">上传身份证人像面</view>
+			<view style='padding-top:30rpx;' class="title">上传身份证人像面</view>
 			<view @click.stop="uploadImg(2)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
 				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 				<view class="text">上传身份证人像面</view>
@@ -73,7 +69,7 @@
 			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(2)" class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
 			</view>
-			<view class="title">上传身份证国徽面</view>
+			<view style='padding-top:30rpx;' class="title">上传身份证国徽面</view>
 			<view @click="uploadImg(3)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
 				<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 				<view class="text">上传身份证国徽面</view>
@@ -81,17 +77,17 @@
 			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(3)" class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view style='padding-top:10rpx;' class="flex border-bottom mt20 align-center">
 				<view class="left">身份证号</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入身份证号" maxlength="18" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入身份证号" maxlength="18" inputAlign='right' border="none"
 						v-model="dataDetails.cardNumber">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row">
+			<view style='padding-top:10rpx;' class="flex flex-space-between row border-bottom mt20">
 				<view class="left">身份证有效期</view>
-				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectData(1)">
+				<view style='font-size:14px;' class='flex  align-center' @click="selectData(1)">
 					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择期限截止日期'}}
 					</view>
@@ -101,53 +97,55 @@
 					</view>
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view style='padding-top:10rpx;' class="flex border-bottom mt20 align-center">
 				<view class="left">通讯地址</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入通讯地址" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入通讯地址" inputAlign='right' border="none"
 						v-model="dataDetails.mailingAddress">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 flex-space-between">
 				<view class="left">对公账户</view>
 				<view class="flex">
-					<u--input disabled placeholder="户名与企业名称一致" inputAlign='left' border="none"
-						v-model="dataDetails.corporateAccount">
-					</u--input>
+					{{dataDetails.corporateAccount}}
+					<!-- <u--input disabled placeholder="户名与企业名称一致" inputAlign='left' border="none"
+						v-model="">
+					</u--input> -->
 				</view>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 align-center flex-space-between">
 				<view class="left">卡号</view>
 				<view class="flex">
-					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					<u--input maxlength='19' placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
 					</u--input>
+					<view class="" @click="uploadImg(5)">
+						<image src="../../../static/images/xiangji-2.png" mode=""
+							style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
+					</view>
 				</view>
-				<view class="" @click="uploadImg(5)">
-					<image src="../../../static/images/xiangji-2.png" mode=""
-						style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
-				</view>
+				
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 align-center">
 				<view class="left">开户行</view>
-				<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+				<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="dataDetails.bankDeposit">
 				</u--input>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view style='padding-top:10rpx;' class="flex row border-bottom mt20 align-center flex-space-between">
 				<view class="left khzh-styel">开户支行</view>
-				<view class="flex align-center flex-space-between right" v-if="isShowManualInput">
+				<view class="flex align-center" v-if="isShowManualInput">
 					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
-					<view @click="manualInput" class="type">选择支行</view>
+					<view style='margin-left:5px;' @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex align-center flex-space-between right" v-if="!isShowManualInput">
+				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
 					<view class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
 					</view>
-					<view @click="manualInput" class="type">手动输入</view>
+					<view style='margin-left:5px;' @click="manualInput" class="type">手动输入</view>
 				</view>
 
 			</view>
@@ -512,6 +510,11 @@
 					}).then(res => {
 						uni.hideLoading()
 						_this.dataDetails = res.data
+						if(_this.dataDetails.advanceFreightService==1){
+							this.value=true
+						}else{
+							this.value=false
+						}
 					})
 					.catch(res => {
 						uni.hideLoading()
@@ -622,13 +625,20 @@
 					})
 					return true
 				}
-				if (!uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [18, 18])) {
+				if (this.dataDetails.unifiedSocialCreditCode.length!=18) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "统一社会信用代码输出错误！",
 					})
 					return true
 				}
+				if(this.dataDetails.bankCard.length<16||this.dataDetails.bankCard.length>19){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "卡号输出错误！",
+					})
+					return true
+				}
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -780,7 +790,7 @@
 														console.log(res)
 														_this.$forceUpdate()
 													} else {
-														uni.$u.toast('请上传营业执照');
+														// uni.$u.toast('请上传营业执照');
 													}
 												}
 
@@ -970,7 +980,7 @@
 
 	.wrap {
 		background: #fff;
-		padding: 20rpx 30rpx;
+		padding:10rpx 30rpx 20rpx;
 		border-radius: 5px;
 		margin: 20rpx;
 
@@ -1040,7 +1050,7 @@
 
 	.content1 {
 		background: #fff;
-		padding: 20rpx;
+		padding:20rpx 20rpx 0;
 		margin: 20rpx;
 		border-radius: 10rpx;
 

pages/mine/manageBankCards/addBankCard.vue

@@ -50,17 +50,23 @@
 			<view class="flex row noborder">
 				<view class="left-text">持卡人姓名</view>
 				<view class="flex">
-					<u--input :disabled='disabled' placeholder="输入持卡人姓名" inputAlign='left' border="none"
+					<u--input v-if='!disabled' placeholder="输入持卡人姓名" inputAlign='left' border="none"
 						v-model="dataDetails.cardholderName">
 					</u--input>
+					<view v-else>
+						{{dataDetails.cardholderName}}
+					</view>
 				</view>
 			</view>
 			<view class="flex row noborder">
 				<view class="left-text">持卡人身份证号</view>
 				<view class="flex">
-					<u--input :disabled='disabled' placeholder="输入持卡人身份证号" inputAlign='left' border="none"
+					<u--input v-if='!disabled' placeholder="输入持卡人身份证号" inputAlign='left' border="none"
 						v-model="dataDetails.cardholderIdNumber" maxlength="18">
 					</u--input>
+					<view v-else>
+						{{dataDetails.cardholderIdNumber}}
+					</view>
 				</view>
 			</view>
 			<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'

pages/news/index.vue

@@ -25,7 +25,7 @@
 							</view>
 						</view>
 						<view class="row2 flex flex-space-between align-center">
-							<view class="text point">
+							<view style='white-space: pre-wrap;' class="text point">
 								{{item.newsContent}}
 							</view>
 							<view class="red-point" v-if="item.newsFlag==0"></view>

pages/news/newsSee.vue

@@ -2,7 +2,7 @@
 	<view class="center">
 		<view class="news_info">
 			<view class="">{{dataInfo.newsTitle}}</view>
-			<view class="">{{dataInfo.newsContent}}</view>
+			<view style='white-space: pre-wrap;' class="">{{dataInfo.newsContent}}</view>
 		</view>
 	</view>
 </template>
@@ -12,7 +12,6 @@
 		data(){
 			return{
 				dataInfo:{},
-				
 			}
 		},
 		onLoad(options) {

pages/order/addEvaluation.vue

@@ -19,7 +19,6 @@
 						<start :value="item.value1" style="" size="35" @change="getVal" :size="36">
 						</start>
 					</view>
-
 					<view class="">
 						{{item.level}}
 					</view>
@@ -124,7 +123,7 @@
 		onNavigationBarButtonTap() {
 			// console.log(12121,uni.$u,this)
 			// debugger
-			uni.$u.throttle(this.submit, 500)
+			uni.$u.throttle(this.submit(), 5000)
 			// uni.$u.debounce(this.submit, 500)
 			
 		},
@@ -137,7 +136,7 @@
 		},
 		methods: {
 			submit(){
-				// console.log(11111111)
+				console.log(this.checkboxValue1)
 				let _data = {
 					evaluatoredId: this.objData.commonId,
 					evaluatorId: this.objData.cargoCommonId,
@@ -178,6 +177,7 @@
 			clickStar(index) {
 				console.log(index,this.starIndex)
 				this.selectStar = index
+				this.rate[index].value1=this.starIndex
 				if (index == 0 || index == 1 || index == 2 || index == 3) {
 					if (this.starIndex == '1') {
 						this.rate[index].level = '极差'

pages/order/driverDetail.vue

@@ -56,6 +56,9 @@
 								:readonly='true'>
 							</start>
 						</view> -->
+						<start count="5" v-model="zong" size="35" activeColor="#ffaa00" :size="18"
+							:allowHalf='true' :disabled='true'>
+						</start>
 						<view class="gray fontsize-24">累计发运{{total}}次</view>
 					</view>
 				</view>
@@ -64,8 +67,6 @@
 					<view class="gray fontsize-24">好评率</view>
 				</view>
 			</view>
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-				class="mescroll" style="min-height:350px">
 				<view class="flex flex-space-between">
 					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
@@ -80,7 +81,7 @@
 								width='70rpx' height='70rpx' shape="circle">
 							</u--image>
 							<view class="right">
-								<view class="evaluate_name">{{item.ownerName}}</view>
+								<view class="evaluate_name">{{item.ownerAnonymous!=1?item.ownerName:'匿名'}}</view>
 								<view class="evaluate_date m-top10">
 									{{item.createDate?item.createDate.split(' ')[0]:''}}
 								</view>
@@ -88,12 +89,12 @@
 									<view class="branch_css ">{{item.driverScoreObtained}}</view>
 									<view class="">
 										<start count="5" v-model="item.driverScoreObtained" size="35" activeColor="#ffaa00" :size="18"
-											:allowHalf='true' :readonly='true'>
+											:allowHalf='true' :disabled='true'>
 										</start>
 									</view>
 								</view>
 								<view class="">
-									{{item.driverContent}}
+									{{item.ownerContent}}
 								</view>
 								<view>
 									<u--image v-for="item in item.imgList" :src="item" width='170rpx'
@@ -104,14 +105,13 @@
 						</view>
 					</view>
 				</view>
-			</mescroll-body>
 		</view>
 		<view class="row5">
 			<view class='carMessage' v-if="tabIndex==1&&index==1">
 				<view  v-for='(item,index) in hyDriverCarInfoList' :style="{'border-radius':(index!=hyDriverCarInfoList.length-1?'#ccc':'transparent')}">
 					<view v-if='item.status=="已通过"' class='carMessage-item'>
 						<view>{{item.carNumber}}</view>
-					<view class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | 载重{{item.carApprovedWeight}}吨</view>
+					<view class="flex align-center">{{item.carType}} | 车长{{item.carLong}}米 | <text v-if='item.carCategory=="非挂车"'>载重{{item.carApprovedWeight}}吨</text><text v-else>载重{{item.guaCarApprovedWeight}}吨</text></view>
 					</view>
 					
 					<!-- <view v-if='item.carCategory=="挂车"'>{{item.guaCarNumber}}</view>
@@ -162,23 +162,41 @@
 				}, {
 					name: '评价',
 				}],
-
+				zong:'',
 				list3:[],
 				list4:[],
 				ping:[],
 				hyDriverCarInfoList:[],
 				driverList:{},
-				total:0
+				total:0,
+				upOption: {
+					page: {
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						tip: '暂无记录！'
+					}
+				},
 			};
 		},
 		onNavigationBarButtonTap(e) {
 			console.log("success")
 			this.show = true
 		},
+		onPullDownRefresh() {
+					console.log("触发下拉刷新")
+					setTimeout(() => {
+						this.btnChange('')
+						//关闭下拉刷新
+						uni.stopPullDownRefresh()
+					}, 2000)
+				},
 		onLoad(options) {
 			this.dataObj =JSON.parse(options.driver) 
 			console.log(this.dataObj)
 			that = this
+			this.btnChange('')
 			// this.getList()
 		},
 		onShow(){
@@ -262,7 +280,9 @@
 								evaluateFlag:1,
 						
 							}).then(res => {
+								console.log(res.data,11111111)
 								that.ping=res.data
+								that.zong=Number(res.data.zong)
 							})
 							.catch(res => {
 								uni.$u.toast(res.message);
@@ -289,7 +309,6 @@
 									// 	.tranEfficiency) + Number(that.list[i].freightPayment) + Number(that.list[i]
 									// 	.serviceQuality) + Number(that.list[i].comprehensiveSatisfaction)) / 15 * 5
 								}
-								that.mescroll.endBySize(res.data.records.length, res.data.total);
 								uni.hideLoading()
 							})
 							.catch(res => {

pages/order/index.vue

@@ -1,6 +1,6 @@
 <!-- 货源 -->
 <template>
-	<view :style="{'overflow':showMenu?'hidden':'scroll'}" class="content">
+	<view :style="{'overflow':showMenu||isShowAlert||show?'hidden':'scroll'}" class="content">
 		<!-- <view v-if="!isSearch"> -->
 		<!-- 		<view class="fixed">
 				<view class='title flex flex-center'>
@@ -29,7 +29,7 @@
 										padding:'10rpx 20rpx',
 										'border-radius':'40rpx'
 									}" class="tabs"></u-tabs>
-					<view class="right-btn" @click="showMenu=true">
+					<view class="right-btn" @click="showMenu=!showMenu">
 						<!-- <u-icon name="grid-fill" color="white" size="28"></u-icon> -->
 						<image class="quanbu" src="@/static/images/order/quanbuyewu.png"></image>
 						<view class="">
@@ -141,7 +141,7 @@
 								@click.stop="toMap(good)">
 							</image> -->
 						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'"
-							class="start normal look-map" @click.stop="toMap(good)">
+						 style='border:1px solid #2772FB'	class="start normal look-map" @click.stop="toMap(good)">
 							查看轨迹</view>
 						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
 						</view>
@@ -155,7 +155,7 @@
 						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal"
 							@click.stop="toDetail(good.id)">确认装车</view>
 						<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal"
-							@click.stop="toDetail(good.id)">确认运费</view>
+							@click.stop="toDetail(good.id)">修改运费</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
 						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'"
 							@click.stop="$helper.contactCustomerService()">
@@ -435,6 +435,7 @@
 				this.show = false
 			},
 			moveHandle() {
+				this.showMenu=false
 				// console.log(1111)
 			},
 			open() {

pages/order/orderDetails.vue

@@ -157,7 +157,7 @@
 			<view class="level2-title">承运信息</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合同编号</view>
-				<view class="row-right-text">{{dataObj.contractNo}}</view>
+				<view class="row-right-text">{{dataObj.wtContractNo?dataObj.wtContractNo:'未签订'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">车牌号</view>
@@ -175,6 +175,14 @@
 				<view class="row-left-text gray">装车净重</view>
 				<view class="row-right-text">{{dataObj.hyCarrierInfo?dataObj.hyCarrierInfo.loadingWeight:""}}吨</view>
 			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">运输开始日期</view>
+				<view class="row-right-text">{{dataObj.tranStartDate}}</view>
+			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">运输结束日期</view>
+				<view class="row-right-text">{{dataObj.tranEndDate}}</view>
+			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">装车时间</view>
 				<view class="row-right-text">{{dataObj.hyCarrierInfo.loadingDate}}</view>
@@ -190,7 +198,8 @@
 				<view class='row-between'>
 					<view class="row-left-text gray">合计应付运费</view>
 					<view class="row-right-text">
-						 <u--input placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
+						<u--input v-if='dataObj.orderStatus=="待货主确认卸车"' placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
+						<view v-if='dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>{{totalFreight}}</view>
 					</view>
 				</view>
 				<view class='row-between'>
@@ -231,11 +240,10 @@
 			<view class='flex flex-end'>
 				<view class="row-right-text">{{dataObj.freightInfo.ownerFreightBalanceDate}}</view>
 			</view>
-			<view class='row-between mx row-left-text' v-if="dataObj.freightInfo.freightBalance">
+			<view style='flex-wrap: wrap;' class='flex mx row-left-text'>
 				<!-- 明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.ownerFreightBalance}}元，合计{{dataObj.freightInfo.totalPayment}}元。 -->
-			
-			明细：预付{{dataObj.advanceCharge}}元，尾款{{dataObj.freightInfo.ownerFreightBalance}}元，合计{{dataObj.freightInfo.totalPayment}}元。</view>
-		</view>
+				明细：预付{{dataObj.advanceCharge}}元，工本费：{{dataObj.freightInfo.ownerServiceCharge}}元，<text v-if="dataObj.freightInfo.ownerFreightBalance">尾款：{{dataObj.freightInfo.ownerFreightBalance}}元，</text>合计：{{dataObj.freightInfo.totalPayment}}元。</view>
+			</view>
 		<!-- v-if="status3" -->
 		<view class="content4" v-if="status3">
 			<view class="level2-title gray">还款信息</view>
@@ -439,9 +447,11 @@
 									type: 'success',
 									message: "确认成功",
 								})
-								this.getList()
+								// this.getList()
 							}
 						})
+				}else{
+					this.confirmUnLoading(4)
 				}
 			},
 			moneyclose(){
@@ -546,17 +556,16 @@
 				this.isShowAlert = true
 			},
 			confirmLoading(type) {
-				if(this.type == 3 && this.type == 4){
+				this.type = type
+				if(this.type == 3 || this.type == 4){
 					if (this.dataObj.cargoOwnerContract != '1') {
 					uni.showToast({
-						title: '请先签订合同',
+						title: '请先签订合同!',
 						icon: 'none'
 					})
 					return
 				}
 				}
-				
-				this.type = type
 				if (type == 3) {
 					this.alertTitle = '确认装车？'
 					this.confirmText = '确定'
@@ -576,6 +585,7 @@
 			confirmUnLoading(type) {
 				this.type=type
 				if(type == 4){
+					console.log(this.totalFreight)
 					if(this.totalFreight){
 						this.alertTitle = '确认卸车？'
 						this.confirmText = '确定'
@@ -593,6 +603,7 @@
 				// uni.$u.route('/pages/order/confirmUnloading', item);
 			},
 			confirmClick() {
+				console.log(111111111)
 				var that=this
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
@@ -855,11 +866,7 @@
 							this.status1 = true
 						}
 						// 运费信息
-						if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
-							.cargoOwnerStatus != "待确认装车" && res.data.cargoOwnerStatus != "已驳回装车信息" && res.data
-							.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息" && res.data
-							.cargoOwnerStatus != "待结算" && res.data
-							.cargoOwnerStatus != "已终止") {
+						if (res.data.cargoOwnerStatus == "已完结") {
 							this.status2 = true
 						}
 						//还款信息

pages/order/signContract.vue

@@ -186,6 +186,7 @@
 								})
 								let _obj = {}
 								_obj.id = that.dataDetails.id
+								_obj.submitFlag=2
 								_obj.typeFlag = 1
 								_obj.cargoOwnerAutograph = that.dataDetails.cargoOwnerAutograph
 								that.$request.baseRequest('get', '/orderInfo/setPdf', _obj).then(

pages/public/login.vue

@@ -374,4 +374,7 @@
 		font-weight: 500;
 		color: #333333;
 	}
+	/deep/.uni-input-input:disabled {
+	    background:#fff;
+	}
 </style>

pages/release/addAddress.vue

@@ -14,9 +14,9 @@
 			<view class="">
 				<u--form labelPosition="left" :model="addressInfo" ref="form1" labelWidth='100'>
 					<u-form-item label="所属区域" ref="item1" borderBottom>
-						<view style='width:100%;' class='flex flex-space-between' @click='toMap' :class="addressInfo.area?'':'select-color'">
-							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
+						<view style='width:100%;flex-direction:row-reverse;' class='flex align-center' @click='toMap' :class="addressInfo.area?'':'select-color'">
 							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
+							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
@@ -25,10 +25,10 @@
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
+						<u--input v-model="addressInfo.contacts"  maxlength="10" inputAlign="right" border="none" placeholder="联系人">></u--input>
 					</u-form-item>
 					<u-form-item label="联系电话" prop="addressInfo.contactPhone" ref="item1">
-						<u--input v-model="addressInfo.contactPhone" border="none" placeholder="联系电话" maxlength="11">>
+						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="联系电话" maxlength="11">>
 						</u--input>
 					</u-form-item>
 				</u--form>
@@ -170,6 +170,14 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.addressInfo.contactPhone)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系电话不能为空！",
+					})
+					return true
+				}
+				
 			},
 			submit() {
 				if (this.validate()) return

pages/release/editAddress.vue

@@ -14,8 +14,10 @@
 			<view class="">
 				<u--form labelPosition="left" :model="addressInfo" :rules="rules" ref="form1" labelWidth='100'>
 					<u-form-item label="所属区域" ref="item1" borderBottom>
-						<view @click='toMap'>
-							{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}
+
+						<view style='width:100%;flex-direction:row-reverse;' class='flex align-center' @click='toMap'>
+							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
+							{{addressInfo.area?(addressInfo.province?addressInfo.province:''+addressInfo.city+addressInfo.area):'选择所属区域 '}}
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
@@ -23,10 +25,10 @@
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
+						<u--input v-model="addressInfo.contacts" border="none" maxlength="10" inputAlign="right" placeholder="联系人">></u--input>
 					</u-form-item>
 					<u-form-item label="联系电话" prop="addressInfo.contactPhone" ref="item1">
-						<u--input v-model="addressInfo.contactPhone" border="none" placeholder="联系电话">></u--input>
+						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="联系电话" maxlength="11">></u--input>
 					</u-form-item>
 				</u--form>
 			</view>
@@ -163,6 +165,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.addressInfo.contactPhone)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系电话不能为空！",
+					})
+					return true
+				}
 			},
 			submit() {
 				if (this.validate()) return

pages/release/editRelease.vue

@@ -25,7 +25,7 @@
 					<view class="top" @click="selectAddress(0)">
 						<view class="send">寄</view>
 						<view class="title">
-							{{dataObj.sendArea?(dataObj.sendPrivate?dataObj.sendPrivate:'' + dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
+							{{dataObj.sendArea?((dataObj.sendPrivate?dataObj.sendPrivate:'' )+ dataObj.sendCity+dataObj.sendArea):'选择发货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -41,7 +41,7 @@
 					<view class="top" @click="selectAddress(1)">
 						<view class="collect">收</view>
 						<view class="title">
-							{{dataObj.unloadArea?(dataObj.unloadPrivate?dataObj.unloadPrivate:'' + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
+							{{dataObj.unloadArea?((dataObj.unloadPrivate?dataObj.unloadPrivate:'') + dataObj.unloadCity+dataObj.unloadArea):'选择收货地区'}}
 						</view>
 					</view>
 					<view class="bottom">
@@ -107,7 +107,7 @@
 				<view class="right"><input type="number" value="" placeholder="输入运费单价" class="input"
 						v-model="dataObj.freightPrice" /></view>
 			</view>
-			<view class="row" v-if="dataObj.freightAdvance">
+			<view class="row" v-if="freightAdvance">
 				<view class="left">该任务申请运费垫付</view>
 				<view class="right">
 					<u-switch v-model="dataObj.freightAdvance" @change="change" size="20"></u-switch>
@@ -242,6 +242,7 @@
 					margin: '0 0 0 20rpx'
 				},
 				show: false,
+				freightAdvance:false,
 				columns: [
 					[]
 				],
@@ -366,16 +367,16 @@
 					this.checkboxValue1.push('自卸车')
 				}
 			}
-			if (this.dataObj.freightAdvance) {
+			if (this.dataObj.freightAdvance==1) {
 				this.dataObj.freightAdvance = true
+				this.freightAdvance=true
 			} else {
 				this.dataObj.freightAdvance = false
+				this.freightAdvance=false
 			}
-			
-			
 			console.log(this.dataObj)
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '随时')
-			this.validityPeriodcq = this.$helper.makeValidityPeriod(0, '随时')
+			this.validityPeriodcq = this.$helper.makeValidityPeriod(0, '长期')
 
 
 		},
@@ -412,6 +413,7 @@
 						let _dlhz = res.data.cargoOwnerCompInfoList
 						if(_self){
 							for (let i = 0; i < _self.length; i++) {
+								_self[i].compStatus='wd'
 								if (_self[i].status == '已认证') {
 									this.qyList.push(_self[i])
 								}
@@ -419,6 +421,7 @@
 						}
 						if(_dlhz){
 							for (let i = 0; i < _dlhz.length; i++) {
+								_dlhz[i].compStatus='ss'
 								if (_dlhz[i].status == '已认证') {
 									this.qyList.push(_dlhz[i])
 								}
@@ -529,8 +532,8 @@
 						return true
 					}
 				}
-				if (this.dataObj.carLengthSmall && this.dataObj.carLength && (this.dataObj.carLengthSmall > this.dataObj
-						.carLength)) {
+				
+				if (this.dataObj.carLengthSmall && this.dataObj.carLength && (Number(this.dataObj.carLengthSmall) > Number(this.dataObj.carLength))) {
 					uni.showToast({
 						title: '最小车长应小于最大车长！',
 						duration: 2000,
@@ -583,7 +586,7 @@
 			},
 			confirmClick() {
 				this.isShowAlert = false
-				if (this.validate()) return
+				
 				if (this.dataObj.billingMethod == '元/吨') {
 					this.dataObj.billingMethod = 0
 				} else {
@@ -738,15 +741,39 @@
 			selectCargoOwnerClose() {
 				this.show = false
 			},
+			// confirmSelectCargoOwner(e) {
+			// 	this.dataObj.cargoOwner = e.value[0]
+			// 	for (let i = 0; i < this.qyList.length; i++) {
+			// 		let _name = this.qyList[i].company ? this.qyList[i].company : this.qyList[i].companyName
+			// 		if (_name == e.value[0]) {
+			// 			this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
+			// 		}
+			// 	}
+
+			// 	uni.setStorageSync('releaseCargoOwner', this.dataObj.cargoOwner)
+			// 	this.show = false
+			// },
 			confirmSelectCargoOwner(e) {
 				this.dataObj.cargoOwner = e.value[0]
 				for (let i = 0; i < this.qyList.length; i++) {
 					let _name = this.qyList[i].company ? this.qyList[i].company : this.qyList[i].companyName
 					if (_name == e.value[0]) {
+						if(e.value[0]!='个人货主'){
+							this.freightAdvance=true
+							if(this.qyList[i].compStatus=='ss'){
+								this.dataObj.compId=this.qyList[i].compId
+							}else{
+								this.dataObj.compId=this.qyList[i].id
+							}
+							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
+							uni.setStorageSync('releasecompId', this.dataObj.compId)
+						}else{
+							this.freightAdvance=false
+						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
 					}
 				}
-
+				
 				uni.setStorageSync('releaseCargoOwner', this.dataObj.cargoOwner)
 				this.show = false
 			},
@@ -828,7 +855,41 @@
 						})
 						return
 					}
-					this.dataObj.taskValidity = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+					var date=new Date()
+					var text='任务已过期！'
+						if(e.value[0]<date.getFullYear()){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
+						if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
+						if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
+						var datetime = new Date().getTime()
+						var datetime1 = datetime + (24 * 60 * 60 * 1000 * 30 * 6)
+						var currecttime = new Date(e.value[0] + '-' + e.value[1] + '-' + e.value[2]).getTime()
+						if (currecttime < datetime || currecttime > datetime1) {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: "请选择未来六个月之内的日期！",
+							})
+						} else {
+							this.dataObj.taskValidity = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
+							
+						}
 				}
 				this.isShowcardValidity = false
 			},
@@ -850,6 +911,7 @@
 				this.dataDetails.type = n
 			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true;
 			},
 		}

pages/release/record.vue

@@ -61,8 +61,8 @@
 							</view>
 							<view class="flex align-center">
 								<view class="">运距约 {{good.distance}}km</view>
-								<view class="sline"></view>
-								<view class=" ">{{good.weight}}吨</view>
+								<view v-if='good.weight' class="sline"></view>
+								<view v-if='good.weight' class=" ">{{good.weight}}吨</view>
 							</view>
 						</view>
 					</view>

pages/release/release.vue

@@ -86,7 +86,7 @@
 			<view class="row">
 				<view class="left">收货方</view>
 				<view class="right flex">
-					<input type="text" value="" placeholder="输入收货人姓名或企业名称" class="input" v-model="dataObj.receiver" />
+					<input type="text" value="" placeholder="输入收货人姓名或企业名" class="input" v-model="dataObj.receiver" />
 				</view>
 			</view>
 			<view class="row">
@@ -122,7 +122,7 @@
 				<view class="right"><input type="number" value="" placeholder="输入运费单价" class="input"
 						v-model="dataObj.freightPrice" /></view>
 			</view>
-			<view v-if='dataObj.freightAdvance' class="row">
+			<view v-if='freightAdvance' class="row">
 				<view class="left">该任务申请运费垫付</view>
 				<view class="right">
 					<u-switch v-model="dataObj.freightAdvance" @change="change" size="20"></u-switch>
@@ -269,6 +269,7 @@
 				columns: [
 					[]
 				],
+				freightAdvance: false,
 				dataObj: {
 					commonId: '',
 					cargoOwner: '',
@@ -331,7 +332,7 @@
 				validityPeriodcq: [],
 				isShowValidity: false,
 				dataDetails: {
-					type: '元/车'
+					type: '元/吨'
 				},
 				radiolist1: [{
 						name: '元/吨',
@@ -640,7 +641,8 @@
 				if (!this.dataObj.receiverIdcard && !this.dataObj.receiverCreditCode) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "收款方统一社会信用代码和收货人身份证号码至少填写一个！",
+						message: "信用代码和身份证号码至少填写一个！",
+						duration:2000
 					})
 					return true
 				}
@@ -777,6 +779,7 @@
 				uni.$u.throttle(this.requestdata, 500)
 			},
 			requestdata(){
+				console.log(this.dataObj)
 				// // #ifdef APP-PLUS
 				// if (this.alertTitle == '账号审核中') {
 				// 	if (uni.getSystemInfoSync().platform == 'ios') {
@@ -796,7 +799,7 @@
 				// }
 				// this.isShowAlert = false
 				
-				if (this.dataObj.billingMethod == '元/吨') {
+				if (this.dataDetails.type == '元/吨') {
 					this.dataObj.billingMethod = 0
 				} else {
 					this.dataObj.billingMethod = 1
@@ -975,6 +978,7 @@
 					let _name = this.qyList[i].company ? this.qyList[i].company : this.qyList[i].companyName
 					if (_name == e.value[0]) {
 						if(e.value[0]!='个人货主'){
+							this.freightAdvance=true
 							if(this.qyList[i].compStatus=='ss'){
 								this.dataObj.compId=this.qyList[i].compId
 							}else{
@@ -982,6 +986,8 @@
 							}
 							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
 							uni.setStorageSync('releasecompId', this.dataObj.compId)
+						}else{
+							this.freightAdvance=false
 						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
 					}
@@ -1032,6 +1038,7 @@
 						})
 						return
 					}
+					
 					switch (this.ValidityPeriodType) {
 						case 0:
 							this.dataObj.loadingDateStart = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
@@ -1076,6 +1083,29 @@
 						})
 						return
 					}
+					var date=new Date()
+					var text='任务已过期！'
+						if(e.value[0]<date.getFullYear()){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
+						if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
+						if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+							this.$refs.uToast.show({
+								type: 'error',
+								message: text,
+							})
+							return
+						}
 					var datetime = new Date().getTime()
 					var datetime1 = datetime + (24 * 60 * 60 * 1000 * 30 * 6)
 					var currecttime = new Date(e.value[0] + '-' + e.value[1] + '-' + e.value[2]).getTime()
@@ -1084,14 +1114,14 @@
 							type: 'error',
 							message: "请选择未来六个月之内的日期！",
 						})
+						return
 					} else {
 						this.dataObj.taskValidity = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-						this.isShowcardValidity = false
 					}
 					console.log(datetime, currecttime)
 
 				}
-
+				this.isShowcardValidity = false
 			},
 			selectValidityPeriod(type) {
 				this.ValidityPeriodType = type
@@ -1109,6 +1139,7 @@
 				uni.$u.route('/pages/release/record');
 			},
 			radioChange(n) {
+				console.log(n)
 				this.dataDetails.type = n
 			},
 			submit() {