修改司机端

demo.vue

@@ -19,6 +19,7 @@
 		16、防止点击穿透
 		17、数组删除指定元素
 		18、缓存
+		19、主动刷新滚动数据
 	</view>
 </template>
 
@@ -70,24 +71,16 @@
 				// this.$refs.uToast.show({
 				// 	type: 'error',
 				// 	message: "最多选择3个地区",
-				// })
-				// let params = {
-				// 		type: 'success',
-				// 		title: '成功主题(带图标)',
-				// 		message: "庄生晓梦迷蝴蝶",
-				// 		iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-				// 	}
-				// this.$refs.uToast.show({
-				// 	...params,
 				// 	complete() {
 				// 		params.url && uni.navigateTo({
 				// 			url: params.url
 				// 		})
 				// 	}
 				// })
+	
 				// uni.$u.toast('倒计时结束后再发送');
 				// 9、
-				// <u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#22C572'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				// <u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 				// confirmClick(){
 				// 	this.isShowAlert = fasle
 				// },
@@ -121,7 +114,16 @@
 				// 17、this.carList.splice(index,1)
 				// 18、
 				 // uni.setStorageSync('storage_key', 'hello');
-				 // uni.getStorageSync('storage_key', 'hello');
+				 // uni.getStorageSync('storage_key');
+				 // 19、
+				 // mescrollInit(mescroll) {
+				 // 	this.mescroll = mescroll;
+				 // },
+				 // this.mescroll.resetUpScroll()
+				 // this.upCallback({
+				 // 	size: 10,
+				 // 	num: 1
+				 // })
 			}
 		}
 	}

pages/goodSource/index.vue

@@ -17,7 +17,8 @@
 					</view>
 				</view>
 				<view>
-					<u-button type="" class="btn-color fontsize-36 m-top20" @click="upCallback()"> 查询</u-button>
+					<u-button type="" class="btn-color fontsize-36 m-top20" @click="upCallback({size:10,num:1})"> 查询
+					</u-button>
 				</view>
 			</view>
 		</view>
@@ -160,7 +161,6 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		onShow() {
-			debugger
 			//获取上一次点击起装卸地
 			console.log(uni.getStorageSync('fPlaceObj'))
 			if (uni.getStorageSync('fPlaceObj')) {
@@ -227,15 +227,12 @@
 					_val = '不限'
 				} else {
 					if (good.carModel.includes(2)) {
-						debugger
 						_val += '高栏/'
 					}
 					if (good.carModel.includes(3)) {
-						debugger
 						_val += '集装箱/'
 					}
 					if (good.carModel.includes(4)) {
-						debugger
 						_val += '自卸车'
 					}
 				}
@@ -291,6 +288,15 @@
 				this.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
 						debugger
 						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "抢单成功！",
+								complete() {
+									uni.switchTab({
+										url: "/pages/order/index"
+									})
+								}
+							})
 
 						}
 
@@ -368,8 +374,6 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
-				debugger
-				debugger
 				let _pickerSelect;
 				if (this.pickerSelect == '运费先付') {
 					_pickerSelect = 1
@@ -388,7 +392,6 @@
 						// unLoadingPlaceCity: this.endPlace.schoosecity
 
 					}).then(res => {
-						debugger
 						if (res.code == 200) {
 							this.goods = res.data.records
 							this.mescroll.endBySize(res.data.records.length, res.data.total);

pages/goodSource/selectCity.vue

@@ -153,7 +153,6 @@
 		methods: {
 			// 历史收发地去重
 			makeHistoryList(val) {
-				debugger
 				if (this.type == 0) {
 					let _obj = {}
 					// for (let i = 0; i < this.historyScityList.length; i++) {

pages/goodSource/shippingDetails.vue

@@ -158,15 +158,12 @@
 					_val = '不限'
 				} else {
 					if (this.detailData.carModel.includes(2)) {
-						debugger
 						_val += '高栏/'
 					}
 					if (this.detailData.carModel.includes(3)) {
-						debugger
 						_val += '集装箱/'
 					}
 					if (this.detailData.carModel.includes(4)) {
-						debugger
 						_val += '自卸车'
 					}
 				}

pages/mine/editDriverCertificationNext.vue

@@ -530,7 +530,6 @@
 				return false
 			},
 			delSubmitObj() {
-				debugger
 				delete this.dataDetails.authenticationStatus
 				delete this.dataDetails.authenticationStatusKey
 				delete this.dataDetails.compId

pages/mine/index.vue

@@ -113,7 +113,7 @@
 
 			};
 		},
-		onShow() {debugger
+		onShow() {
 			console.log("111111111111111111111111111", this.firstAuthentication)
 			if (this.firstAuthentication) {
 				this.userName = this.firstAuthentication.driverCall
@@ -148,7 +148,6 @@
 		},
 		onLoad() {
 			that = this
-			debugger
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),

pages/mine/manageBankCards/addBankCard.vue

@@ -203,7 +203,6 @@
 											'/driverInfo/bankShibie', {
 												bankImg: result,
 											}).then(res => {
-											debugger
 											console.log(res)
 
 

pages/mine/manageBankCards/index.vue

@@ -60,7 +60,7 @@
 			this.init();
 		},
 		methods: {
-			radioChange(val) {debugger
+			radioChange(val) {
 				for (let i = 0; i < this.bankList.length; i++) {
 					if (val.id == this.bankList[i].id) {
 						this.bankList[i].defaultFlag = 1

pages/mine/manageVehicles/addVehicle.vue

@@ -122,7 +122,6 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onLoad(options) {
-			debugger
 			_this = this;
 			console.log(options)
 			this.dataDetails.driverId = this.userInfo.driverId

pages/mine/manageVehicles/editVehicle.vue

@@ -108,7 +108,7 @@
 				fileList1:[]
 			};
 		},
-		onLoad(options) {debugger
+		onLoad(options) {
 			_this = this;
 			console.log(options)
 			this.dataDetails = options

pages/mine/set.vue

@@ -19,8 +19,7 @@
 				</view>
 				<view style='align-items: center;' class="flex">
 					<view class="username">
-						<!-- {{username}} -->
-						未认证
+						{{firstAuthentication.authenticationStatus=='已认证'?firstAuthentication.driverName:'未认证'}}
 					</view>
 					<!-- <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image> -->
 				</view>
@@ -90,7 +89,7 @@
 			}
 		},
 		computed: {
-			// ...mapState(['hasLogin', 'userInfo'])
+			...mapState(['hasLogin', 'userInfo','firstAuthentication'])
 		},
 		onShow() {
 			this.getList()

pages/mine/settings/editAvatar.vue

@@ -46,14 +46,35 @@
 				if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						sourceType: that.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage(res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
 									console.log('图片地址', result)
-								that.deptListurl.avatarUrl = result
+									debugger
+									that.$request.baseRequest('get', '/BDAccessToken/getAuth', {
+											apiKey: 'yNWLRW6unoUxo2KXiCZxOxGS',
+											secretKey: 'E8hqzKWdFdTGnFnpAwZ7ixtL89SN3deR'
+										}).then(res => {
+												debugger
+												that.$request.baseRequest('get', '/commonUser/getUserDefinedBean', {
+														accessToken: res.data,
+														  imagePath : result
+													}).then(res1 => {
+															debugger
+																	that.deptListurl.avatarUrl = result
+													})
+													.catch(res => {
+													uni.$u.toast( res.message);
+													});
+										})
+										.catch(res => {
+										uni.$u.toast( res.message);
+										});
+									
+						
 			
 								}
 							)
@@ -67,35 +88,41 @@
 			},
 			submit(){
 				this.deptListurl.id = this.userInfo.id
-				this.$request.baseRequest('post', '/commonUser/editUserInfo', this.deptListurl).then(res => {
-						uni.showToast({
-							title: '修改成功！',
-							icon: 'success',
-							duration: 2000,
-							success() {
-								setTimeout(()=>{
-									that.userInfo.avatarUrl = that.deptListurl.avatarUrl
-									var _student = uni.getStorageSync('userInfo');
-									_student.avatarUrl = that.deptListurl.avatarUrl;
-									uni.setStorageSync('userInfo', _student);
-									var name = 'userInfo';
-									var value = _student;
-									that.$store.commit('$uStore', {
-										name,
-										value
-									});
-									// this.$api.msg('修改成功2！')
-									uni.navigateBack({
-										delta:1
-									})
-								},2000)
-							}
-						})
+	
 				
-					})
-					.catch(res => {
-					uni.$u.toast( res.message);
-					});
+				
+				
+				
+				
+				// this.$request.baseRequest('post', '/commonUser/editUserInfo', this.deptListurl).then(res => {
+				// 		uni.showToast({
+				// 			title: '修改成功！',
+				// 			icon: 'success',
+				// 			duration: 2000,
+				// 			success() {
+				// 				setTimeout(()=>{
+				// 					that.userInfo.avatarUrl = that.deptListurl.avatarUrl
+				// 					var _student = uni.getStorageSync('userInfo');
+				// 					_student.avatarUrl = that.deptListurl.avatarUrl;
+				// 					uni.setStorageSync('userInfo', _student);
+				// 					var name = 'userInfo';
+				// 					var value = _student;
+				// 					that.$store.commit('$uStore', {
+				// 						name,
+				// 						value
+				// 					});
+				// 					// this.$api.msg('修改成功2！')
+				// 					uni.navigateBack({
+				// 						delta:1
+				// 					})
+				// 				},2000)
+				// 			}
+				// 		})
+				
+				// 	})
+				// 	.catch(res => {
+				// 	uni.$u.toast( res.message);
+				// 	});
 			}
 		}
 	}

pages/news/index.vue

@@ -47,9 +47,8 @@
 <script>
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import {
-		apiGoods
-	} from "@/api/mock.js"
-
+		mapState
+	} from 'vuex';
 	export default {
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
@@ -61,6 +60,9 @@
 				badgeOffset: [0, -5]
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
 		methods: {
 			back() {
 				uni.navigateBack({
@@ -86,29 +88,17 @@
 				// }
 
 				//联网加载数据
-				apiGoods(page.num, page.size).then(res => {
-					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
-					//mescroll会根据传的参数,自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
-
-					//方法一(推荐): 后台接口有返回列表的总页数 totalPage
-					//this.mescroll.endByPage(res.list.length, totalPage); //必传参数(当前页的数据个数, 总页数)
-
-					//方法二(推荐): 后台接口有返回列表的总数据量 totalSize
-					//this.mescroll.endBySize(res.list.length, totalSize); //必传参数(当前页的数据个数, 总数据量)
-
-					//方法三(推荐): 您有其他方式知道是否有下一页 hasNext
-					//this.mescroll.endSuccess(res.list.length, hasNext); //必传参数(当前页的数据个数, 是否有下一页true/false)
-
-					//方法四 (不推荐),会存在一个小问题:比如列表共有20条数据,每页加载10条,共2页.如果只根据当前页的数据个数判断,则需翻到第三页才会知道无更多数据
-					this.mescroll.endSuccess(res.list.length);
-
-					//设置列表数据
-					if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
-					this.goods = this.goods.concat(res.list); //追加新数据
-				}).catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
+			this.$request.baseRequest('get', '/newsInfo/selectNewsInfo', {
+					commonId:  this.userInfo.id,
+					pageSize: page.size,
+					currentPage: page.num,
+				}).then(res => {
+						this.goods = res.data.records
+						this.mescroll.endBySize(res.data.records.length, res.data.total);
 				})
+				.catch(res => {
+				uni.$u.toast( res.message);
+				});
 			}
 		}
 	}
@@ -124,7 +114,7 @@
 		position: absolute;
 		width: 100%;
 		height: 519rpx;
-		background: linear-gradient(180deg, #317AFE 0%, #F8F9FC 100%);
+		// background: linear-gradient(180deg, #317AFE 0%, #F8F9FC 100%);
 
 	}
 
@@ -134,7 +124,7 @@
 		background: #FFFFFF;
 		margin: 20rpx;
 		width: calc(100% - 40rpx);
-		padding: 20rpx;
+		// padding: 20rpx;
 		box-sizing: border-box;
 		border-radius: 20rpx;
 	}

pages/order/confirmLoading.vue

@@ -1,43 +1,46 @@
 <!-- 确认装车 -->
 <template>
 	<view class="content">
-		<div class='content1'>
+		<!-- 	<div class='content1'>
 			<view class="level2-title">承运合同</view>
 			<view class='row-between'>
 				<view class="row-left-text">合同编号</view>
-				<view class="row-right-text">未签订</view>
+				<view class="row-right-text">{{detailData.contractNo?detailData.contractNo:'未签订'}}</view>
 			</view>
-		</div>
+		</div> -->
 		<view class="content2">
 			<view class="level2-title">基本信息</view>
 			<view class='row-between'>
 				<view class="row-left-text">订单编号</view>
-				<view class="row-right-text">CY20220210666666</view>
+				<view class="row-right-text">{{detailData.orderNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货主</view>
-				<view class="row-right-text">张山</view>
+				<view class="row-right-text">{{detailData.cargoOwner}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货主单位</view>
-				<view class="row-right-text">辽宁省营口市鲅鱼圈区蝴蝶泉路116号</view>
+				<view class="row-right-text">{{detailData.compName?detailData.compName:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">发货地</view>
-				<view class="row-right-text place">黑龙江中天昊元贸易有限公司</view>
+				<view class="row-right-text place">
+					{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}{{detailData.sendDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">卸货地</view>
-				<view class="row-right-text place">黑龙江省齐齐哈尔市梅里斯达斡尔族区
-					杜尔门沁达斡尔乡53农场</view>
+				<view class="row-right-text place">
+					{{detailData.unloadPrivate}}{{detailData.unloadCity}}{{detailData.unloadArea}}{{detailData.unloadDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货名</view>
-				<view class="row-right-text">玉米</view>
+				<view class="row-right-text">{{detailData.goodsName}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">运费</view>
-				<view class="row-right-text">100元/车</view>
+				<view class="row-right-text">{{detailData.freight}}{{detailData.illingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
 
 		</view>
@@ -45,20 +48,21 @@
 			<view class="level2-title">装车信息</view>
 			<view class='row-between'>
 				<view class="row-left-text">车牌号</view>
-				<view class="row-right-text">辽H111111</view>
+				<view class="row-right-text">{{detailData.carrierInfo.carNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">装车日期</view>
-				<view class="row-right-text">来自合同</view>
+				<view class="row-right-text">{{detailData.carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">预计运费（元）</view>
-				<view class="row-right-text">来自合同</view>
+				<view class="row-right-text">{{detailData.carrierInfo.estimatedFreight}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
-				<view class="row-right-text place">去授权</view>
-				<!-- <view class="row-right-text place">刷新</view> -->
+				<view>{{detailData.carrierInfo.sendCity}}{{detailData.carrierInfo.sendArea}}</view>
+				<!-- 				<view class="row-right-text place">去授权</view>
+				<view class="row-right-text place">刷新</view> -->
 			</view>
 			<view class='s-flex'>
 				<view class="row-left-text">上传装车照片</view>
@@ -66,20 +70,22 @@
 					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 			</view>
-			<view class='s-flex'>
+			<!-- 			<view class='s-flex'>
 				<view class="row-left-text">上传装车磅单</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>
+			</view> -->
 
 		</view>
 		<view class="bottom-btn">
-			<view class="store">暂存</view>
-			<view class="submit">提交</view>
+			<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>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -92,7 +98,9 @@
 		data() {
 			return {
 				detailData: {
-					addressUrl: ''
+					addressUrl: '',
+					contractNo: 'CYHT20220317000001',
+
 				},
 				action: this.$helper.ossUploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -104,6 +112,19 @@
 		},
 		onLoad(options) {
 			console.log(options)
+			this.detailData = options;
+			this.detailData.contractNo = 'CYHT20220317000001'
+			this.detailData.carrierInfo = {
+				carNo: '123',
+				loadingDate: '2022-03-17',
+				estimatedFreight: '100',
+				loadingAreaLongitude: '',
+				loadingAreaLatitude: '',
+				sendCity: '营口',
+				sendArea: '鲅鱼圈',
+				loadingImg: ''
+
+			}
 		},
 		methods: {
 			alertBtn() {
@@ -115,7 +136,7 @@
 				this.isShowAlert = false
 			},
 			getImgUrl(res) {
-				this.detailData.addressUrl = res
+				this.detailData.carrierInfo.loadingImg += res + ','
 				console.log(res)
 				console.log('------------res-----------')
 			},
@@ -142,18 +163,16 @@
 			},
 			submit(type) {
 				console.log(type)
-				let params = {
-					type: 'success',
-					title: '成功主题(带图标)',
-					message: "庄生晓梦迷蝴蝶",
-					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
-				}
-				if (type == 0) {
 
+				if (type == 1) {
+					//暂存
 				} else {
 					this.alertContent = '确定提交装车信息？'
 					this.alertTitle = '提示'
 					this.isShowAlert = true
+					this.detailData.statusFlag = type
+
+
 				}
 				// this.$refs.uToast.show({
 				// 	...params,
@@ -165,7 +184,22 @@
 				// })
 			},
 			confirmClick() {
-				console.log('提交')
+				this.$request.baseRequest('post', '/carrierInfo/loadingAdd', this.detailData).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功！",
+								complete() {
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								}
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 			}
 		},
 	}
@@ -194,32 +228,34 @@
 			text-align: right;
 		}
 	}
-	.upload{
-		
-	}
-	.bottom-btn{
+
+	.upload {}
+
+	.bottom-btn {
 		display: flex;
 		justify-content: space-around;
 		margin-bottom: 50rpx;
 		background: #FFFFFF;
 		padding: 40rpx 0;
 	}
-	.store{
+
+	.store {
 		padding: 20rpx 30rpx;
-		color:#2772FB;
+		color: #2772FB;
 		width: 40%;
 		background: #EEF4FF;
 		border-radius: 40rpx;
 		font-size: 36rpx;
 		text-align: center;
 	}
-	.submit{
+
+	.submit {
 		font-size: 36rpx;
 		padding: 20rpx 30rpx;
 		color: white;
 		width: 40%;
-		background:#2772FB ;
+		background: #2772FB;
 		border-radius: 40rpx;
-			text-align: center;
+		text-align: center;
 	}
 </style>

pages/order/confirmUnloading.vue

@@ -5,32 +5,35 @@
 			<view class="level2-title">基本信息</view>
 			<view class='row-between'>
 				<view class="row-left-text">订单编号</view>
-				<view class="row-right-text">CY20220210666666</view>
+				<view class="row-right-text">{{detailData.orderNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货主</view>
-				<view class="row-right-text">张山</view>
+				<view class="row-right-text">{{detailData.cargoOwner}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货主单位</view>
-				<view class="row-right-text">辽宁省营口市鲅鱼圈区蝴蝶泉路116号</view>
+				<view class="row-right-text">{{detailData.compName?detailData.compName:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">发货地</view>
-				<view class="row-right-text place">黑龙江中天昊元贸易有限公司</view>
+				<view class="row-right-text place">
+					{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}{{detailData.sendDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">卸货地</view>
-				<view class="row-right-text place">黑龙江省齐齐哈尔市梅里斯达斡尔族区
-					杜尔门沁达斡尔乡53农场</view>
+				<view class="row-right-text place">
+					{{detailData.unloadPrivate}}{{detailData.unloadCity}}{{detailData.unloadArea}}{{detailData.unloadDetailedAddress}}
+				</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">货名</view>
-				<view class="row-right-text">玉米</view>
+				<view class="row-right-text">{{detailData.goodsName}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">运费</view>
-				<view class="row-right-text">100元/车</view>
+				<view class="row-right-text">{{detailData.freight}}{{detailData.illingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
 
 		</view>
@@ -38,19 +41,20 @@
 			<view class="level2-title">卸车信息</view>
 			<view class='row-between'>
 				<view class="row-left-text">车牌号</view>
-				<view class="row-right-text">辽H111111</view>
+				<view class="row-right-text">{{detailData.carrierInfo.carNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">卸车日期</view>
-				<view class="row-right-text">2022-02-11</view>
+				<view class="row-right-text">{{detailData.carrierInfo.unloadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">合计应付运费（元）</view>
-				<view class="row-right-text">输入合计应付运费</view>
+				<input type="text" value="" placeholder="输入合计应付运费" v-model="detailData.carrierInfo.totalFreight" />
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
-				<view class="row-right-text place">去授权</view>
+				<view>{{detailData.carrierInfo.unloadCity}}{{detailData.carrierInfo.unloadArea}}</view>
+				<!-- <view class="row-right-text place">去授权</view> -->
 				<!-- <view class="row-right-text place">刷新</view> -->
 			</view>
 			<view class='s-flex'>
@@ -61,11 +65,13 @@
 			</view>
 		</view>
 		<view class="bottom-btn">
-			<view class="store">暂存</view>
-			<view class="submit">提交</view>
+			<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>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -90,6 +96,20 @@
 		},
 		onLoad(options) {
 			console.log(options)
+			this.detailData = options;
+			this.detailData.contractNo = 'CYHT20220317000001'
+			this.detailData.carrierInfo = {
+				carNo: '123',
+				unloadingDate: '2022-03-17',
+				estimatedFreight: '100',
+				unloadingAreaLongitude: '',
+				unloadingAreaLatitude: '',
+				unloadCity: '沈阳',
+				unloadArea: '大东',
+				unloadingImg: '',
+				totalFreight: '100'
+
+			}
 		},
 		methods: {
 			alertBtn() {
@@ -101,7 +121,7 @@
 				this.isShowAlert = false
 			},
 			getImgUrl(res) {
-				this.detailData.addressUrl = res
+				this.detailData.carrierInfo.unloadingImg += res + ','
 				console.log(res)
 				console.log('------------res-----------')
 			},
@@ -134,12 +154,13 @@
 					message: "庄生晓梦迷蝴蝶",
 					iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/success.png'
 				}
-				if (type == 0) {
+				if (type == 1) {
 
 				} else {
-					this.alertContent = '确定提交装车信息？'
+					this.alertContent = '确定提交卸车信息？'
 					this.alertTitle = '提示'
 					this.isShowAlert = true
+					this.detailData.statusFlag = type
 				}
 				// this.$refs.uToast.show({
 				// 	...params,
@@ -151,6 +172,22 @@
 				// })
 			},
 			confirmClick() {
+				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功！",
+								complete() {
+									uni.switchTab({
+										url:'/pages/order/index'
+									})
+								}
+							})
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 				console.log('提交')
 			}
 		},
@@ -180,32 +217,34 @@
 			text-align: right;
 		}
 	}
-	.upload{
-		
-	}
-	.bottom-btn{
+
+	.upload {}
+
+	.bottom-btn {
 		display: flex;
 		justify-content: space-around;
 		margin-bottom: 50rpx;
 		background: #FFFFFF;
 		padding: 40rpx 0;
 	}
-	.store{
+
+	.store {
 		padding: 20rpx 30rpx;
-		color:#2772FB;
+		color: #2772FB;
 		width: 40%;
 		background: #EEF4FF;
 		border-radius: 40rpx;
 		font-size: 36rpx;
 		text-align: center;
 	}
-	.submit{
+
+	.submit {
 		font-size: 36rpx;
 		padding: 20rpx 30rpx;
 		color: white;
 		width: 40%;
-		background:#2772FB ;
+		background: #2772FB;
 		border-radius: 40rpx;
-			text-align: center;
+		text-align: center;
 	}
 </style>

pages/order/index.vue

@@ -61,12 +61,13 @@
 							<view class="car">{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<view class="row5 flex flex-end">
-							<view class="stop active" @click.stop="stop(good)">终止</view>
-							<view class="start normal">确认装车</view>
-							<!-- 	<view class="start">联系客服</view>
-							<view class="start">确认卸车</view>
-							<view class="start">评价</view>
-							<view class="start">完结</view> -->
+							<!-- <view class="stop active" @click.stop="stop(good)">终止</view> -->
+							<view class="start normal" @click.stop="confirmLoading(good)">确认装车</view>
+							<!-- <view class="start">联系客服</view> -->
+							<!-- <view class="start normal" @click.stop="confirmUnLoading(good)">确认卸车</view> -->
+							<!-- 				<view class="start">评价</view>
+							-->
+							<!-- <view class="start normal" @click.stop="closed(good)">完结</view> -->
 						</view>
 					</view>
 				</view>
@@ -74,9 +75,10 @@
 		</view>
 		<view v-else class="search-view">
 			<view class="flex">
-				<u-icon name="arrow-left" color="" size="20" class="back-icon"></u-icon>
+				<u-icon name="arrow-left" color="" size="20" class="back-icon" @click="back()"></u-icon>
 				<u-search placeholder="可按编号、货主、收发地查找" placeholderColor="#AFB3BF" :actionStyle="textColor"
-					bgColor="#F5F6FA" v-model="keyword" actionText='取消' @custom="cancel" @search="getSearch"></u-search>
+					bgColor="#F5F6FA" v-model="searchKeyWord" actionText='取消' @custom="cancel" @search="getSearch">
+				</u-search>
 			</view>
 			<view class="near-search">
 				<view class="flex flex-space-between">
@@ -84,8 +86,8 @@
 					<u-icon name="trash-fill" color="#AFB3BF" size="20" class="back-icon" @click="del"></u-icon>
 				</view>
 				<view class="">
-					<view v-for="(item,index) in 3" :key="index" class="item-style inline-block">
-						中天好远
+					<view v-for="(item,index) in useSearchList" :key="index" class="item-style inline-block">
+						{{item}}
 					</view>
 				</view>
 
@@ -99,10 +101,12 @@
 					:label="item.name" :name="item.name" @change="radioChange">
 				</u-radio>
 			</u-radio-group>
-			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50' v-if='isShowTerminationReason'>
+			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
+				v-if='isShowTerminationReason'>
 			</u--textarea>
-			<u-toast ref="uToast"></u-toast>
 		</u-modal>
+
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -118,8 +122,10 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
+				searchKeyWord: '',
+				useSearchList: [],
 				mescroll: null,
-				isShowTerminationReason:false,
+				isShowTerminationReason: false,
 				id: '',
 				value2: '',
 				radiolist1: [{
@@ -131,7 +137,7 @@
 						disabled: false
 					},
 					{
-				  name: '司机个人原因终止',
+						name: '司机个人原因终止',
 						disabled: false
 					}, {
 						name: '其他',
@@ -146,7 +152,6 @@
 				textColor: {
 					"color": "#AFB3BF"
 				},
-				keyword: '',
 				isSearch: false,
 				startPlace: '齐齐哈尔齐齐哈尔',
 				endPlace: '全国',
@@ -194,10 +199,13 @@
 		onLoad() {
 			// let _isHave = this.$utils.getRoles('aaa')
 			// console.log(_isHave)
-			this.init()
+
 		},
 		onShow() {
-
+			this.upCallback({
+				size: 10,
+				num: 1
+			})
 		},
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop
@@ -220,14 +228,47 @@
 
 		},
 		methods: {
+			// 完结
+			closed(item) {
+				let that = this
+				this.$request.baseRequest('post', '/orderInfo/api/editEnd', {
+						id: item.id,
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			confirmLoading(item) {
+				uni.$u.route('/pages/order/confirmLoading', item);
+			},
+			confirmUnLoading(item) {
+				uni.$u.route('/pages/order/confirmUnloading', item);
+			},
+			back() {
+				uni.navigateBack(-1)
+			},
 			mescrollInit(mescroll) {
-								this.mescroll = mescroll;
-							},
+				this.mescroll = mescroll;
+			},
 			radioChange(n) {
 				console.log('radioChange', n);
 
 			},
-			stop(item) {debugger
+			stop(item) {
 				// 货主接单
 				if (item.orderStatusKey == 1) {
 					this.isShowTerminationReason = false
@@ -244,7 +285,6 @@
 				this.isShowAlert = true
 			},
 			confirmClick() {
-				debugger
 				console.log('终止')
 				if (this.radiovalue1 == '其他' && !this.value2) {
 					this.$refs.uToast.show({
@@ -265,12 +305,13 @@
 				}
 				this.$request.baseRequest('post', '/orderInfo/api/end', {
 						id: this.id,
+						terminator:1,
 						terminationReason: _terminationReason,
 						terminationReasonDescription: this.value2
 					}).then(res => {
 						console.log(res)
 						this.isShowAlert = false
-						this.mescroll.resetUpScroll( isShowLoading )
+						this.mescroll.resetUpScroll()
 
 					})
 					.catch(res => {
@@ -280,8 +321,16 @@
 			cancelClick() {
 				this.isShowAlert = false
 			},
-			getSearch() {
-				console.log("点击搜索")
+			getSearch(e) {
+				// = uni.getStorageSync('useSearchList')
+
+				this.useSearchList.unshift(e)
+				uni.setStorageSync("useSearchList", this.useSearchList)
+				console.log("点击搜索", e)
+				this.upCallback({
+					size: 10,
+					num: 1
+				})
 			},
 			cancel() {
 				this.isSearch = false
@@ -311,12 +360,12 @@
 				// 订单状态12345
 				this.$request.baseRequest('get', '/orderInfo/selectOrderInfo', {
 						commonId: this.userInfo.id,
-						searchKeyWord: '',
+						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
 						pageSize: page.size,
 						currentPage: page.num
 					}).then(res => {
-						debugger
+						this.isSearch = false
 						if (page.num == 1) this.goods = []; //如果是第一页需手动制空列表
 						this.goods = this.goods.concat(res.data.records); //追加新数据
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
@@ -335,6 +384,9 @@
 			},
 			search() {
 				this.isSearch = true
+				//获取缓存搜索数据
+				this.useSearchList = uni.getStorageSync('useSearchList')
+				if (!this.useSearchList) this.useSearchList = [];
 			}
 		}
 	}

pages/order/orderDetails.vue

@@ -11,8 +11,8 @@
 		</view>
 		<view class="content1">
 			<view class="item1">
-				<!-- <view class="status">待货主确认</view>
-				<view class="status">未装车</view>
+				<view class="status">{{dataObj.orderStatus}}</view>
+<!-- 				<view class="status">未装车</view>
 				<view class="status">待货主确认装车</view>
 				<view class="status">货主驳回装车信息</view>
 				<view class="status">待平台确认装车</view>
@@ -24,33 +24,33 @@
 				<view class="status">平台驳回卸车信息</view>
 				<view class="status">待结算</view>
 				<view class="status">已结算</view>
-				<view class="status">已终止</view> -->
+				<view class="status">已终止</view>
 				<view class="status">结算中</view>
-				<view class="status">已完结</view>
+				<view class="status">已完结</view> -->
 			</view>
 			<!-- flex flex-space-between -->
 			<view class="item2">
-				<u-button class="btn" text="终止"></u-button>
+				<u-button class="btn" text="终止" @click="stop"></u-button>
 				<!-- <u-button class="btn" text="联系客服" @click="$helper.contactCustomerService"></u-button> -->
-				<u-button class="btn" text="确认装车" @click="goConfirmLoading()"></u-button>
-				<u-button class="btn" text="修改装车信息" @click=""></u-button>
-				<u-button class="btn" text="确认卸车" @click=""></u-button>
-				<u-button class="btn" text="修改卸车信息" @click=""></u-button>
-				<u-button class="btn" text="完结" @click=""></u-button>
+				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading()"></u-button> -->
+				<!-- <u-button class="btn" text="修改装车信息"  @click="confirmLoading()></u-button> -->
+				<!-- <u-button class="btn" text="确认卸车" @click="confirmUnLoading"></u-button> -->
+				<!-- <u-button class="btn" text="修改卸车信息" @click="confirmUnLoading"></u-button> -->
+				<!-- <u-button class="btn" text="完结" @click="closed"></u-button> -->
 			</view>
 			<view class="item3 flex flex-space-between align-center">
 				<view class="left flex align-center">
 					<u--image :showLoading="true" :src="src" width="44px" height="44px" @click="" shape='circle'>
 					</u--image>
-					<view class="name">李正华</view>
+					<view class="name">{{dataObj.cargoOwner}}</view>
 					<view class="flex align-center">
-						<view class="number">4.98</view>
-						<u-icon class="star" name="star-fill" color="#FEC823" size="20" @click="back"></u-icon>
+						<!-- <view class="number">4.98</view> -->
+						<!-- <u-icon class="star" name="star-fill" color="#FEC823" size="20" @click="back"></u-icon> -->
 					</view>
 				</view>
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
-						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="back"></u-icon>
+						<u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon>
 					</view>
 
 					<view class="hz-name">联系货主</view>
@@ -85,129 +85,122 @@
 		<view class="content2">
 			<view class="flex flex-space-between border">
 				<view class="flex s-row item1">
-					<view class="fontsize-46 fontweight-500 text">营口市</view>
+					<view class="fontsize-46 fontweight-500 text">{{dataObj.sendCity}}</view>
 
 					<view class="fontsize-28 gray">发货地</view>
 				</view>
 				<image class="change-btn" src="@/static/images/common/jt.png" mode='widthFix'></image>
 				<view class="flex s-row item2">
 
-					<view class="fontsize-46 fontweight-500 text" @click="">齐齐哈尔市</view>
+					<view class="fontsize-46 fontweight-500 text" @click="">{{dataObj.unloadCity}}</view>
 					<view class="fontsize-28 gray text-align-right">卸货地</view>
 				</view>
 			</view>
 			<view class="level2-title">基本信息</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">订单编号</view>
-				<view class="row-right-text">CY20220210666666</view>
+				<view class="row-right-text">{{dataObj.orderNo}}</view>
 			</view>
-			<view class='row-between'>
+		<!-- 	<view class='row-between'>
 				<view class="row-left-text gray">货主</view>
-				<view class="row-right-text">张山</view>
-			</view>
+				<view class="row-right-text">{{dataObj.cargoOwner}}</view>
+			</view> -->
 			<view class='row-between'>
 				<view class="row-left-text gray">货主单位</view>
-				<view class="row-right-text">辽宁省营口市鲅鱼圈区蝴蝶泉路116号</view>
+				<view class="row-right-text">{{dataObj.compName?dataObj.compName:'个人货主'}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">发货地</view>
-				<view class="row-right-text place">黑龙江中天昊元贸易有限公司</view>
+				<view class="row-right-text place">{{dataObj.sendPrivate}}{{dataObj.sendCity}}{{dataObj.sendArea}}{{dataObj.sendDetailedAddress}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸货地</view>
-				<view class="row-right-text place">黑龙江省齐齐哈尔市梅里斯达斡尔族区
-					杜尔门沁达斡尔乡53农场</view>
+				<view class="row-right-text place">{{dataObj.unloadPrivate}}{{dataObj.unloadCity}}{{dataObj.unloadArea}}{{dataObj.unloadDetailedAddress}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">货名</view>
-				<view class="row-right-text">玉米</view>
+				<view class="row-right-text">{{dataObj.goodsName}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">距离</view>
-				<view class="row-right-text">约15公里</view>
+				<view class="row-right-text">约{{dataObj.distance}}公里</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">运费</view>
-				<view class="row-right-text">100元/车</view>
+				<view class="row-right-text">{{dataObj.freight}}{{dataObj.illingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
 
 		</view>
-		<view class="content3">
+		<view class="content3" v-if="status1">
 			<view class="level2-title">承运信息</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">合同编号</view>
-				<view class="row-right-text">132</view>
+				<view class="row-right-text">{{dataObj.contractNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">车牌号</view>
-				<view class="row-right-text">京H12345</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.carNo}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">预计运费</view>
-				<view class="row-right-text">1000元</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.estimatedFreight}}元</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">装车时间</view>
-				<view class="row-right-text gray">2022-02-10 16:13:15</view>
+				<view class="row-right-text gray">{{dataObj.carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">装车照片</view>
 				<view class="flex">
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
+					<u--image :showLoading="true" :src="dataObj.carrierInfo.loadingDate" width="40px" height="40px"></u--image>
 				</view>
 			</view>
 			<view class='row-between'>
-				<view class="row-left-text gray">计应付运费</view>
-				<view class="row-right-text">1100元</view>
+				<view class="row-left-text gray">合计应付运费</view>
+				<view class="row-right-text">{{dataObj.carrierInfo.totalFreight}}元</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车时间</view>
-				<view class="row-right-text gray">2022-02-10 16:13:15</view>
+				<view class="row-right-text gray">{{dataObj.carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">卸车照片</view>
 				<view class="flex">
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
-					<u--image :showLoading="true" :src="src" width="40px" height="40px"></u--image>
+					<u--image :showLoading="true" :src="dataObj.carrierInfo.unloadingImg" width="40px" height="40px"></u--image>
 				</view>
 			</view>
 		</view>
+		<!-- v-if="status2 -->
 		<view class="content4">
 			<view class="level2-title gray">运费信息（单位：元）</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">预付运费</view>
-				<view class="row-right-text">2000</view>
+				<view class="row-right-text">{{dataObj.freightInfo.prepaidFreight}}</view>
 			</view>
 			<view class='flex flex-end'>
-				<view class="gray row-right-text">2022-02-11 15:15:15</view>
+				<view class="gray row-right-text">{{dataObj.freightInfo.prepaidFreightDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text gray">运费尾款</view>
-				<view class="row-right-text">未支付</view>
+				<view class="row-right-text">{{dataObj.freightInfo.freightBalance}}</view>
 			</view>
 			<view class='row-between mx row-left-text gray'>
-				明细：预付2000元，扣款200元，服务费150元，尾款2000元，合计收款4000元。
-			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">运费</view>
-				<view class="row-right-text">2000</view>
-			</view>
-			<view class='flex flex-end'>
-				<view class="gray row-right-text">2022-02-11 15:15:15</view>
-			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">运费</view>
-				<view class="row-right-text">2000</view>
-			</view>
-			<view class='flex flex-end'>
-				<view class="gray row-right-text">2022-02-11 15:15:15</view>
-			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">合计</view>
-				<view class="row-right-text">4000</view>
+				明细：预付{{dataObj.freightInfo.freightBalance}}元，扣款{{dataObj.freightInfo.deduction}}元，服务费{{dataObj.freightInfo.serviceCharge}}元，尾款{{dataObj.freightInfo.freightBalance}}元，合计收款{{dataObj.freightInfo.totalCollection}}元。
 			</view>
 		</view>
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
+			:closeOnClickOverlay='true' :showCancelButton='true' @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"
+					:label="item.name" :name="item.name" @change="radioChange">
+				</u-radio>
+			</u-radio-group>
+			<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'
+				v-if='isShowTerminationReason'>
+			</u--textarea>
+		</u-modal>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -217,7 +210,34 @@
 			return {
 				cyinfoStatus: '未装车',
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				id: ""
+				isShowTerminationReason: false,
+				id: "",
+				dataObj:{},
+				status1:false,
+				status2:false,
+				id: '',
+				value2: '',
+				radiolist1: [{
+						name: '已与货主协商',
+						disabled: false
+					},
+					{
+						name: '货主原因终止',
+						disabled: false
+					},
+					{
+						name: '司机个人原因终止',
+						disabled: false
+					}, {
+						name: '其他',
+						disabled: false
+					}
+				],
+				radiovalue1: '已与货主协商',
+				confirmText: '终止',
+				alertTitle: '确定终止订单？',
+				alertContent: "",
+				isShowAlert: false,
 			}
 
 		},
@@ -228,6 +248,100 @@
 			this.getList()
 		},
 		methods: {
+			// 完结
+			closed() {
+				let item = this.dataDetails
+				let that = this
+				this.$request.baseRequest('post', '/orderInfo/api/editEnd', {
+						id: item.id,
+					}).then(res => {
+						if (res.code == 200) {
+							this.$refs.uToast.show({
+								type: 'success',
+								message: "提交成功",
+								complete() {
+									that.upCallback({
+										size: 10,
+										num: 1
+									})
+								}
+							})
+			
+						}
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
+			},
+			confirmLoading() {
+				let item = this.dataDetails
+				uni.$u.route('/pages/order/confirmLoading', item);
+			},
+			confirmUnLoading() {
+				let item = this.dataDetails
+				uni.$u.route('/pages/order/confirmUnloading', item);
+			},
+			confirmClick() {
+				let  that = this
+				console.log('终止')
+				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 => {
+						console.log(res) 
+						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
+			},
+			stop() {
+				let item = this.dataObj
+				// 货主接单
+				if (item.orderStatusKey == 1) {
+					this.isShowTerminationReason = false
+				} else {
+					this.isShowTerminationReason = true
+				}
+				this.id = item.id
+				this.isShowAlert = true
+			},
+			toPhone(){
+				uni.makePhoneCall({
+				    phoneNumber: this.dataObj.cargoOwnerPhone
+				});
+			},
 			back() {
 				uni.navigateBack()
 			},
@@ -236,6 +350,15 @@
 						id: this.id,
 						
 					}).then(res => {
+						if(res.code==200){
+							this.dataObj = res.data
+							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
+							}
+						}
 						
 					})
 			},
@@ -429,4 +552,7 @@
 			margin: 10rpx 0;
 		}
 	}
+	/deep/.u-modal__content {
+		flex-direction: column;
+	}
 </style>

pages/public/login.vue

@@ -19,7 +19,7 @@
 					@end="disabled1 = false">
 				</u-code>
 			</u--form>
-			<u-button  @tap="login"class="code-style submit">登录</u-button>
+			<u-button @tap="login" class="code-style submit">登录</u-button>
 			<view @click='gonumber' class="use-password" style='text-align:center;color:#6A6A6A;'>使用账号密码登录</view>
 			<!-- <u-button type="primary" text="登录" customStyle="margin-top: 50px" @click="login()"></u-button>
 			<u-button type="primary" @click='goregister'>手机号一键注册</u-button> -->
@@ -45,8 +45,7 @@
 					code: ''
 				},
 				rules: {
-					phone: [
-						{
+					phone: [{
 							required: true,
 							message: '请输入手机号',
 							trigger: ['change', 'blur'],
@@ -60,7 +59,7 @@
 							},
 							message: '手机号码不正确',
 							// 触发器可以同时用blur和change
-							trigger: [ 'blur'],
+							trigger: ['blur'],
 						}
 					],
 					code: {
@@ -81,9 +80,9 @@
 			_this = this
 		},
 		methods: {
-			gonumber(){
+			gonumber() {
 				uni.navigateTo({
-					url:'/pages/public/lginOther'
+					url: '/pages/public/lginOther'
 				})
 			},
 			navBack() {
@@ -132,11 +131,11 @@
 					_this.$request.baseRequest('get', '/commonUser/loginVerifyCode', {
 							phone: _this.dataDetails.phone,
 							verifyCode: _this.dataDetails.code,
-							 loginFlag :2
+							loginFlag: 2
 						}).then(res => {
 							_this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 									driverPhone: _this.dataDetails.phone,
-								}).then(res1 => {debugger
+								}).then(res1 => {
 									uni.setStorageSync('pcUserInfo', res.data)
 									uni.setStorageSync('userInfo', res.data)
 									uni.setStorageSync('firstAuthentication', res1.data)
@@ -237,10 +236,12 @@
 		background: #2772FB;
 		color: white;
 	}
-	.use-password{
+
+	.use-password {
 		margin-top: 31rpx;
 	}
-	.submit{
+
+	.submit {
 		margin-top: 40rpx;
 	}
 </style>