更新

common/helper.js

@@ -171,7 +171,6 @@ const formatLocation = (str) => {
 
 //获取省份简称
 const getProvinceAbbreviation = (province) => {
-	// console.log(province)
 	if (province == "北京市" || province == "北京")
 		return "京";
 	else if (province == "天津市" || province == "天津")

pages/mine/cargoowner/addEnerprise.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class='content'>
-		
+
 		<view class="wrap">
 			<view style='border-bottom:1px solid #eee;padding:10px 0 10px;' class="flex flex-space-between row">
 				<view class="left-text">企业</view>
 				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectshow">
 					<view :style="{'color':dataDetails.company ? '#000':'#C6CBD5'}">
-						{{dataDetails.company?dataDetails.company:'选择所属企业'}}</view>
+						{{dataDetails.company?dataDetails.company:'选择所属企业'}}
+					</view>
 					<view>
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
@@ -58,7 +59,8 @@
 				<view class="left-text">营业期限截止日期</view>
 				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">
-						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}</view>
+						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}
+					</view>
 					<view>
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
@@ -74,16 +76,16 @@
 			@close="isShowimgType=false">
 		</u-action-sheet>
 		<view class="content4">
-			<view style='margin:0 0 18px;font-size:12px;color:#999;' class='flex items-center'>
-				<u--image style='margin-right:5px;' @click='consent'
+			<view style='margin:0 0 18px;font-size:16px;color:#999;' class='flex items-center'>
+				<u--image style='margin-right:5px;margin-top: 12rpx;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
 					height="12px"></u--image>
 				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
+			<!-- :class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}" -->
 			<view
-				:class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}"
-				class="next-btn" @click="submit()">
+				class="next-btn active" @click="submit()">
 				提交
 			</view>
 		</view>
@@ -255,10 +257,19 @@
 			// },
 
 			submit() {
+				if (!this.checked) {
+					uni.showToast({
+						title: '请勾选协议',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true
 				})
+
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(
@@ -287,11 +298,6 @@
 		background: #F5F6FA;
 	}
 
-	.content {
-		/* background: white; */
-		/* padding:20rpx */
-	}
-
 	.wrap {
 		margin: 20rpx;
 		padding: 20rpx;
@@ -323,7 +329,7 @@
 	.content1 {
 		background: #fff;
 		padding: 40rpx 20rpx 20rpx;
-		margin: 20rpx 0rpx 200rpx;
+		margin: 20rpx 0rpx 0;
 		border-radius: 10rpx;
 
 		.row {
@@ -334,7 +340,7 @@
 		}
 
 		.left-text {
-			// background: red;
+			/* // background: red; */
 			width: 320rpx;
 			color: #333333;
 			display: flex;
@@ -385,7 +391,6 @@
 		text-align: center;
 		left: 0;
 		box-sizing: border-box;
-		;
 		padding: 10px 15px;
 
 		.line {
@@ -407,7 +412,7 @@
 			margin-top: 10px;
 		}
 
-		.next-btn.active {
+		.active {
 			background: #2772FB;
 			color: #fff;
 		}

pages/mine/cargoowner/editpersonalinformation.vue

@@ -178,7 +178,6 @@
 			// 性别切换
 			radioChange(n) {
 				this.dataDetails.sex = n
-				console.log('radioChange', this.dataDetails.sex);
 				if (n == "男") {
 					this.sexText = "先生"
 				} else {

pages/mine/cargoowner/selectcompany.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view class="fixed1"></view>
+	<view class="center">
+		<!-- <view class="fixed1"></view> -->
 		<luo-nav-bar @leftClick='navback' :searchText='searchText' @rightClick='cancel' @input='companyInput'
 			:isSearch="true" :isPlaceText='true' placeText='输入企业名称' rightText='取消' leftIcon='back'></luo-nav-bar>
 		<view v-if='searching' style='padding:10px;'>
@@ -87,21 +87,21 @@
 				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
 						commonId: this.userInfo.id
 					}).then(res => {
+						debugger
 						uni.hideLoading()
 						if (res.data) {
-							console.log(res.data)
 							if(res.data.name==item.legalPersonName){
 								uni.showToast({
 									title: '您已经具备该公司货主身份',
 									icon: 'none',
 									duration: 2000
 								})
-							}else if(res.data.cargoOwnerCompInfoList){
-								if(!res.data.cargoOwnerCompInfoList.every(item=>{
+							}else if(res.data.hyCargoOwnerCompInfoList){
+								if(!res.data.hyCargoOwnerCompInfoList.every(item=>{
 									return item.company==item.companyName
 								})){
-									for (var i = 0; i < res.data.cargoOwnerCompInfoList.length; i++) {
-										if(res.data.cargoOwnerCompInfoList[i].company==item.companyName){
+									for (var i = 0; i < res.data.hyCargoOwnerCompInfoList.length; i++) {
+										if(res.data.hyCargoOwnerCompInfoList[i].company==item.companyName){
 											uni.showToast({
 												title: '该企业已认证过,删除后才可以再次选中该企业',
 												icon: 'none',
@@ -109,12 +109,12 @@
 											})
 										}
 									}
-								}else{
+								}
+								
+							}else{
 									uni.setStorageSync('currectcompany', item)
 									that.goDetailPage('pages/mine/cargoowner/addEnerprise')
 								}
-								
-							}
 						}
 					})
 					.catch(res => {
@@ -132,7 +132,10 @@
 				
 			},
 			goDetailPage(src) {
-				uni.$u.route(src);
+				// uni.$u.route(src);
+				uni.navigateBack({
+					delta:1
+				})
 			},
 			currectsearch(value) {
 				var _this = this

pages/mine/company/addcompany.vue

@@ -444,6 +444,14 @@
 			},
 			submit() {
 				if (this.validate()) return
+				if (!this.consentStatus) {
+					uni.showToast({
+						title: '请勾选协议',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true

pages/mine/index.vue

@@ -12,7 +12,7 @@
 				<view class="flex">
 					<u--image :showLoading="true"
 						:src="userInfo.avatarUrl?userInfo.avatarUrl:'../../static/mine/avatar1.png'" width="56px"
-						height="56px"></u--image>
+						height="56px" shape='circle'></u--image>
 					<view class='information' v-if='hasLogin'>
 						<view class='flex items-center'>
 							<view class='username'>{{userName}}  {{cargoCall}}</view>
@@ -185,12 +185,15 @@
 					phone: this.userInfo.phone
 				}).then(res => {
 					uni.setStorageSync("firstAuthentication",res.data)
+					if(res.data){
 						this.userName = res.data.call
 						if(res.data.sex == '男'){
 							this.cargoCall = "先生"
 						}else{
 							this.cargoCall = "女士"
 						}
+					}
+						
 				})
 				this.phone = this.userInfo.phone ? this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7),
 					"****") : ''

pages/mine/manageBankCards/addBankCard.vue

@@ -21,7 +21,7 @@
 					</u--input>
 				</view>
 				<view class="" @click="uploadImg">
-					相机
+					<image src="../../../static/images/xiangji-2.png" mode="" style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
 				</view>
 			</view>
 			<view class="flex row">
@@ -66,7 +66,7 @@
 			<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
 				@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
 			</u-picker>
-			<view class="" style="color: red;font-size: 26rpx;margin-top: 20rpx;">*收款人须为司机本人</view>
+			<view class="" style="color: red;font-size: 26rpx;margin-top: 20rpx;">*收款人须为货主本人</view>
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
@@ -319,13 +319,13 @@
 				if (that.dataDetails.cardholderName != this.name) {
 					that.$refs.uToast.show({
 						type: 'error',
-						message: "收款人须为司机本人！",
+						message: "收款人须为货主本人！",
 					})
 					return
 				} else {
 					that.$request.baseRequest('get', '/driverPayeeInfo/bankCradShibie', { //三要素验证
 						name: that.dataDetails.cardholderName, //持卡人姓名
-						idCard: this.id, //司机身份证号
+						idCard: this.id, //货主身份证号
 						accountNo: that.dataDetails.bankCard //卡号
 					}).then(response => {
 						if (response.data.distinguishNum == "01") {
@@ -355,7 +355,7 @@
 									uni.$u.toast(res.message);
 								});
 						} else {
-							uni.$u.toast(res.data.distinguish);
+							uni.$u.toast(response.data.distinguish);
 						}
 					})
 				}

pages/mine/set.vue

@@ -5,7 +5,7 @@
 			<view class='setavatar'>
 				<image style='width:39px;height:39px;' src="../../static/mine/set/setavatar.png"></image>
 			</view>
-			<view style='font-size:12px;color:#999;margin-bottom:20px;' class="">
+			<view style='font-size:12px;color:#999;margin-bottom:20px;' class="" v-if="!headUrl">
 				未上传头像
 			</view>
 		</view>
@@ -236,8 +236,9 @@
 	}
 
 	.picture {
-		width: 58px;
-		height: 58px;
+		width: 60px;
+		height: 60px;
+		border-radius: 30px;
 	}
 	.arrow {
 		margin-left: 15px;

pages/order/addEvaluation.vue

@@ -3,7 +3,7 @@
 		<view class="kuang">
 			<view class="order-row flex flex-space-between">
 				<view class="flex">
-					<view>{{objData.orderNo}}</view>
+					<view>订单：{{objData.orderNo}}</view>
 					<view>{{objData.goodName}}</view>
 				</view>
 				<view class="flex align-center">
@@ -84,31 +84,31 @@
 				rate: [{
 						name: "司机信用",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "运输效率",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "运输安全",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "运输安全",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "满意度",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常满意'
 					}
 				],

pages/order/index.vue

@@ -71,7 +71,7 @@
 					<view class="flex row2">
 						<view class="left">
 							<view class="top">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
 								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}</view>
 							</view>
 							<view class="bottom">{{$helper.filterArea(good.sendArea)}}</view>
@@ -84,7 +84,7 @@
 						<view class="right">
 							<view class="top">
 								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.unloadPrivate)}}
+									{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
 								</view>
 								<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}</view>
 							</view>
@@ -103,7 +103,7 @@
 						</view>
 						<view class="flex align-center">
 							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-							<view class="car">{{good.freightInfo?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
+							<view class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<!-- 		<view class="right">
 							<view class="flex fontsize-26 row">
@@ -143,12 +143,12 @@
 						<view class="start normal" @click.stop="confirmLoading(good,4)"
 							v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
-						<view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view>
-						<view class="normal" @click.stop="stop(good)"
-							v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view>
+						<!-- <view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view> -->
+						<!-- <view class="normal" @click.stop="stop(good)"
+							v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view> -->
 
-						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> -->
-						<view class="start normal" @click.stop="addevaluation(good)" v-if="good.cargoOwnerStatus=='待结算'"  >评价</view>
+						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> --><!-- driverEvaluated 为1是已评价过-->
+						<view class="start normal" @click.stop="addevaluation(good)" v-if="good.cargoOwnerStatus=='已完结' && good.ownerEvaluated != 1"  >评价</view>
 					</view>
 				</view>
 			</view>
@@ -490,9 +490,9 @@
 						}).then(res => {
 							if (res.code == 200) {
 								if (this.type == 1) {
-									_title = '接单单成功'
+									_title = '接单成功！'
 								} else {
-									_title = '拒绝订单成功'
+									_title = '拒绝订单成功！'
 								}
 								this.$refs.uToast.show({
 									type: 'success',

pages/order/orderDetails.vue

@@ -139,11 +139,11 @@
 				<view class="row-left-text gray">距离</view>
 				<view class="row-right-text">约{{dataObj.distance}}公里</view>
 			</view>
-			<view class='row-between'>
+			<!-- <view class='row-between'>
 				<view class="row-left-text gray">运费</view>
 				<view class="row-right-text">{{dataObj.freight}}{{dataObj.illingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
-
+ -->
 		</view>
 		<view class="content3" v-if="status1">
 			<view class="level2-title">承运信息</view>
@@ -159,9 +159,17 @@
 				<view class="row-left-text gray">预计运费</view>
 				<view class="row-right-text">{{dataObj.hyCarrierInfo.estimatedFreight}}元</view>
 			</view>
+			<view class='row-between'>
+				<view class="row-left-text gray">预付款</view>
+				<view class="row-right-text">{{dataObj.advanceCharge}}元</view>
+			</view>
+			<view class='row-between'>
+				<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 gray">{{dataObj.hyCarrierInfo.loadingDate}}</view>
+				<view class="row-right-text">{{dataObj.hyCarrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">装车照片</view>
@@ -172,11 +180,11 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合计应付运费</view>
-				<view class="row-right-text">{{dataObj.hyCarrierInfo.totalFreight}}元</view>
+				<view class="row-right-text">{{dataObj.hyCarrierInfo.totalFreight}}{{dataObj.hyCarrierInfo.totalFreight?"元":""}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车时间</view>
-				<view class="row-right-text gray">{{dataObj.hyCarrierInfo.loadingDate}}</view>
+				<view class="row-right-text">{{dataObj.hyCarrierInfo.unloadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车照片</view>
@@ -188,20 +196,23 @@
 		</view>
 		<!-- v-if="status2 -->
 		<view class="content4" v-if="status2">
-			<view class="level2-title gray">运费信息（单位：元）</view>
+			<view class="level2-title">运费信息（单位：元）</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">预付运费</view>
 				<view class="row-right-text">{{dataObj.freightInfo.prepaidFreight}}</view>
 			</view>
 			<view class='flex flex-end'>
-				<view class="gray row-right-text">{{dataObj.freightInfo.prepaidFreightDate}}</view>
+				<view class="row-right-text">{{dataObj.freightInfo.prepaidFreightDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">运费尾款</view>
-				<view class="row-right-text">{{dataObj.freightInfo.freightBalance}}</view>
+				<view class="row-right-text">{{dataObj.freightInfo.freightBalance?dataObj.freightInfo.freightBalance:"未支付"}}</view>
+			</view>
+			<view class='flex flex-end'>
+				<view class="row-right-text">{{dataObj.freightInfo.freightBalanceDate}}</view>
 			</view>
-			<view class='row-between mx row-left-text gray'>
-				明细：预付{{dataObj.freightInfo.freightBalance}}元，扣款{{dataObj.freightInfo.deduction}}元，服务费{{dataObj.freightInfo.serviceCharge}}元，尾款{{dataObj.freightInfo.freightBalance}}元，合计收款{{dataObj.freightInfo.totalCollection}}元。
+			<view class='row-between mx row-left-text' v-if="dataObj.freightInfo.freightBalance">
+				明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.freightBalance}}元，司机合计收款{{dataObj.freightInfo.totalCollection}}元。
 			</view>
 		</view>
 		<!-- v-if="status3" -->
@@ -578,8 +589,7 @@
 						// 运费信息
 						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 != "待结算" && res.data
+							.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息"  && res.data.cargoOwnerStatus != "待结算" && res.data
 							.cargoOwnerStatus != "已终止") {
 							this.status2 = true
 						}

pages/release/lookRelease.vue

@@ -21,7 +21,7 @@
 		<view class="flex place">
 			<view class="left flex">
 				<view class="flex">
-					<view class="ssx">{{$helper.getProvinceAbbreviation(dataObj.sendPrivate)}}</view>
+					<view class="ssx">{{$helper.getProvinceAbbreviation(dataObj.sendPrivate?dataObj.sendPrivate:dataObj.sendCity)}}</view>
 					<view class="level2-title">{{dataObj.sendCity}}</view>
 				</view>
 				<view class="level2-title">{{dataObj.sendArea}}</view>
@@ -30,7 +30,7 @@
 			<view class="right flex">
 				<view class="flex">
 					<view class="ssx">
-						{{$helper.getProvinceAbbreviation(dataObj.unloadPrivate)}}
+						{{$helper.getProvinceAbbreviation(dataObj.unloadPrivate?dataObj.unloadPrivate:dataObj.unloadCity)}}
 					</view>
 					<view class="level2-title">{{dataObj.unloadCity}} </view>
 				</view>

pages/release/record.vue

@@ -23,7 +23,7 @@
 					<view class="flex row2">
 						<view class="left flex">
 							<view class="flex">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
 								<view class="level2-title">{{good.sendCity}}</view>
 							</view>
 							<view class="level2-title">{{good.sendArea}}</view>
@@ -32,7 +32,7 @@
 						<view class="right flex">
 							<view class="flex">
 								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.unloadPrivate)}}
+									{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
 								</view>
 								<view class="level2-title">{{good.unloadCity}} </view>
 							</view>
@@ -49,7 +49,7 @@
 									<!-- <image class="hz-good" src="@/static/images/order/good-img.png"></image> -->
 									<view>{{good.goodsName}}</view>
 								</view>
-								<view class="cc">{{good.carLengthSmall}} - {{good.carLength}} 米</view>
+								<view class="cc" v-if="good.carLengthSmall&&good.carLength">{{good.carLengthSmall}} - {{good.carLength}} 米</view>
 								<view class="sline"></view>
 								<view>{{carType(good)}}</view>
 							</view>

pages/release/release.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<!-- <u-navbar title="发布" :placeholder="true" rightText="记录" @rightClick="goToRecord" @leftClick="back()"> -->
-			<!-- view class="u-nav-slot" slot="left">
+		<!-- view class="u-nav-slot" slot="left">
 				<u-icon name="arrow-left" size="19"></u-icon>
 				<u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
 				<u-icon name="home" size="20"></u-icon>
@@ -114,7 +114,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">
 				<view class="left">该任务申请运费垫付</view>
 				<view class="right">
 					<u-switch v-model="dataObj.freightAdvance" @change="change" size="20"></u-switch>
@@ -230,7 +230,7 @@
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
-		
+
 	</view>
 </template>
 
@@ -345,37 +345,18 @@
 				})
 			} else {
 				this.alertTitle = '身份信息未认证，去认证?'
-					this.showCancelButton = false
-						this.isShowAlert = true
+				this.showCancelButton = false
+				this.isShowAlert = true
 				// uni.showLoading({
 				// 	title: '请重新提交身份信息',
 				// 		complete() {
 				// 			uni.switchTab({
 				// 				url:'/pages/mine/index'
-								
+
 				// 			})
 				// 			}
 				// })
 			}
-			this.getSFList()
-		},
-		async onLoad() {
-			_this = this
-			// #ifdef APP-PLUS
-			let _status = await this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-				phone: this.userInfo.phone,
-			}).then(res => {
-				return res.data.authenticationStatus
-			})
-			if (_status == '已禁用') {
-				this.isShowAlert = true
-				this.alertTitle = '账号审核中'
-				this.confirmText = '退出APP'
-				this.showCancelButton = false
-				return
-			} else {
-			}
-			// #endif
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '随时')
 			this.validityPeriodcq = this.$helper.makeValidityPeriod(0, '长期')
 			let _faddress = uni.getStorageSync('storage_faddress');
@@ -414,6 +395,25 @@
 			this.dataObj.loadingDateStart = '随时'
 			this.dataObj.loadingDateEnd = '随时'
 			this.dataObj.taskValidity = '长期'
+			this.getSFList()
+		},
+		async onLoad() {
+			_this = this
+			// #ifdef APP-PLUS
+			let _status = await this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+				phone: this.userInfo.phone,
+			}).then(res => {
+				return res.data.authenticationStatus
+			})
+			if (_status == '已禁用') {
+				this.isShowAlert = true
+				this.alertTitle = '账号审核中'
+				this.confirmText = '退出APP'
+				this.showCancelButton = false
+				return
+			} else {}
+			// #endif
+
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -451,7 +451,9 @@
 								}
 							}
 						}
-						this.columns = [[]]
+						this.columns = [
+							[]
+						]
 						this.columns[0].push("个人货主")
 						for (let i = 0; i < this.qyList.length; i++) {
 							this.columns[0].push(this.qyList[i].company ? this.qyList[i].company : this.qyList[i]
@@ -459,8 +461,7 @@
 						}
 						this.$forceUpdate()
 					})
-					.catch(res => {
-					});
+					.catch(res => {});
 
 
 			},
@@ -522,10 +523,17 @@
 					return true
 				}
 
-				if (uni.$u.test.isEmpty(this.dataObj.receiverIdcard)) {
+				// if (uni.$u.test.isEmpty(this.dataObj.receiverIdcard)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "收货人身份证不能为空！",
+				// 	})
+				// 	return true
+				// }
+				if (!this.dataObj.receiverIdcard && !this.dataObj.receiverCreditCode) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "收货人身份证不能为空！",
+						message: "收款方统一社会信用代码和收货人身份证号码至少填写一个！",
 					})
 					return true
 				}
@@ -584,8 +592,9 @@
 						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,
@@ -625,8 +634,9 @@
 						return true
 					}
 				}
-				if (this.dataObj.loadWeightSmall && this.dataObj.loadWeight && (this.dataObj.loadWeightSmall > this.dataObj
-						.loadWeight)) {
+				if (this.dataObj.loadWeightSmall && this.dataObj.loadWeight && (Number(this.dataObj.loadWeightSmall) >
+						Number(this.dataObj
+							.loadWeight))) {
 					uni.showToast({
 						title: '最小载重应小于最大载重！',
 						duration: 2000,
@@ -648,13 +658,13 @@
 					return
 				}
 				// #endif
-				
-					if (this.alertTitle == '身份信息未认证，去认证?') {
-							uni.switchTab({
-								url:'/pages/mine/index'
-							})
-							return
-					}
+
+				if (this.alertTitle == '身份信息未认证，去认证?') {
+					uni.switchTab({
+						url: '/pages/mine/index'
+					})
+					return
+				}
 				this.isShowAlert = false
 
 				if (this.dataObj.billingMethod == '元/吨') {
@@ -725,7 +735,9 @@
 								_this.checkboxValue1 = ['不限']
 							}
 						})
-
+						uni.switchTab({
+							url: '/pages/order/index'
+						})
 					})
 					.catch(res => {
 						uni.showToast({
@@ -734,7 +746,7 @@
 							duration: 2000
 						})
 					});
-
+				
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -777,8 +789,6 @@
 								.unsendLongitude, this.dataObj.sendLatitude, this.dataObj.sendLongitude)
 						}
 						uni.hideLoading()
-
-
 					})
 					.catch(res => {
 						uni.showToast({
@@ -831,9 +841,9 @@
 				// uni.removeStorage({
 				// 	key: 'storage_faddress'
 				// });
-				uni.removeStorage({
-					key: 'storage_saddress'
-				});
+				// uni.removeStorage({
+				// 	key: 'storage_saddress'
+				// });
 				uni.$u.route('/pages/release/selectAddress', {
 					type: type,
 				});
@@ -904,7 +914,7 @@
 			},
 			back() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
 			goToRecord() {
@@ -915,19 +925,17 @@
 			},
 			submit() {
 				if (this.validate()) return
-				if(this.dataObj.cargoOwner == '个人货主'){
+				if (this.dataObj.cargoOwner == '个人货主') {
 					this.dataObj.compId == ""
-				}else{
-					for(let i = 0;i<this.qyList.length;i++){
-						if(this.dataObj.cargoOwner == this.qyList[i].companyName){
+				} else {
+					for (let i = 0; i < this.qyList.length; i++) {
+						if (this.dataObj.cargoOwner == this.qyList[i].companyName) {
 							this.dataObj.compId = this.qyList[i].id
 							break
 						}
 					}
 				}
 				this.isShowAlert = true;
-
-
 			},
 		}
 	}

pages/release/selectAddress.vue

@@ -101,7 +101,10 @@
 				} else {
 					uni.setStorageSync('storage_saddress', val);
 				}
-				uni.$u.route('/pages/release/release');
+				// uni.$u.route('/pages/release/release');
+				uni.navigateBack({
+					delta:1
+				})
 			},
 			getList() {
 				uni.showLoading({