Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-huozhuapp

pages.json

@@ -140,7 +140,15 @@
 				"navigationBarTextStyle": "white"
 			}
 
-		}, {
+		},
+		{
+			"path": "pages/order/confirmLoading",
+			"style": {
+				"navigationBarTitleText": "确认装车",
+				"enablePullDownRefresh": false
+			}
+		
+		},{
 			"path": "pages/order/confirmUnloading",
 			"style": {
 				"navigationBarTitleText": "确认卸车",

pages/mine/cargoowner/editpersonalinformation.vue

@@ -1,6 +1,38 @@
 <template>
 	<view class="content">
 		<view class='content1'>
+			
+			<view class="title">上传身份证人像面</view>
+			<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
+				<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
+				<view class="text">上传身份证人像面</view>
+			</view>
+			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,index)" class="preview-card-img picture">
+				<view @click.stop="delCard(1)">
+					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+					</image>
+				</view>
+				<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
+			</view>
+			
+			<view class="title">上传身份证国徽面</view>
+			<view @click="uploadImg(2,index)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
+				<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
+				<view class="text">上传身份证国徽面</view>
+			</view>
+			
+			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,index)"
+				class="preview-card-img picture">
+				<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
+				<view @click.stop="delCard(2)">
+					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+					</image>
+				</view>
+			
+				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
+			</view>
+		</view>
+		<view class="content2 content-other">
 			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex width100">
 				<view style='width:100px;font-size:14px;'>姓名</view>
 				<view class="flex">
@@ -31,37 +63,6 @@
 				</u--input>
 				<view class="flex align-center" >{{sexText}}</view>
 			</view>
-		</view>
-		<view class="content2 content-other">
-			<view class="title">上传身份证人像面</view>
-			<view @click.stop="uploadImg(1,index)" class="picture picture1" v-if="!dataDetails.cardAddressUrl">
-				<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
-				<view class="text">上传身份证人像面</view>
-			</view>
-			<view v-if="dataDetails.cardAddressUrl" @click.stop="uploadImg(1,index)" class="preview-card-img picture">
-				<view @click.stop="delCard(1)">
-					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
-					</image>
-				</view>
-				<image class="" :src="dataDetails.cardAddressUrl" mode="aspectFit" style=""></image>
-			</view>
-
-			<view class="title">上传身份证国徽面</view>
-			<view @click="uploadImg(2,index)" class="picture picture2" v-if="!dataDetails.cardBackAddressUrl">
-				<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
-				<view class="text">上传身份证国徽面</view>
-			</view>
-
-			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(2,index)"
-				class="preview-card-img picture">
-				<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
-				<view @click.stop="delCard(2)">
-					<image class='del-card' src="@/static/images/common/quxiao@2x.png">
-					</image>
-				</view>
-
-				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
-			</view>
 
 			<view class="flex row">
 				<view class="left-text">身份证号</view>
@@ -191,8 +192,6 @@
 			},
 			//设置图片
 			setImage(e) {
-				// 
-				console.log(e);
 				//显示在页面
 				//this.imagesrc = e.path;
 				if (e.dotype == 'idphoto') {
@@ -246,7 +245,6 @@
 				// }
 			},
 			confirmValidityPeriod(e) {
-				console.log('confirm', e)
 				if (e.value[0] == '长期') {
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
@@ -327,7 +325,6 @@
 				uni.chooseImage({
 					count: 1,
 					success: function(res) {
-						console.log(JSON.stringify(res.tempFilePaths));
 						uploadImage('image',res.tempFilePaths[0], 'appData/',
 							result => {
 								// 上传成功
@@ -341,8 +338,6 @@
 
 			imgTypeSelect(val) {
 				let that = this
-				console.log(val)
-				console.log(this.uploadType)
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
@@ -364,6 +359,16 @@
 														personImg: result,
 													}).then(res => {
 													that.dataDetails.cardNumber = res.data.recPersonNo
+													//性别设置默认
+													let i = res.data.recPersonNo.substr(16,1)
+													if(i%2 == 0){
+														that.dataDetails.sex = "女" 
+														that.sexText = "女士"
+													}else{
+														that.dataDetails.sex = "男" 
+														that.sexText = "先生"
+													}
+													
 													if (!that.dataDetails.name) {
 														that.dataDetails.name = res.data.recPerson
 													}
@@ -509,41 +514,26 @@
 			height: 80rpx;
 		}
 
-		.picture {
-			width: 100%;
-			height: 440rpx;
-			position: relative;
-			.text {
-				margin-top: 20rpx;
-			}
-		}
-
-		.picture1 {
-			background: url(../../../static/mine/zm.png);
-			background-size: 100% 100%;
-		}
-
-		.picture2 {
-			background: url(../../../static/mine/gh.png);
-			background-size: 100% 100%;
-		}
-
-		.picture3 {
-			background: url(../../../static/mine/yhkzm.png);
-			background-size: 100% 100%;
-		}
-
-		.xj-image {
-			width: 100rpx;
-			height: 100rpx;
-		}
-
-		.title {
-			color: #999999;
-			margin: 20rpx 0;
-			font-size: 14px;
+			
+	}
+	.picture {
+		width: 100%;
+		height: 440rpx;
+		position: relative;
+		.text {
+			margin-top: 20rpx;
 		}
 	}
+	.xj-image {
+		width: 100rpx;
+		height: 100rpx;
+	}
+	
+	.title {
+		color: #999999;
+		margin: 20rpx 0;
+		font-size: 14px;
+	}
 
 	.u-input {
 		font-size: 16px;
@@ -591,4 +581,18 @@
 	.bz{
 		font-size: 28rpx;
 	}
+	.picture1 {
+		background: url(../../../static/mine/zm.png);
+		background-size: 100% 100%;
+	}
+	
+	.picture2 {
+		background: url(../../../static/mine/gh.png);
+		background-size: 100% 100%;
+	}
+	
+	.picture3 {
+		background: url(../../../static/mine/yhkzm.png);
+		background-size: 100% 100%;
+	}
 </style>

pages/mine/company/addcompany.vue

@@ -434,13 +434,13 @@
 						return true
 					}
 				}
-				if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "视频认证不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.dataDetails.videoAddressUrl)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "视频认证不能为空！",
+				// 	})
+				// 	return true
+				// }
 			},
 			submit() {
 				if (this.validate()) return

pages/mine/index.vue

@@ -15,7 +15,7 @@
 						height="56px"></u--image>
 					<view class='information' v-if='hasLogin'>
 						<view class='flex items-center'>
-							<view class='username'>{{userName}}</view>
+							<view class='username'>{{userName}}  {{cargoCall}}</view>
 							<view v-if='status' class='currectstatus'>已认证</view>
 							<view v-if='!status' class='currectstatus1'>未认证</view>
 						</view>
@@ -32,7 +32,7 @@
 					</view>
 				</view>
 			</view>
-			
+
 			<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"
@@ -94,7 +94,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view>
-			
+
 				<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/manageBankCards/index')">
 					<view class='flex items-center'>
@@ -105,7 +105,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view>
-		<!-- 		<view class="flex flex-space-between content1-item"
+				<!-- 		<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/driverEvaluation')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
@@ -149,50 +149,63 @@
 				phone: '',
 				status: false,
 				alertContent: '您尚未登录，是否立即登录？',
+				cargoCall:"先生",
 			};
 		},
 		onShow() {
-			uni.showLoading({
-				title: '加载中',
-				mask: true
-			})
-			this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
-					commonId: this.userInfo.id
-				}).then(res => {
-					uni.hideLoading()
-			
-					if (res.data) {
-						if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回') {
-							this.status = false
+			if (this.hasLogin) {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$request.baseRequest('get', '/cargoOwnerInfo/selectCargoOwner', {
+						commonId: this.userInfo.id
+					}).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回') {
+								this.status = false
+							} else {
+								this.status = true
+							}
+
 						} else {
-							this.status = true
+							this.status = false
 						}
-			
-					} else {
-						this.status = false
-					}
-				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
 					})
-				});
-			// 
-			this.userName = this.userInfo.userName
-			this.phone = this.userInfo.phone.replace(this.userInfo.phone.substring(3, 7), "****")
-			if (!this.hasLogin) {
-				this.isShowAlert = true
-				return
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
+				this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: this.userInfo.phone
+				}).then(res => {
+					uni.setStorageSync("firstAuthentication",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),
+					"****") : ''
+				if (!this.hasLogin) {
+					this.isShowAlert = true
+					return
+				}
 			}
+
 		},
 		onLoad() {
-			
+
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo']),
+			...mapState(['hasLogin', 'userInfo',"firstAuthentication"]),
 			// 手机号中间4位加*
 			// starUserphone() {
 			// 	let reg = /^(\d{3})\d{4}(\d{4})$/;
@@ -203,16 +216,16 @@
 		},
 		methods: {
 			confirmClick() {
-							// #ifdef APP-PLUS
-								if (this.alertTitle == '账号审核中') {
-									if (uni.getSystemInfoSync().platform == 'ios') {
-										plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-									} else if (uni.getSystemInfoSync().platform == 'android') {
-										plus.runtime.quit();
-									}
-									return
-								}
-								// #endif
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
 				this.isShowAlert = false
 				uni.$u.route('/pages/public/login');
 			},

pages/mine/manageBankCards/index.vue

@@ -91,13 +91,26 @@
 			radioChange(val) {
 				for (let i = 0; i < this.bankList.length; i++) {
 					if (val.id == this.bankList[i].id) {
-						this.bankList[i].defaultFlag = 1
+						if(this.bankList[i].defaultFlag == 1){
+							this.bankList[i].defaultFlag = 0
+							this.bankList[i].flag = 2 //取消标志
+						}else{
+							this.bankList[i].defaultFlag = 1
+								this.bankList[i].flag = 1 //设置标志
+						}
 						this.$request.baseRequest('post', '/hyCargoOwnerPayeeInfo/api/setDefault', val).then(res => {
 								if (res.code == '200') {
-									this.$refs.uToast.show({
-										type: 'success',
-										message: "设置成功！",
-									})
+									if(this.bankList[i].flag == 1){
+										this.$refs.uToast.show({
+											type: 'success',
+											message: "设置成功！",
+										})
+									}else{
+										this.$refs.uToast.show({
+											type: 'success',
+											message: "取消成功！",
+										})
+									}
 								} else {
 									uni.$u.toast(res.message);
 								}

pages/mine/myAccount/bill.vue

@@ -7,7 +7,7 @@
 			<view class="flex row">
 				<view class="left-text">{{item.types}}</view>
 				<view class="flex right-text">
-						{{item.amountMoney}}
+					{{item.amountMoney}}
 				</view>
 			</view>
 			<view class="date_css">
@@ -116,9 +116,18 @@
 				width: 60%;
 				justify-content: flex-end;
 			}
-			.date_css{
+
+			.date_css {
 				text-align: right;
 			}
 		}
 	}
 </style>
+uni.setStorageSync('userInfo', res.data)
+helper.getListByUserId()
+that.$store.commit('login', res.data)
+// that.liangxinLogin()
+uni.switchTab({
+url: '/pages/order/index'
+});
+uni.hideLoading()

pages/mine/settings/editPassword.vue

@@ -130,6 +130,7 @@
 				this.$refs.registerForm.validate().then(res => {
 					uni.$u.toast('校验通过')
 					_this.isLoading = true
+					_this.registerData.identification = 2
 					_this.$request.baseRequest('post', '/commonUser/resetPassword', _this.registerData).then(
 						res => {
 							// 获得数据

pages/order/confirmLoading.vue

@@ -1,86 +1,111 @@
 <!-- 确认装车 -->
 <template>
 	<view class="content">
-		<view class="level1-title">
-			任务信息
-		</view>
-		<view class="content1">
+		<!-- <div class='content1'>
+			<view class="level2-title">承运合同</view>
 			<view class='row-between'>
-				<view class="">货主</view>
-				<view class="flex">
-					<view>张三</view>
-					<view>del</view>
-				</view>
-				
+				<view class="">合同编号</view>
+				<view class="" @click="toSignContract">{{detailData.contractNo?detailData.contractNo:'去签订合同'}}</view>
+			</view>
+		</div> -->
+		<view class="content2">
+			<view class="level2-title">基本信息</view>
+			<view class='row-between'>
+				<view class="">订单编号</view>
+				<view class="">{{detailData.orderNo}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">货主单位</view>
-				<view>黑龙江中天昊元贸易有限公司</view>
+				<view class="">司机</view>
+				<view class="">{{detailData.driverName}}</view>
+			</view>
+			<view class='row-between'>
+				<view class="">发货单位</view>
+				<view class="">{{detailData.compName?detailData.compName:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="">发货地</view>
-				<view>鲅鱼圈</view>
+				<view class=" place">
+					{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}{{detailData.sendDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="">卸货地</view>
-				<view>黑龙江省齐齐哈尔市梅里斯达斡尔族区杜尔门沁达斡尔乡53农场</view>
+				<view class=" place">
+					{{detailData.unloadPrivate}}{{detailData.unloadCity}}{{detailData.unloadArea}}{{detailData.unloadDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="">货名</view>
-				<view>玉米</view>
+				<view class="">{{detailData.goodsName}}</view>
 			</view>
 			<view class='row-between'>
-				<view class="">运费</view>
-				<view>100元/吨</view>
+				<view class="">距离</view>
+				<view class="">{{detailData.distance?detailData.distance:'暂无'}}公里</view>
 			</view>
 		</view>
-		<view class="level1-title">
-			装车信息
-		</view>
 		<view class="content2">
+			<view class="level2-title">承运信息</view>
+			<view class='row-between'>
+				<view class="">合同编号</view>
+				<view class="date-style">
+					{{detailData.contractNo?detailData.contractNo:'暂无'}}
+				</view>
+			</view>
 			<view class='row-between'>
 				<view class="">车牌号</view>
-				<view>辽H12345</view>
+				{{detailData.carNo?detailData.carNo:"来自合同"}}
 			</view>
+
 			<view class='row-between'>
-				<view class="">装车时间</view>
-				<view>2022-02-10 16:13:15</view>
+				<view class="">装车净重（吨）</view>
+				{{detailData.weight ? detailData.weight:"来自合同"}}
 			</view>
 			<view class='row-between'>
-				<view class="">装车净重</view>
+				<view class="">预计运费（元）</view>
+				{{detailData.freight ? detailData.freight:"来自合同"}}
 			</view>
-			<view class='s-flex'>
-				<view class="">上传装车照片</view>
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="3"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+			<view class='row-between'>
+				<view class="">装车日期</view>
+				<view class="date-style">
+					{{detailData.loadingDate?detailData.loadingDate:'来自合同'}}
+				</view>
 			</view>
 			<view class='s-flex'>
-				<view class="">上传装车磅单</view>
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				<view class="" style="margin:20rpx 0;">上传装车照片</view>
+				<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
+					name="1" multiple :maxCount="3"></u-upload>
 			</view>
+
 		</view>
-		<view class="content3 flex">
-			<u-button text="暂存" type="primary" @click="submit(0)"></u-button>
-			<u-button text="提交" type="primary" @click="submit(1)"></u-button>
+		<view class="bottom-btn">
+			<!-- <view class="store" @click="submit(1)">暂存</view> -->
+			<view class="submit" @click="submit(3)">提交</view>
 		</view>
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick"></u-modal>
+		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
+			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
 		<u-toast ref="uToast"></u-toast>
-		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#22C572'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		<u-calendar :show="showDate" :mode="mode" @confirm="confirmDate" @close="showDate= false"></u-calendar>
 	</view>
 </template>
 
 <script>
-	import upload from '@/components/upload.vue';
+	let that;
+	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
-		components: {
-			upload
-		},
 		data() {
 			return {
+				imgList: [],
+				fileList1: [],
+				showDate: false,
+				mode: 'single',
+				id: '',
+				sourceType: ['camera'],
 				detailData: {
-					addressUrl: ''
+					carrierInfo: {},
+					loadingDate: {}
 				},
 				action: this.$helper.ossUploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -88,12 +113,205 @@
 				isShowAlert: false,
 				alertContent: '',
 				alertTitle: '',
+				keyShow: false,
+				carNumber: '',
+				gjList: [],
 			}
 		},
 		onLoad(options) {
+			that = this
+			// #ifdef APP-PLUS
+			// this.getLngLat();
+			// #endif
 			console.log(options)
+			this.id = JSON.parse(decodeURIComponent(options.obj)).id
+			this.getInfo()
+			// this.detailData = JSON.parse(options.obj) ;
+			// console.log(this.detailData)
+			// CYHT20220317000001
 		},
 		methods: {
+			//确认装车提交成功后，开启实时定位，
+			// 调接口5分钟一次发送轨迹,[
+			// 	{latitude: 39.997761, longitude: 116.478935},
+			// 	{latitude: 39.997825, longitude: 116.478939},
+			// 	{latitude: 39.998549, longitude: 116.478912},
+			// 	{latitude: 39.998555, longitude: 116.478998},
+			// 	{latitude: 39.998566, longitude: 116.479282},
+			// 	{latitude: 39.998528, longitude: 116.479658},
+			// 	{latitude: 39.998453, longitude: 116.480151},
+			// 	{latitude: 39.998302, longitude: 116.480784},
+			// 	{latitude: 39.998184, longitude: 116.481149},
+			// 	{latitude: 39.997997, longitude: 116.481573},
+			// 	{latitude: 39.997846, longitude: 116.481863},
+			// 	{latitude: 39.997718, longitude: 116.482072},
+			// 	{latitude: 39.997718, longitude: 116.482362},
+			// 	{latitude: 39.998935, longitude: 116.483633},
+			// 	{latitude: 39.998968, longitude: 116.48367},
+			// 	{latitude: 39.999861, longitude: 116.484648}
+			// ]
+			// a(){},
+			toSignContract() {
+				uni.$u.route('/pages/order/signContract', {
+					obj: JSON.stringify(this.detailData),
+				});
+			},
+			selectDate() {
+				this.showDate = true
+			},
+			confirmDate(e) {
+				this.detailData.carrierInfo.loadingDate = e[0]
+				this.showDate = false
+			},
+			getInfo() {
+				this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
+					id: this.id,
+				}).then(res => {
+					if (res.code == 200) {
+						this.detailData = res.data
+						this.$request.baseRequest('get', '/carrierInfo/getHyCarrierInfo', {
+							orderId: this.detailData.id,
+						}).then(res => {
+							if (res.data) {
+								this.detailData.carNo = res.data.carNo
+								this.detailData.loadingDate = res.data.loadingDate
+								this.detailData.weight = res.data.loadingWeight
+								this.detailData.freight = res.data.estimatedFreight
+							}
+						})
+
+						// this.detailData.contractNo = ''
+						// this.detailData.id = this.detailData.carrierId
+						// this.detailData.carrierInfo.loadingDate = ''
+						// this.detailData.carrierInfo.carNo = ''
+						// this.detailData.carrierInfo.loadingAreaLongitude = ''
+						// this.detailData.carrierInfo.loadingAreaLatitude = ''
+						// this.detailData.carrierInfo.sendCity = '营口'
+						// this.detailData.carrierInfo.sendArea = '鲅鱼圈'
+						// this.detailData.carrierInfo.loadingImg = ''
+						// this.carrierInfo = res.data.carrierInfo
+						// this.freightInfo = res.data.freightInfo
+						// this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
+						// if(res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="已终止"){
+						// 	this.status1 = true
+						// }
+						// if(res.data.orderStatus!="已终止"&&res.data.orderStatus!="平台驳回装车信息"&&res.data.orderStatus!="待平台确认装车"&&res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="待货主确认装车"&&res.data.orderStatus!="货主驳回装车信息"){
+						// 	this.status2 = true
+						// }
+					}
+
+				})
+
+			},
+			//车牌号弹出键盘
+			handleShowKeyboard() {
+				if (this.detailData.carrierInfo.carNo == '') {
+					this.carNumber = ''
+				} else {
+					this.carNumber = this.detailData.carrierInfo.carNo
+				}
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
+				} else {
+					this.$refs.keyboard[0].open(false)
+				}
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(true) //true 键盘显示 false 键盘隐藏
+				} else {
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			//车牌号弹出键盘
+			handleClick(e) {
+				this.carNumber = e.value
+				this.detailData.carrierInfo.carNo = e.value //键盘输入值
+			},
+			// getLngLat() {
+			// 	uni.showLoading({
+			// 		title: '获取定位中',
+			// 		mask: true
+			// 	})
+			// 	this.$helper.fUN_AmapLocation.start({
+			// 			intervalTime: 1000 * 3,
+			// 			isReport: false,
+			// 		},
+			// 		res => {
+			// 			//见下方定位返回示例
+			// 			console.log('====fUN_AmapLocation定位====', JSON.stringify(res));
+			// 			if (res.latitude) {
+			// 				this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
+			// 				this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
+			// 				this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.city)
+			// 				this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.district);
+			// 				console.log(this.detailData.carrierInfo.sendCity)
+			// 				console.log(this.detailData.carrierInfo.sendArea)
+			// 				this.$forceUpdate()
+
+			// 			}
+			// 			uni.hideLoading()
+
+			// 			this.$helper.fUN_AmapLocation.stop({}, result => {
+			// 				console.log('====fUN_AmapLocation定位stop====', JSON.stringify(result));
+			// 			});
+			// 		}
+			// 	);
+			// 	uni.getLocation({
+			// 		type: 'gcj02',
+			// 		geocode: true,
+			// 		success: res => {
+			// 			console.log('定位地址')
+			// 			console.log(res)
+			// 			if (res.latitude) {
+			// 				this.detailData.carrierInfo.loadingAreaLongitude = res.longitude;
+			// 				this.detailData.carrierInfo.loadingAreaLatitude = res.latitude;
+			// 				this.detailData.carrierInfo.sendCity = this.$helper.filterUrban(res.address.city)
+			// 				this.detailData.carrierInfo.sendArea = this.$helper.filterArea(res.address
+			// 					.district);
+			// 				console.log(this.detailData.carrierInfo.sendCity)
+			// 				console.log(this.detailData.carrierInfo.sendArea)
+			// 				this.$forceUpdate()
+			// 				uni.hideLoading()
+			// 			} else {
+			// 				if (uni.getSystemInfoSync().platform == 'android') {
+			// 					var context = plus.android.importClass("android.content.Context");
+			// 					var locationManager = plus.android.importClass(
+			// 						"android.location.LocationManager");
+			// 					var main = plus.android.runtimeMainActivity();
+			// 					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+			// 					this.bool = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)
+			// 				}
+			// 				if (this.bool === false) {
+			// 					uni.showModal({
+			// 						title: '提示',
+			// 						content: '请打开定位服务',
+			// 						success: ({
+			// 							confirm,
+			// 							cancel
+			// 						}) => {
+			// 							if (confirm) {
+			// 								if (uni.getSystemInfoSync().platform == 'android') {
+			// 									var Intent = plus.android.importClass(
+			// 										'android.content.Intent');
+			// 									var Settings = plus.android.importClass(
+			// 										'android.provider.Settings');
+			// 									var intent = new Intent(Settings
+			// 										.ACTION_LOCATION_SOURCE_SETTINGS);
+			// 									var main = plus.android.runtimeMainActivity();
+			// 									main.startActivity(intent); // 打开系统设置GPS服务页面
+			// 								}
+			// 							}
+			// 						}
+			// 					});
+			// 				}
+			// 			}
+			// 		},
+			// 		fail: res => {
+			// 			console.log('定位失败')
+			// 			console.log(res)
+
+			// 		}
+			// 	});
+			// },
 			alertBtn() {
 				// uni.navigateTo({
 				// 	url: '/pages/public/login'
@@ -102,63 +320,171 @@
 			cancelClick() {
 				this.isShowAlert = false
 			},
-			getImgUrl(res) {
-				this.detailData.addressUrl = res
-				console.log(res)
-				console.log('------------res-----------')
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
 			},
-			onError(error) {
-				alert(error)
-				console.log('------------error-----------')
-				console.log(error)
-			},
-			onRemove(index) {},
-			filterFileType(index, lists) {
-				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
-					lists.splice(index, 1);
-					// 当前文件不支持
-					uni.showModal({
-						title: '暂不支持当前图片类型',
-						showCancel: false
-					});
-				} else {
-					this.isAdd = false;
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
 				}
 			},
+			uploadFilePromise(url) {
+				uploadImage('image', url, 'appData/',
+					result => {
+						// 上传成功回调函数
+						console.log('图片地址', result)
+						this.imgList.push(result)
+
+					}
+				)
+			},
 			onProgress(e) {
 				console.log(e)
 			},
 			submit(type) {
-				console.log(type)
-				let params = {
-						type: 'success',
-						title: '成功主题(带图标)',
-						message: "庄生晓梦迷蝴蝶",
-						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
+				if (type == 1) {
+					if (!this.detailData.contractNo) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "合同未签订不能暂存！"
+						})
+						return
 					}
-					if(type==0){
-						
-					}else{
-						this.alertContent='确定提交装车信息？'
-						this.alertTitle='提示'
-						this.isShowAlert = true
-					}
-				// this.$refs.uToast.show({
-				// 	...params,
-				// 	complete() {
-				// 		params.url && uni.navigateTo({
-				// 			url: params.url
-				// 		})
-				// 	}
-				// })
+					this.alertTitle = '确定暂存装车信息？'
+				} else {
+					this.alertTitle = '确定提交装车信息？'
+				}
+				this.isShowAlert = true
+				this.detailData.statusFlag = type
 			},
-			confirmClick(){
-				console.log('提交')
+			confirmClick() {
+				this.isShowAlert = false
+				//1暂存
+				// if (this.detailData.statusFlag == 1) {
+				// 	delete this.detailData.carrierInfo.loadingAreaLongitude;
+				// 	delete this.detailData.carrierInfo.loadingAreaLatitude;
+				// 	delete this.detailData.carrierInfo.sendCity;
+				// 	delete this.detailData.carrierInfo.sendArea;
+				// }
+				this.detailData.carrierInfo = {}
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
+						id: this.id,
+						loadingFlag: 1,
+						flag: 1
+					}).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							let _title = ''
+							if (this.detailData.statusFlag == 1) {
+								_title = '暂存成功！'
+							} else {
+								_title = '提交成功！'
+							}
+							uni.navigateBack({
+								delta:1
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			}
 		},
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.content {
+		// . {
+		// 	color: #333333;
+		// }
+	}
+
+	.level2-title {
+		margin: 0 0 20rpx 0;
+	}
+
+	.content1,
+	.content2 {
+		background: white;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+
+		.place {
+			width: 80%;
+			text-align: right;
+		}
+	}
+
+	.upload {}
+
+	.bottom-btn {
+		display: flex;
+		justify-content: space-around;
+		margin-bottom: 50rpx;
+		background: #FFFFFF;
+		padding: 40rpx 0;
+	}
+
+	.store {
+		padding: 20rpx 30rpx;
+		color: #2772FB;
+		width: 40%;
+		background: #EEF4FF;
+		border-radius: 40rpx;
+		font-size: 36rpx;
+		text-align: center;
+	}
+
+	.submit {
+		font-size: 36rpx;
+		padding: 20rpx 30rpx;
+		color: white;
+		width: 40%;
+		background: #2772FB;
+		border-radius: 40rpx;
+		text-align: center;
+	}
+
+	.row-between {
+		margin: 20rpx 0;
+	}
+
+	.sx-style {
+		background: #2772FB;
+		color: white;
+		padding: 2rpx 16rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-left: 20rpx;
+	}
+
+	.input {
+		text-align: right;
+	}
 
+	.date-style {}
 </style>

pages/order/orderDetails.vue

@@ -153,15 +153,15 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">车牌号</view>
-				<view class="row-right-text">{{dataObj.carrierInfo.carNo}}</view>
+				<view class="row-right-text">{{dataObj.hyCarrierInfo.carNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">预计运费</view>
-				<view class="row-right-text">{{dataObj.carrierInfo.estimatedFreight}}元</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 gray">{{dataObj.carrierInfo.loadingDate}}</view>
+				<view class="row-right-text gray">{{dataObj.hyCarrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">装车照片</view>
@@ -172,11 +172,11 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合计应付运费</view>
-				<view class="row-right-text">{{dataObj.carrierInfo.totalFreight}}元</view>
+				<view class="row-right-text">{{dataObj.hyCarrierInfo.totalFreight}}元</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车时间</view>
-				<view class="row-right-text gray">{{dataObj.carrierInfo.loadingDate}}</view>
+				<view class="row-right-text gray">{{dataObj.hyCarrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车照片</view>
@@ -278,7 +278,6 @@
 	export default {
 		data() {
 			return {
-				type: null,
 				cyinfoStatus: '未装车',
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				isShowTerminationReason: false,
@@ -420,8 +419,11 @@
 				}
 				this.type = type
 				if (type == 3) {
-					this.alertTitle = '确认装车？'
-					this.confirmText = '确定'
+					uni.$u.route("/pages/order/confirmLoading", {
+					obj: JSON.stringify({id:this.id}),
+				})
+					// this.alertTitle = '确认装车？'
+					// this.confirmText = '确定'
 				} else if (type == 4) {
 					this.alertTitle = '确认卸车？'
 					this.confirmText = '确定'
@@ -586,15 +588,15 @@
 							.cargoOwnerStatus == "已完结") {
 							this.status3 = true
 						}
-						if (res.data.carrierInfo) {
-							if (res.data.carrierInfo.loadingImg) {
-								let _zcList = res.data.carrierInfo.loadingImg.split(',')
+						if (res.data.hyCarrierInfo) {
+							if (res.data.hyCarrierInfo.loadingImg) {
+								let _zcList = res.data.hyCarrierInfo.loadingImg.split(',')
 								for (let i = 0; i < _zcList.length; i++) {
 									if (_zcList[i]) this.zcImgList.push(_zcList[i])
 								}
 							}
-							if (res.data.carrierInfo.unloadingImg) {
-								let _xcList = res.data.carrierInfo.unloadingImg.split(',')
+							if (res.data.hyCarrierInfo.unloadingImg) {
+								let _xcList = res.data.hyCarrierInfo.unloadingImg.split(',')
 								for (let i = 0; i < _xcList.length; i++) {
 									if (_xcList[i]) this.xcImgList.push(_xcList[i])
 								}

pages/order/signContract.vue

@@ -43,11 +43,14 @@
 				<view class="gray">距离</view>
 				<view class="">约{{dataDetails.distance}}公里</view>
 			</view>
-			<view class='row-between'>
+			<!-- <view class='row-between'>
 				<view class="gray">运费</view>
 				<view class="">{{dataDetails.freightInfo.freight}}{{dataDetails.illingMethod==0?'元/吨':'元/车'}}</view>
-				<!-- 				<view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
-						class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
+			</view> -->
+			<view class='row-between'>
+				<!-- 后加 -->
+				<view class="gray">服务费（元）</view>
+				<view class="">{{dataDetails.serviceCharge}}</view>
 			</view>
 		</view>
 		<view class="wrapper content3">
@@ -102,7 +105,10 @@
 				lineColor: '#1A1A1A', // 颜色
 				lineSize: 5, // 笔记倍数
 				value: true,
-				dataDetails: {},
+				dataDetails: {
+					carrierInfo: {},
+					serviceCharge:'50'
+				},
 				radiolist1: [{
 						name: '平台垫付运费',
 						disabled: false

pages/public/code.vue

@@ -82,6 +82,7 @@
 					--this.count_down
 				}, 1000)
 				if (this.count_down == 0) {
+					this.count_down = 60
 					this.status = false
 				}
 				// 设定一个定时器 60000就是六十秒
@@ -117,90 +118,30 @@
 						title: '登录中',
 						mask: true
 					})
-					that.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
+					console.log("----------------------------")
+					console.log(this.phone)
+					console.log(this.inputList)
+					this.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
 							phone: this.phone,
 							verifyCode: this.inputList,
-							loginFlag: 1
+							loginFlag: 1,
+							identification: 2
 						}).then(res => {
+							console.log("res",res)
 							if (res.code == 200) {
-								that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-									mobilePhone: this.phone,
-									veriCode: "123456",
-									loginFlag: 1
-								}).then(res1 => {
-									that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-										reCommonId: this.userInfo.id,
-									}).then(res3 => {
-										if (res3.data) {
-											let name = 'myTip';
-											let value = res3.data
-											if (value == 0) {
-												uni.removeTabBarBadge({
-													index: 2
-												})
-											}
-											that.$store.commit('$uStore', {
-												name,
-												value
-											});
-											if (value != 0 && value) {
-												uni.setTabBarBadge({
-													index: 2,
-													text: value + ""
-												})
-											}
-										}
-									})
-									if (res1.code == 200) {
-										uni.setStorageSync('pcuserInfo', res1.data)
-										helper.getListByUserId()
-									} else {
-										that.$api.doRequest('post', '/commonUser/api/loginQuickly', {
-											mobilePhone: '14444444444',
-											veriCode: "123456",
-											loginFlag: 1
-										}).then(res2 => {
-											that.$request.baseRequest('get',
-											'/newsInfo/unreadMessage', {
-												reCommonId: this.userInfo.id,
-											}).then(res3 => {
-												if (res3.data) {
-													let name = 'myTip';
-													let value = res3.data
-													if (value == 0) {
-														uni.removeTabBarBadge({
-															index: 2
-														})
-													}
-													that.$store.commit('$uStore', {
-														name,
-														value
-													});
-													if (value != 0 && value) {
-														uni.setTabBarBadge({
-															index: 2,
-															text: value + ""
-														})
-													}
-												}
-											})
-											uni.setStorageSync('pcuserInfo', res2.data)
-											helper.getListByUserId()
-										})
-									}
-								})
+								console.log("res",res)
 								uni.setStorageSync('userInfo', res.data)
 								helper.getListByUserId()
 								that.$store.commit('login', res.data)
-								// that.liangxinLogin()
 								uni.switchTab({
 									url: '/pages/order/index'
 								});
 								uni.hideLoading()
+
 							} else {
 								uni.hideLoading()
 								uni.showToast({
-									title: res.message,
+									title: res1.message,
 									icon: 'none',
 									duration: 2000
 								})

pages/public/login.vue

@@ -3,7 +3,7 @@
 		<u-icon class="back-btn" name="arrow-left" color="black" size="20" @click="navBack"></u-icon>
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用智运货主端</h2>
+			<h2 class="title Semibold">欢迎使用畅运通货主端</h2>
 			<view
 				style='position:relative;width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;align-items: center;'
 				class="flex">
@@ -150,7 +150,8 @@
 				that.$request.baseRequest('get', '/commonUser/login', {
 						phone: this.phone,
 						password: this.password,
-						loginFlag: 1
+						loginFlag: 1,
+						identification:2
 					}).then(res => {
 						if (res.code == 200) {
 							console.log("userInfo", res.data)

pages/public/loginOther.vue

@@ -4,7 +4,7 @@
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
 			<image style='width:38px;height:38px;margin:223rpx 0 20px 0;' src='@/static/logo.png'></image>
-			<h2 class="title Semibold">欢迎使用智运货主端</h2>
+			<h2 class="title Semibold">欢迎使用畅运通货主端</h2>
 			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;' class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 

pages/public/register.vue

@@ -228,7 +228,8 @@
 						phone: this.phone,
 						password: this.password,
 						verifyCode: this.verifyCode,
-						userName: username
+						userName: username,
+						identification:2
 					}).then(res => {
 						if (res.code == '11002') {
 							uni.showToast({
@@ -252,7 +253,8 @@
 							that.$request.baseRequest('get', '/commonUser/login', {
 									phone: this.phone,
 									password: this.password,
-									loginFlag: 1
+									loginFlag: 1,
+									identification:2
 								}).then(res => {
 									if (res.code == 200) {
 										console.log("userInfo", res.data)

pages/release/addAddress.vue

@@ -25,7 +25,7 @@
 						<u--input v-model="addressInfo.contacts" 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="联系电话">></u--input>
+						<u--input v-model="addressInfo.contactPhone" border="none" placeholder="联系电话" maxlength="11">></u--input>
 					</u-form-item>
 				</u--form>
 			</view>

pages/release/release.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<u-navbar  title="发布" :placeholder="true" rightText="记录" @rightClick="goToRecord" @leftClick="back()">
+		<u-navbar title="发布" :placeholder="true" rightText="记录" @rightClick="goToRecord" @leftClick="back()">
 			<!-- 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>
@@ -91,15 +91,14 @@
 			<view class="row">
 				<view class="left">收货人身份证号</view>
 				<view class="right flex">
-					<input type="number" maxlength="11" placeholder="输入收货人身份证号" class="input"
+					<input type="number" maxlength="18" placeholder="输入收货人身份证号" class="input"
 						v-model="dataObj.receiverIdcard" />
 				</view>
 			</view>
 			<view class="row">
 				<view class="left">收货方信用代码（选填）</view>
 				<view class="right flex">
-					<input type="number" maxlength="11" placeholder="输入收货方信用代码" class="input"
-						v-model="dataObj.receiverCreditCode" />
+					<input placeholder="输入收货方信用代码" class="input" v-model="dataObj.receiverCreditCode" />
 				</view>
 			</view>
 			<view class="flex row">
@@ -140,7 +139,7 @@
 						v-model="dataObj.senderPhone" />
 				</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">重量（吨）</view>
 				<view class="right flex">
@@ -329,15 +328,13 @@
 			}
 		},
 		onShow() {
-
-			console.log("点击发布")
 			if (!this.hasLogin) {
 				uni.$u.route('/pages/public/login');
 				return
 			}
-			if (uni.getStorageSync('userInfo').statusFlag == '已认证') {
+			if (uni.getStorageSync('firstAuthentication').authenticationStatus == '已认证') {
 				uni.$u.route('/pages/components/empty/index');
-			} else if (uni.getStorageSync('userInfo').statusFlag == '审核中') {
+			} else if (uni.getStorageSync('firstAuthentication').authenticationStatus == '审核中') {
 				uni.showToast({
 					title: '身份信息审核中'
 				})
@@ -366,7 +363,6 @@
 				this.showCancelButton = false
 				return
 			} else {
-				console.log(1231233212332312312213)
 			}
 			// #endif
 			this.validityPeriod = this.$helper.makeValidityPeriod(0, '随时')
@@ -407,8 +403,6 @@
 			this.dataObj.loadingDateStart = '随时'
 			this.dataObj.loadingDateEnd = '随时'
 			this.dataObj.taskValidity = '长期'
-
-
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -425,37 +419,36 @@
 						// 可用企业货主
 						this.qyList = []
 						// 自己法人
-						let _self = res.data.companyInfoList
+						// let _self = res.data.companyInfoList
+						let _self = res.data.hyCompanyInfoList
 						//代理货主
-						let _dlhz = res.data.cargoOwnerCompInfoList
+						// let _dlhz = res.data.cargoOwnerCompInfoList
+						let _dlhz = res.data.hyCargoOwnerCompInfoList
 						if (!_dlhz) _dlhz = []
-						for (let i = 0; i < _self.length; i++) {
-							if (_self[i].status == '已认证') {
-								this.qyList.push(_self[i])
+						if (!_self) _self = []
+						if (_self.length > 0) {
+							for (let i = 0; i < _self.length; i++) {
+								if (_self[i].status == '已认证') {
+									this.qyList.push(_self[i])
+								}
 							}
 						}
-
-						for (let i = 0; i < _dlhz.length; i++) {
-							if (_dlhz[i].status == '已认证') {
-								this.qyList.push(_dlhz[i])
+						if (_dlhz.length > 0) {
+							for (let i = 0; i < _dlhz.length; i++) {
+								if (_dlhz[i].status == '已认证') {
+									this.qyList.push(_dlhz[i])
+								}
 							}
 						}
-						// 		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]
 								.companyName)
 						}
-						console.log('1111', _this.columns)
-
+						this.$forceUpdate()
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.message,
-							icon: 'none',
-							duration: 2000
-						})
 					});
 
 
@@ -471,14 +464,28 @@
 				if (uni.$u.test.isEmpty(this.dataObj.sendArea)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "发货地区不能为空！",
+						message: "请选择发货地区！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataObj.sendDetailedAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "发货详细地址不能为空！",
 					})
 					return true
 				}
 				if (uni.$u.test.isEmpty(this.dataObj.unloadArea)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "收货地区不能为空！",
+						message: "请选择收货地区！",
+					})
+					return true
+				}
+				if (uni.$u.test.isEmpty(this.dataObj.unloadDetailedAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "收货详细地址不能为空！",
 					})
 					return true
 				}
@@ -503,7 +510,7 @@
 					})
 					return true
 				}
-				
+
 				if (uni.$u.test.isEmpty(this.dataObj.receiverIdcard)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -520,7 +527,7 @@
 				}
 				if (
 					this.dataObj.freightPrice < 0 || this.dataObj.freightPrice > 100000 || (
-						String(this.dataObj.freightPrice).indexOf('.') != -1 && String(tthis.dataObj.freightPrice).length -
+						String(this.dataObj.freightPrice).indexOf('.') != -1 && String(this.dataObj.freightPrice).length -
 						(String(this.dataObj.freightPrice).indexOf(
 							'.') + 1) > 2)
 				) {
@@ -662,7 +669,6 @@
 							type: 'success',
 							message: "发布成功",
 							complete() {
-
 								_this.dataObj = {
 									commonId: '',
 									cargoOwner: '',
@@ -815,7 +821,6 @@
 				});
 			},
 			checkboxChange(n) {
-				console.log('change', n);
 				if (n.length > 1 && n.length < 4 && n.includes('不限')) {
 					n.shift(0)
 				} else if (n.length == 4) {
@@ -826,7 +831,6 @@
 				this.isShowcardValidity = true
 			},
 			confirmValidityPeriod(e) {
-				console.log('confirm', e)
 				if (e.value[0] == '随时') {
 					switch (this.ValidityPeriodType) {
 						case 0:
@@ -859,7 +863,6 @@
 				this.isShowValidity = false
 			},
 			confirmValidityPeriodcq(e) {
-				console.log('confirm', e)
 				if (e.value[0] == '长期') {
 					this.dataObj.taskValidity = e.value[0]
 				} else {
@@ -882,13 +885,14 @@
 				console.log('change', e);
 			},
 			back() {
-				uni.navigateBack()
+				uni.navigateBack({
+					delta:1
+				})
 			},
 			goToRecord() {
 				uni.$u.route('/pages/release/record');
 			},
 			radioChange(n) {
-				console.log('radioChange', n);
 				this.dataDetails.type = n
 			},
 			submit() {

store/index.js

@@ -10,7 +10,7 @@ try {
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['firendItem','userData','userInfo','enter','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem','clientId','infoList'];
+let saveStateKeys = ['firendItem','userData','userInfo','firstAuthentication','enter','pushRes','myTip','taskTip','contractTip','liangxinTip','packet','linkItem','memberItem','memberItemIndex','chatItem','clientId','infoList'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value) {
@@ -90,7 +90,8 @@ const store = new Vuex.Store({
 		clientId: lifeData.clientId?lifeData.clientId: "",
 		// 确定收货
 		isConfigfreightTransport:true,
-		choice:""
+		choice:"",
+		firstAuthentication:{}
 	},
 	mutations: {
 		$uStore(state, payload) {
@@ -116,13 +117,16 @@ const store = new Vuex.Store({
 		login(state, provider) {
 			state.hasLogin = true;
 			state.userInfo = provider;
+				state.firstAuthentication = uni.getStorageSync('firstAuthentication');
 			uni.setStorageSync('userInfo', provider)
 		},
 		
 		logout(state) {
 			state.hasLogin = false;
 			state.userInfo = {};
+			state.firstAuthentication = {};
 			uni.removeStorageSync('userInfo')
+			uni.removeStorageSync('firstAuthentication')
 			uni.removeStorageSync('pcUserInfo')
 		},
 		configfreightTransport(state,flag){