1

pages/mine/company/addcompany.vue

@@ -70,11 +70,19 @@
 			<view 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="输入联系电话" maxlength="15" inputAlign='left' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
 			</view>
+			<view 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"
+						v-model="dataDetails.mailingAddress">
+					</u--input>
+				</view>
+			</view>
 			<view 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>
@@ -96,7 +104,7 @@
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left-text">身份证号</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入身份证号" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入身份证号" maxlength="18" inputAlign='left' border="none"
 						v-model="dataDetails.cardNumber">
 					</u--input>
 				</view>
@@ -463,6 +471,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.mailingAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "通讯地址不能为空！",
+					})
+					return true
+				}
 				// if (uni.$u.test.isEmpty(this.dataDetails.registeredPaidAmount)) {
 				// 	this.$refs.uToast.show({
 				// 		type: 'error',
@@ -791,6 +806,10 @@
 	/deep/uni-image.uploadimage-small {
 		width: 100% !important;
 	}
+	.title {
+		color: #333333;
+		margin: 20rpx 0;
+	}
 
 	.next {
 		color: #2772FB;
@@ -896,10 +915,7 @@
 			height: 100rpx;
 		}
 
-		.title {
-			color: #333333;
-			margin: 20rpx 0;
-		}
+		
 	}
 
 	.content2,

pages/mine/company/editcompany.vue

@@ -61,7 +61,7 @@
 			<view 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="输入联系电话" maxlength="15" inputAlign='left' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
@@ -87,7 +87,7 @@
 				<view 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="输入身份证号" maxlength="18" inputAlign='left' border="none"
 							v-model="dataDetails.cardNumber">
 						</u--input>
 					</view>
@@ -312,7 +312,7 @@
 						success: function (res) {
 							if (res.confirm) {
 								permision.gotoAppPermissionSetting()
-									            // plus.runtime.openURL("app-settings:");
+								// plus.runtime.openURL("app-settings:");
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}

pages/mine/index.vue

@@ -36,7 +36,7 @@
 			<view class='flex operate flex-space-around'>
 				<view class='flex items-center' @click="toMyRelease">
 					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodefabu.png"
-						width="42px" height="42px"></u--image>我发布的
+						width="42px" height="42px"></u--image>我的发布
 				</view>
 				<view class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
 					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/pingjia.png"

pages/order/driverDetail.vue

@@ -171,7 +171,7 @@
 			this.show = true
 		},
 		onLoad(options) {
-			// this.dataObj =JSON.parse(options.driver) 
+			this.dataObj =JSON.parse(options.driver) 
 			// console.log(this.dataObj)
 			that = this
 			// this.getList()
@@ -229,7 +229,7 @@
 			upCallback(page) {
 				var that =this
 				that.$request.baseRequest('get', '/driverInfo/getDriver', {
-						commonId:'2939c4c23ca14e4ab6f16d7a6b3f8d5e'
+						commonId:this.dataObj.commonId
 					}).then(res => {
 						console.log(res.data)
 						that.driverList=res.data

pages/order/index.vue

@@ -483,6 +483,7 @@
 				// } else {
 				// 	this.isShowTerminationReason = true
 				// }
+					this.alertTitle = '确定终止订单？'
 				this.id = item.id
 				this.isShowAlert = true
 			},

pages/release/release.vue

@@ -20,8 +20,8 @@
 		</view> -->
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
-				<view class="left select-sf">{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
-				<view class="right">></view>
+				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
+				<view class="right"><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
 			</view>
 			<!-- 		<view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
 				<view class="left">{{dataObj.cargoOwner}}</view>
@@ -67,8 +67,9 @@
 		<view class="content3">
 			<view class="row">
 				<view class="left">距离</view>
-				<input type="text" value="" class="input" placeholder="自动计算" v-model="dataObj.distance" disabled="" />
-				<view>Km</view>
+				<!-- <input type="text" value="" class="input" placeholder="自动计算" v-model="dataObj.distance" disabled /> -->
+				{{dataObj.distance }}
+				km
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
@@ -1036,6 +1037,11 @@
 		padding: 40rpx;
 
 		.select-sf {
+			color: #171717;
+			font-size: 34rpx;
+			font-weight: 600;
+		}
+		.select-sf1 {
 			color: #999999;
 		}