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

components/master-keyboard/master-keyboard.vue

@@ -104,6 +104,10 @@
 				type: String,
 				default: 'number' // number=数字键盘 digit=带小数点的数字键盘  idcard=身份证号键盘  car=车牌号键盘
 			},
+			guastatus:{
+				type: Boolean,
+				default: false
+			},
 			defaultValue: {
 				type: String,
 				default: ''
@@ -222,24 +226,43 @@
 						return
 					}
 				} else {
-					if (value.length === (this.$props.newCar ? 7 : 6) && pattern.test(keyValue) && this
-						.formatCarProvinceFirst(keyValue) == -1) {
-						return
-					}
-					if (pattern.test(keyValue) && value.length !== (this.$props.newCar ? 7 : 6)) {
-						return
+					if(this.$props.guastatus){
+						if (value.length ===  5 && pattern.test(keyValue) && this
+							.formatCarProvinceFirst(keyValue) == -1) {
+							return
+						}
+						if (pattern.test(keyValue) && value.length !== 5) {
+							return
+						}
+					}else{
+						if (value.length === (this.$props.newCar ? 7 : 6) && pattern.test(keyValue) && this
+							.formatCarProvinceFirst(keyValue) == -1) {
+							return
+						}
+						if (pattern.test(keyValue) && value.length !== (this.$props.newCar ? 7 : 6)) {
+							return
+						}
 					}
+					
 				}
-
-				if (value.length < 7 && !this.$props.newCar) {
-					this.$emit('keyboardClick', {
-						value: value + keyValue
-					})
+				if(this.$props.guastatus){
+					if (value.length < 6 ) {
+						this.$emit('keyboardClick', {
+							value: value + keyValue
+						})
+					}
 				}
-				if (value.length < 8 && this.$props.newCar) {
-					this.$emit('keyboardClick', {
-						value: value + keyValue
-					})
+				else{
+					if (value.length < 7 && !this.$props.newCar) {
+						this.$emit('keyboardClick', {
+							value: value + keyValue
+						})
+					}
+					if (value.length < 8 && this.$props.newCar) {
+						this.$emit('keyboardClick', {
+							value: value + keyValue
+						})
+					}
 				}
 			},
 			//车牌键盘删除事件

pages.json

@@ -356,6 +356,7 @@
 		}, {
 			"path": "pages/mine/manageVehicles/index",
 			"style": {
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "管理车辆",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "white",

pages/mine/driverCertification.vue

@@ -237,7 +237,7 @@
 				<view class="flex row noborder">
 					<view class="left-text">收款人</view>
 					<view class="flex">
-						<u--input placeholder="输入收款人姓名" inputAlign='left' border="none" v-model="item.payeeName">
+						<u--input disabled placeholder="输入收款人姓名" inputAlign='left' border="none" v-model="item.payeeName">
 						</u--input>
 					</view>
 				</view>
@@ -734,6 +734,7 @@
 			},
 			// 上传图片
 			imgTypeSelect() {
+				var _this=this
 				// console.log(val)
 					uni.chooseImage({
 						count: 1,
@@ -765,6 +766,7 @@
 																	_this.dataDetails.hyDriverPayeeInfoList[i]
 																		.payeeName = res.data.recPerson
 																}
+																console.log()
 															}
 															_this.dataDetails.driverBirthday=res.data.recPersonBrithday
 														}

pages/mine/driverCertificationNext.vue

@@ -697,6 +697,13 @@
 					})
 					return true
 				}
+				if (!uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "从业资格证号输入错误！",
+					})
+					return true
+				}
 				// if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
@@ -780,7 +787,6 @@
 						}else{
 							uni.$u.toast(res.message);
 						}
-
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);

pages/mine/editDriverCertificationNext.vue

@@ -645,6 +645,20 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.qualificationCertificateNumber)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "从业资格证号不能为空！",
+					})
+					return true
+				}
+				if (uni.$u.test.rangeLength(this.dataDetails.qualificationCertificateNumber,[12,19])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "从业资格证号输入错误！",
+					})
+					return true
+				}
 				// if (uni.$u.test.isEmpty(this.dataDetails.operationCertificate)) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',

pages/mine/manageVehicles/addVehicle.vue

@@ -163,7 +163,7 @@
 					<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 				</view>
 			</view>
-			<view class="flex row" v-if="sign == '挂车'">
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证档案编号</view>
 				<u--input placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
 					v-model="dataDetails.trailerLicenseNumber">
@@ -215,23 +215,23 @@
 						:disabled="true" placeholder="输入车牌号" name="input"></input>
 				</view>
 			</view>
-			<view class="flex row">
+			<view class="flex row flex-space-between">
 				<view class="left-text">车牌颜色</view>
-				<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-				<view>></view>
-				<u-picker :show="carColor" :columns="colorColumns" :closeOnClickOverlay='true' @close='colorClose'
-					@cancel='colorClose' @confirm='confirmColor' @change="changeCarModel"></u-picker>
+				<view class='flex'>
+					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
+					<view>></view>	
+				</view>
 			</view>
 
 			<view class="flex row">
 				<view class="left-text">车辆所属车主</view>
-				<input placeholder="输入车主姓名" v-model="dataDetails.owner" type="text">
+				<input style='text-align:right;' placeholder="输入车主姓名" v-model="dataDetails.owner" type="text">
 				<!-- <u--input inputAlign='left' border="none"> -->
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
 				<view class="left-text">总质量（千克）</view>
-				<u--input type='number' placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
+				<u--input type='number' placeholder="输入总质量" inputAlign='right' border="none" v-model="dataDetails.carTotalWeight">
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
@@ -241,7 +241,7 @@
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">整备质量（千克）</view>
-				<u--input type='number' placeholder="输入整备质量" inputAlign='left' border="none" v-model="dataDetails.servicingWeight">
+				<u--input type='number' placeholder="输入整备质量" inputAlign='right' border="none" v-model="dataDetails.servicingWeight">
 				</u--input>
 			</view>
 			<view class="flex row noborder" v-if="sign == '挂车'">
@@ -298,23 +298,24 @@
 						<input class="car-uumber" v-model='dataDetails.guaCarNumber'
 							@click.stop="handleShowKeyboard1(index)" :disabled="true" placeholder-class= "phsy" placeholder="输入挂车牌号"
 							name="input"></input>
+							挂
 					</view>
 				</view>
 
 				<view class="flex row">
 					<view class="left-text">车辆所属车主</view>
-					<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.guaOwner">
+					<u--input placeholder="输入车主姓名" inputAlign='right' border="none" v-model="dataDetails.guaOwner">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">整备质量（千克）</view>
-					<u--input type='number' placeholder="输入整备质量" inputAlign='left' border="none"
+					<u--input type='number' placeholder="输入整备质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaServicingWeight">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">核定载质量（千克）</view>
-					<u--input type='number' placeholder="输入核定载质量" inputAlign='left' border="none"
+					<u--input type='number' placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
 				</view>
@@ -361,12 +362,14 @@
 		
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
-		<master-keyboard ref="keyboard1" keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
+		<master-keyboard ref="keyboard1" :guastatus='true' keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber1" @keyboardClick="handleClick1"></master-keyboard>
 		<u-toast ref="uToast"></u-toast>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
+		<u-picker :show="carColor" :columns="colorColumns" :closeOnClickOverlay='true' @close='colorClose'
+			@cancel='colorClose' @confirm='confirmColor' ></u-picker>
 		<u-picker :show="isShowValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
 		</u-picker>
@@ -1299,6 +1302,9 @@
 				if(this.dataDetails.carCategory == "非挂车"){
 					delete this.dataDetails.guaUseNature
 				}
+				if(this.dataDetails.carCategory == "挂车"){
+					this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+				}
 				this.$request.baseRequest('post', '/driverCarInfo/api/addInfo', this.dataDetails).then(res => {
 						if (res.code == '200') {
 							this.$refs.uToast.show({
@@ -1495,7 +1501,9 @@
 		color: #6A7282;
 	}
 	.submit-btn-wrap{
+		
 		position: fixed;
+		z-index:1000;
 		bottom:0;left:0;
 		width:100%;
 		padding:40rpx 0;
@@ -1527,4 +1535,7 @@
 			// font-size: 20px !important;
 			color: #999 !important
 		}
+	.car-uumber{
+		text-align:right;
+	}
 </style>

pages/mine/manageVehicles/editVehicle.vue

@@ -125,7 +125,7 @@
 				<u--input placeholder="输入发证机关" inputAlign='right' border="none" maxlength="25" v-model="dataDetails.lssuingAuthority">
 				</u--input>
 			</view>
-			<view class="flex row noborder">
+			<view class="flex row noborder flex-space-between">
 				<view class="left-text">车辆能源类型</view>
 				<view class="" @click="driveType">
 					{{dataDetails.energyType?dataDetails.energyType:'选择车辆能源类型>'}}
@@ -215,22 +215,24 @@
 						:disabled="true" placeholder="输入车牌号" name="input"></input>
 				</view>
 			</view>
-			<view class="flex row">
+			<view class="flex row flex-space-between">
 				<view class="left-text">车牌颜色</view>
-				<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
-				<view>></view>
-				<u-picker :show="carColor" :columns="colorColumns" :closeOnClickOverlay='true' @close='colorClose'
-					@cancel='colorClose' @confirm='confirmColor' @change="changeCarModel"></u-picker>
+				<view class='flex'>
+					<view class="color" @click="selectNoColor">{{dataDetails.carNumberColour}}</view>
+					<view>></view>
+				</view>
+				
+				
 			</view>
 
 			<view class="flex row">
 				<view class="left-text">车辆所属车主</view>
-				<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.owner">
+				<u--input placeholder="输入车主姓名" inputAlign='right' border="none" v-model="dataDetails.owner">
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
 				<view class="left-text">总质量（千克）</view>
-				<u--input placeholder="输入总质量" inputAlign='left' border="none" v-model="dataDetails.carTotalWeight">
+				<u--input placeholder="输入总质量" inputAlign='right' border="none" v-model="dataDetails.carTotalWeight">
 				</u--input>
 			</view>
 			<view class="flex row" v-if="sign == '非挂车'">
@@ -240,7 +242,7 @@
 			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view class="left-text">整备质量（千克）</view>
-				<u--input placeholder="输入整备质量" inputAlign='left' border="none" v-model="dataDetails.servicingWeight">
+				<u--input placeholder="输入整备质量" inputAlign='right' border="none" v-model="dataDetails.servicingWeight">
 				</u--input>
 			</view>
 			<view class="flex row noborder" v-if="sign == '挂车'">
@@ -290,26 +292,27 @@
 				<view class="flex row">
 					<view class="left left-text">挂车车牌号</view>
 					<view class="right flex">
-						<input class="car-uumber" v-model='dataDetails.guaCarNumber'
+						<input class="car-uumber" maxlength="6" v-model='dataDetails.guaCarNumber'
 							@click.stop="handleShowKeyboard1(index)" :disabled="true" placeholder="输入挂车牌号"
 							name="input"></input>
+							挂
 					</view>
 				</view>
 
 				<view class="flex row">
 					<view class="left-text">车辆所属车主</view>
-					<u--input placeholder="输入车主姓名" inputAlign='left' border="none" v-model="dataDetails.guaOwner">
+					<u--input placeholder="输入车主姓名" inputAlign='right' border="none" v-model="dataDetails.guaOwner">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">整备质量（千克）</view>
-					<u--input placeholder="输入总质量" inputAlign='left' border="none"
+					<u--input placeholder="输入总质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaServicingWeight">
 					</u--input>
 				</view>
 				<view class="flex row">
 					<view class="left-text">核定载质量（千克）</view>
-					<u--input placeholder="输入核定载质量" inputAlign='left' border="none"
+					<u--input placeholder="输入核定载质量" inputAlign='right' border="none"
 						v-model="dataDetails.guaCarApprovedWeight">
 					</u--input>
 				</view>
@@ -355,12 +358,14 @@
 		</view>
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
-		<master-keyboard ref="keyboard1" keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
+		<master-keyboard ref="keyboard1" :guastatus='true' keyboardtype="car" :show="keyShow1" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber1" @keyboardClick="handleClick1"></master-keyboard>
 		<u-toast ref="uToast"></u-toast>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>
+		<u-picker :show="carColor" :columns="colorColumns" :closeOnClickOverlay='true' @close='colorClose'
+			@cancel='colorClose' @confirm='confirmColor' ></u-picker>
 		<u-picker :show="isShowValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
 		</u-picker>
@@ -434,6 +439,9 @@
 		onLoad(options) {
 			_this = this;
 			console.log(options)
+			if(options.guaCarNumber){
+				options.guaCarNumber=options.guaCarNumber.substring(0,6);
+			}
 			this.dataDetails = options
 			this.sign = options.carCategory
 			// if (this.dataDetails.carType.indexOf("挂车") != -1) {
@@ -1263,6 +1271,9 @@
 			},
 			submit() {
 					if (this.validate()) return
+					if(this.dataDetails.carCategory == "挂车"){
+						this.dataDetails.guaCarNumber=this.dataDetails.guaCarNumber+'挂'
+					}
 				this.$request.baseRequest('post', '/driverCarInfo/api/editInfo', this.dataDetails).then(res => {
 						if (res.code == '200') {
 							this.$refs.uToast.show({
@@ -1462,6 +1473,7 @@
 		width:100%;
 		padding:40rpx 0;
 		background:#fff;
+		z-index:1000;
 	}
 	.submit-btn {
 		bottom: 40rpx;
@@ -1485,4 +1497,7 @@
 	/deep/.uni-input-input:disabled{
 		background:#fff;
 	}
+	.car-uumber{
+		text-align:right;
+	}
 </style>

pages/mine/manageVehicles/index.vue

@@ -1,6 +1,8 @@
 <!-- 管理车辆 -->
 <template>
 	<view class="content">
+		<u-navbar title="管理车辆" :placeholder='true' @leftClick="leftClick">
+			</u-navbar>
 		<view class="top-title flex flex-space-between">
 			<view class="left flex">
 				<view class="text1">我的机动车</view>
@@ -87,6 +89,9 @@
 			console.log(options)
 		},
 		methods: {
+			leftClick(){
+				uni.switchTab({url:'/pages/mine/index'});
+			},
 			confirmClick() {
 				this.isShowAlert = false
 				this.$request.baseRequest('post', '/driverCarInfo/api/deleteDriverCar', {

pages/order/confirmUnloading.vue

@@ -141,7 +141,6 @@
 				this.$set(this.detailData,'totalFreight',String(this.detailData.freight))
 				// this.detailData.totalFreight=String(this.detailData.freight)
 			}
-			
 			this.detailData.carrierInfo = {
 				// unloadingDate: '',
 				// estimatedFreight: '',
@@ -213,8 +212,6 @@
 				// 			this.$forceUpdate()
 			
 				// 		}
-			
-			
 				// 		this.$helper.fUN_AmapLocation.stop({}, result => {
 				// 				uni.hideLoading()
 				// 			console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
@@ -458,7 +455,7 @@
 				if (m < 10) {
 					m = "0" + m
 				}
-				if(this.detailData.carrierInfo.unloadingDate){//卸车时间   去当前时间的时分秒
+				if(this.detailData.carrierInfo.unloadingDate){//卸车时间 去当前时间的时分秒
 					this.detailData.carrierInfo.unloadingDate= this.detailData.carrierInfo.unloadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m
 				}
 				// this.detailData.carrierInfo.totalFreight = this.detailData.totalFreight
@@ -485,8 +482,6 @@
 											console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
 										});
 									}
-									
-									
 								}
 							})
 						}

pages/order/index.vue

@@ -399,12 +399,13 @@
 			},
 			toggle(item){
 				this.id = item.id
-				if(item.orderStatus=='未装车'){
-					if (item.orderStatusKey == 1) {
+				if (item.orderStatusKey == 1) {
 						this.isShowTerminationReason = false
 					} else {
 						this.isShowTerminationReason = true
 					}
+				if(item.orderStatus=='未装车'){
+					
 					
 					this.show = true
 				}else{

pages/order/orderDetails.vue

@@ -7,7 +7,7 @@
 				<image class="back"  src="../../static/images/return.png" @click="back" mode="" style="width: 40rpx; height: 40rpx;"></image>
 <!-- 				<u-icon class="back" name="arrow-left" color="" size="20" ></u-icon> -->
 				<view class="nav-title">订单</view>
-				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService" mode=""></image>
+				<image class="search" style='width:18px;height:18px;' src="../../static/images/kefu.png" @click="$helper.contactCustomerService()" mode=""></image>
 				<!-- <u-icon class="search" name="server-fill" color="" size="28" @click="$helper.contactCustomerService"></u-icon> -->
 			</view>
 		</view>
@@ -118,19 +118,16 @@
 				<view class=" gray">距离</view>
 				<view class="">约{{dataObj.distance}}公里</view>
 			</view>
-			<view class='row-between'>
+			<view v-if='dataObj.publishTaskInfo' class='row-between'>
 				<view class=" gray">收货联系人</view>
 				<view class="flex flex-center">{{dataObj.publishTaskInfo.sender?dataObj.publishTaskInfo.sender:''}}
 				<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.senderPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.senderPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
-				<!-- <u-icon name="phone-fill" color="#2772FB" size="20"></u-icon> -->
 				</view>
-			</view>
-			<view class='row-between'>
+			</view> 
+			<view v-if='dataObj.publishTaskInfo' class='row-between'>
 				<view class=" gray">发货联系人</view>
 				<view class="flex flex-center">{{dataObj.publishTaskInfo.receiver?dataObj.publishTaskInfo.receiver:''}}
 				<image style='width:12px;height:12px;margin-left:5px;' v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)" src="../../static/images/order/dianhua.png" mode=""></image>
-				<!-- <u-icon v-if='dataObj.publishTaskInfo.receiverPhone' class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.publishTaskInfo.receiverPhone)"></u-icon> -->
-				</view>
 			</view>
 		<!-- 	<view class='row-between'>
 				<view class=" gray">运费</view>
@@ -205,7 +202,7 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick" class="modal">
 			<u-radio-group v-model="radiovalue1" placement="" v-if='isShowTerminationReason' class='row'>
 				<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
@@ -244,6 +241,7 @@
 			@cancel="moneyclose"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -266,6 +264,7 @@
 				status1:false,
 				status2:false,
 				id: '',
+				showCancelButton:true,
 				value2: '',
 				radiolist1: [{
 						name: '已与货主协商',
@@ -301,6 +300,13 @@
 			this.getList()
 		},
 		methods: {
+			open() {
+			          // console.log('open');
+			},
+			close() {
+				this.show = false
+			          // console.log('close');
+			},
 			moneyclose(){
 				this.moneyShow=false
 			},
@@ -424,9 +430,30 @@
 					});
 			},
 			confirmLoading() {
-				uni.$u.route('/pages/order/confirmLoading', {
-					obj: JSON.stringify({id:this.id,carrierId:this.dataObj.hyCarrierInfo.id}),
-				});
+				var that = this
+				this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
+						commonId: uni.getStorageSync('userInfo').id,
+						searchType:2
+					}).then(res => {
+						if (res.code == '200') {
+							if(res.data&&res.data.length>0){
+								uni.$u.route('/pages/order/confirmLoading', {
+									obj: JSON.stringify({id:that.id,carrierId:that.dataObj.hyCarrierInfo.id}),
+								});
+							}else{
+								that.alertTitle = '尚未添加车辆！'
+								that.showCancelButton = false
+								that.confirmText = '立即添加'
+								that.isShowAlert = true
+							}
+						} else {
+							uni.$u.toast(res.message);
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+				
 				// uni.$u.route('/pages/order/confirmLoading', {id:this.id});
 			},
 			confirmUnLoading() {
@@ -434,44 +461,48 @@
 				uni.$u.route('/pages/order/confirmUnloading', {obj:JSON.stringify(item)});
 			},
 			confirmClick() {
-				let  that = this
-				if (this.radiovalue1 == '其他' && !this.value2) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "请填写终止原因描述!",
-					})
-					return
-				}
-				let _terminationReason = ''
-				if (this.radiovalue1 == '已与货主协商') {
-					_terminationReason = 1
-				} else if (this.radiovalue1 == '货主原因终止') {
-					_terminationReason = 2
-				} else if (this.radiovalue1 == '司机个人原因终止') {
-					_terminationReason = 3
-				} else if (this.radiovalue1 == '其他') {
-					_terminationReason = 4
-				}
-				this.$request.baseRequest('post', '/orderInfo/api/end', {
-						id: this.id,
-						terminationReason: _terminationReason,
-						terminationReasonDescription: this.value2,
-						terminator:1
-					}).then(res => {
-						this.show=false
-						this.isShowAlert = false
-						// this.mescroll.resetUpScroll()
+				if(this.alertTitle == '尚未添加车辆！'){
+					uni.$u.route('/pages/mine/manageVehicles/index');
+				}else{
+					let  that = this
+					if (this.radiovalue1 == '其他' && !this.value2) {
 						this.$refs.uToast.show({
-							type: 'success',
-							message: "提交成功！",
-							complete() {
-								that.getList()
-							}
+							type: 'error',
+							message: "请填写终止原因描述!",
 						})
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+						return
+					}
+					let _terminationReason = ''
+					if (this.radiovalue1 == '已与货主协商') {
+						_terminationReason = 1
+					} else if (this.radiovalue1 == '货主原因终止') {
+						_terminationReason = 2
+					} else if (this.radiovalue1 == '司机个人原因终止') {
+						_terminationReason = 3
+					} else if (this.radiovalue1 == '其他') {
+						_terminationReason = 4
+					}
+					this.$request.baseRequest('post', '/orderInfo/api/end', {
+							id: this.id,
+							terminationReason: _terminationReason,
+							terminationReasonDescription: this.value2,
+							terminator:1
+						}).then(res => {
+							this.show=false
+							this.isShowAlert = false
+							// this.mescroll.resetUpScroll()
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功！",
+								complete() {
+									that.getList()
+								}
+							})
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
+				}
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -480,12 +511,13 @@
 				let item = this.dataObj
 				// 货主接单
 				this.id = item.id
-				if(item.orderStatus=='未装车'){
-					if (item.orderStatusKey == 1) {
+				if (item.orderStatusKey == 1) {
 						this.isShowTerminationReason = false
 					} else {
 						this.isShowTerminationReason = true
 					}
+				if(item.orderStatus=='未装车'){
+					
 					
 					this.show = true
 				}else{

pages/order/signContract.vue

@@ -129,8 +129,8 @@
 				</view>
 			</view>
 			<view class='row-between'>
-				<view class="gray">收款账户</view>
-				<view class="" @click="collection">
+				<view style='width:200px;' class="gray">收款账户</view>
+				<view style='word-wrap:break-word;word-break:normal;' class="" @click="collection">
 					{{dataDetails.bankDeposit?dataDetails.bankDeposit:"请选择收款账户"}}
 					(尾号{{dataDetails.bankCard?dataDetails.bankCard.substring(dataDetails.bankCard.length - 4):""}})
 				</view>

util/request.js

@@ -44,12 +44,13 @@ const baseRequest = (method, url, data, header) => {
 							if (res[1].data.code == '200' || res[1].data.code == 200) {
 								resolve(res[1].data)
 							}else{
-								uni.$u.toast(res[1].data.message);
-								uni.showToast({
-										icon:'none',
-									    title: res[1].data.message,
-									    duration: 2000 
-									}); 
+								resolve(res[1].data)
+								// uni.$u.toast(res[1].data.message);
+								// uni.showToast({
+								// 		icon:'none',
+								// 	    title: res[1].data.message,
+								// 	    duration: 2000 
+								// 	}); 
 							}
 						} else {
 							reject(response)