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

# Conflicts:
#	pages/order/index.vue

common/helper.js

@@ -92,24 +92,61 @@ const setAudit = (item) => {
 	}
 	console.log(item)
 }
-const contactCustomerService = (item) => {
-	console.log(item)
-	if (!item) {
-		// item = '400123123'
-		item = '13304979986'
+const contactCustomerService = (phone) => {
+	console.log(phone)
+	//客服
+	if (!phone) {
+		phone = '4006688647'
 	}
-	console.log("联系客服")
-	uni.makePhoneCall({
-		phoneNumber: item,
-		success: (res) => {
-			console.log('调用成功!')
+	const res = uni.getSystemInfoSync();
+	// ios系统默认有个模态框
+	if(res.platform=='ios'){
+		uni.makePhoneCall({
+		phoneNumber:phone,
+		success(){
+			console.log('拨打成功了');
 		},
-		// 失败回调
-		fail: (res) => {
-			console.log('调用失败!')
-			contactCustomerService(item)
+		fail() {
+			console.log('拨打失败了');
 		}
-	});
+	})
+	}else{
+	//安卓手机手动设置一个showActionSheet
+		uni.showActionSheet({
+			itemList: [phone,'呼叫'],
+			success:function(res){
+				console.log(res);
+			   if(res.tapIndex==1){
+				uni.makePhoneCall({
+				  phoneNumber: phone,
+				success: (res) => {
+					console.log('调用成功!')
+					
+				},
+			  
+				// 失败回调
+				fail: (res) => {
+					console.log('调用失败!')
+					// contactCustomerService(item)
+				}
+				})
+			  }
+			}
+		  })
+	}
+	// console.log("联系客服")
+	// uni.makePhoneCall({
+	// 	phoneNumber: item,
+	// 	success: (res) => {
+	// 		console.log('调用成功!')
+	// 	},
+
+	// 	// 失败回调
+	// 	fail: (res) => {
+	// 		console.log('调用失败!')
+	// 		contactCustomerService(item)
+	// 	}
+	// });
 }
 // 获取市、区简称
 const filterUrban = (s) => {

pages.json

@@ -136,7 +136,17 @@
 			"path": "pages/carSource/driverSee",
 			"style": {
 				"navigationBarTitleText": "司机详情",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"type": "menu"
+							// "text": "\f0112",
+							// "fontSrc": "/static/gengduo/iconfont.ttf",
+							// "fontSize": "20"
+						}]
+					}
+				}
 			}
 
 		}, {

pages/carSource/driverSee.vue

@@ -10,8 +10,8 @@
 				</view>
 
 				<view class="right flex s-row align-center phone">
-					<view class="bgc flex flex-space-between flex-center">
-						<image class='phone-icon' src="@/static/images/carSource/dianhua.png" mode=""></image>
+					<view @click="toPhone" class="bgc flex flex-space-between flex-center">
+						<image class='phone-icon' src="@/static/images/carSource/dianhua.png" mode="" ></image>
 						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="toPhone"></u-icon> -->
 						<view class="hz-name">联系司机</view>
 					</view>
@@ -184,12 +184,25 @@
 		},
 		onShow(){
 			var that=this
-			
+			// this.upCallback({num:1,size:10})
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			confirmBtn(e) {
+				console.log(this.driverList)
+				if (e.value == '投诉') {
+					uni.$u.route('/pages/order/fk', {
+						val: JSON.stringify(this.driverList)
+					});
+				} else {
+					uni.$u.route('/pages/order/jb', {
+						val: JSON.stringify(this.driverList)
+					});
+				}
+				this.show = false
+			},
 			toPhone(){
 				console.log(this.driverList.driverPhone)
 				var that=this
@@ -247,8 +260,10 @@
 								res.data.hyDriverCarInfoList[i].guaCarLong=res.data.hyDriverCarInfoList[i].guaCarLong/1000
 								res.data.hyDriverCarInfoList[i].carNumber = res.data.hyDriverCarInfoList[i].carNumber.replace(res.data.hyDriverCarInfoList[i].carNumber.substring(2, 6),
 									"****")
-								res.data.hyDriverCarInfoList[i].guaCarNumber = res.data.hyDriverCarInfoList[i].guaCarNumber.replace(res.data.hyDriverCarInfoList[i].guaCarNumber.substring(2, 6),
+									if(res.data.hyDriverCarInfoList[i].guaCarNumber){
+										res.data.hyDriverCarInfoList[i].guaCarNumber = res.data.hyDriverCarInfoList[i].guaCarNumber.replace(res.data.hyDriverCarInfoList[i].guaCarNumber.substring(2, 6),
 								"****")
+									}
 							}
 							that.hyDriverCarInfoList=res.data.hyDriverCarInfoList
 						}

pages/carSource/index.vue

@@ -211,7 +211,7 @@
 				this.city = '北京'
 			}
 			this.commonId = uni.getStorageSync("firstAuthentication").commonId
-			// this.checking()
+			this.checking()
 			this.getList()
 		},
 		onLoad() {},
@@ -224,46 +224,11 @@
 			},
 			checking() {
 				this.statusVal = uni.getStorageSync("firstAuthentication").authenticationStatus
-				// if (uni.getStorageSync("firstAuthentication")) {
-				// 	if(this.statusVal != "已认证" && this.statusVal != "已过期"){
-				// 		uni.setTabBarItem({
-				// 			  index: 1,
-				// 			  text: '车友',
-				// 			  pagePath: "/pages/riders/checkPage",
-				// 			  iconPath: 'static/images/common/huoyuan@2x(1).png',
-				// 			  selectedIconPath: 'static/images/common/huoyuan@2x.png'
-				// 		})
-				// 		uni.switchTab({
-				// 			url: '/pages/riders/checkPage'
-				// 		});
-				// 	}else{
-				// 		uni.setTabBarItem({
-				// 			  index: 1,
-				// 			  text: '车友',
-				// 			  pagePath: "/pages/riders/index",
-				// 			  iconPath: 'static/images/common/huoyuan@2x(1).png',
-				// 			  selectedIconPath: 'static/images/common/huoyuan@2x.png'
-				// 		})
-				// 		uni.switchTab({
-				// 			url: '/pages/riders/index'
-				// 		});
-				// 	}
-				// } else if(!uni.getStorageSync("firstAuthentication")&&!uni.getStorageSync("userInfo")) { //判断有没有登录
-				// 	this.tipsShow = true
-				// 	this.tipsText = "您尚未登录，请前去登录！"
-				// 	this.btnTips = "去登录"
-				// }else if (!uni.getStorageSync("firstAuthentication")){ //注册登录后并没有认证司机
-				// 	uni.setTabBarItem({
-				// 		  index: 1,
-				// 		  text: '车友',
-				// 		  pagePath: "/pages/riders/checkPage",
-				// 		  iconPath: 'static/images/common/huoyuan@2x(1).png',
-				// 		  selectedIconPath: 'static/images/common/huoyuan@2x.png'
-				// 	})
-				// 	uni.switchTab({
-				// 		url: '/pages/riders/checkPage'
-				// 	});
-				// }
+				if(!uni.getStorageSync("firstAuthentication")&&!uni.getStorageSync("userInfo")) { //判断有没有登录
+					this.tipsShow = true
+					this.tipsText = "您尚未登录，请前去登录！"
+					this.btnTips = "去登录"
+				}
 			},
 			fleetClose() {
 				this.fleetShow = false

pages/mine/cargoowner/editpersonalinformation.vue

@@ -135,6 +135,7 @@
 				radioCustomStyle: {
 					margin: '0 20rpx 0 0'
 				},
+				submitstatus:false,
 				radiolist1: [{
 						name: '男',
 						disabled: false
@@ -284,6 +285,13 @@
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
 					this.dataDetails.cardValidityDate = e.value[0]
+					if(e.value[1]!=''||e.value[2]!=''){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 				} else {
 					if(e.value[0]==''){
 						this.$refs.uToast.show({
@@ -392,28 +400,33 @@
 			},
 			submit() {
 				if (this.validate()) return
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
-				var _this = this
-				delete _this.dataDetails.hyCargoOwnerCompInfoList
-				console.log( _this.dataDetails,122121)
-				_this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
-						uni.hideLoading()
-						// console.log(res)
-						uni.$u.toast('提交成功')
-						uni.$u.route('/pages/mine/cargoowner/cargoowner')
+				if(!this.submitstatus){
+					this.submitstatus=true
+					uni.showLoading({
+						title: '加载中',
+						mask: true
 					})
-					.catch(res => {
-						console.log(res)
-						uni.hideLoading()
-						uni.showToast({
-							title: res.message,
-							icon: 'none',
-							duration: 2000
+					var _this = this
+					delete _this.dataDetails.hyCargoOwnerCompInfoList
+					_this.dataDetails.accountNumber = uni.getStorageSync("userInfo").phone
+					_this.$request.baseRequest('post', '/cargoOwnerInfo/api/editCargoOwner', _this.dataDetails).then(res => {
+							uni.hideLoading()
+							this.submitstatus=false
+							// console.log(res)
+							uni.$u.toast('提交成功')
+							uni.$u.route('/pages/mine/cargoowner/cargoowner')
 						})
-					});
+						.catch(res => {
+							console.log(res)
+							uni.hideLoading()
+							this.submitstatus=false
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				}
 			},
 			photograph() {
 				console.log('拍照')

pages/mine/company/addcompany.vue

@@ -310,6 +310,7 @@
 				index: '',
 				isShowimgType: false,
 				validityPeriod: [],
+				submitstatus:false,
 				checked: false,
 				checked1: false,
 				dataDetails: {
@@ -440,6 +441,13 @@
 					case 0:
 						if (e.value[0] == '长期') {
 							this.dataDetails.businessTermDate = e.value[0]
+							if(e.value[1]!=''||e.value[2]!=''){
+								this.$refs.uToast.show({
+									type: 'error',
+									message: "选择长期时不允许选择月日！",
+								})
+								return
+							}
 						} else {
 							var date = new Date()
 							if (e.value[0] < date.getFullYear()) {
@@ -470,6 +478,13 @@
 					case 1:
 						if (e.value[0] == '长期') {
 							this.dataDetails.cardValidityDate = e.value[0]
+							if(e.value[1]!=''||e.value[2]!=''){
+								this.$refs.uToast.show({
+									type: 'error',
+									message: "选择长期时不允许选择月日！",
+								})
+								return
+							}
 						} else {
 							var date = new Date()
 							if (e.value[0] < date.getFullYear()) {
@@ -749,36 +764,43 @@
 			},
 			submit() {
 				if (this.validate()) return
-				if (!this.consentStatus) {
-					uni.showToast({
-						title: '请勾选协议',
-						icon: 'none',
-						duration: 2000
-					})
-					return
-				}
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
-				var _this = this
-				this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
-						uni.hideLoading()
-						uni.$u.toast('提交成功')
-						uni.removeStorageSync("videoSrc")
-						uni.navigateBack({
-							delta: 1
-						})
-
-					})
-					.catch(res => {
-						uni.hideLoading()
+				if(!this.submitstatus){
+					this.submitstatus=true
+					
+					if (!this.consentStatus) {
 						uni.showToast({
-							title: res.message,
+							title: '请勾选协议',
 							icon: 'none',
 							duration: 2000
 						})
-					});
+						return
+					}
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					var _this = this
+					this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
+							uni.hideLoading()
+							uni.$u.toast('提交成功')
+							this.submitstatus=false
+							uni.removeStorageSync("videoSrc")
+							uni.navigateBack({
+								delta: 1
+							})
+					
+						})
+						.catch(res => {
+							uni.hideLoading()
+							this.submitstatus=false
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				}
+				
 			},
 			consent() {
 				this.consentStatus = !this.consentStatus

pages/mine/company/editcompany.vue

@@ -306,6 +306,7 @@
 				isShowcardValidity: false,
 				uploadType: '',
 				index: '',
+				submitstatus:false,
 				isShowimgType: false,
 				validityPeriod: [],
 				checked: false,
@@ -409,6 +410,13 @@
 					case 0:
 						if (e.value[0] == '长期') {
 							this.dataDetails.businessTermDate = e.value[0]
+							if(e.value[1]!=''||e.value[2]!=''){
+								this.$refs.uToast.show({
+									type: 'error',
+									message: "选择长期时不允许选择月日！",
+								})
+								return
+							}
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){
@@ -438,6 +446,13 @@
 					case 1:
 						if (e.value[0] == '长期') {
 							this.dataDetails.cardValidityDate = e.value[0]
+							if(e.value[1]!=''||e.value[2]!=''){
+								this.$refs.uToast.show({
+									type: 'error',
+									message: "选择长期时不允许选择月日！",
+								})
+								return
+							}
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){
@@ -645,35 +660,41 @@
 			},
 			submit() {
 				if (this.validate()) return
-				if (!this.consentStatus) {
-					uni.showToast({
-						title: '请勾选协议',
-						icon: 'none',
-						duration: 2000
-					})
-					return
-				}
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
-				var _this = this
-				this.$request.baseRequest('post', '/companyInfo/api/editCompanyInfo', _this.dataDetails).then(res => {
-						uni.hideLoading()
-						uni.$u.toast('提交成功')
-						uni.navigateBack({
-							delta: 1
-						})
-						// this.goDetailPage('/pages/mine/company/index')
-					})
-					.catch(res => {
-						uni.hideLoading()
+				if(!this.submitstatus){
+					this.submitstatus=true
+					if (!this.consentStatus) {
 						uni.showToast({
-							title: res.message,
+							title: '请勾选协议',
 							icon: 'none',
 							duration: 2000
 						})
-					});
+						return
+					}
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					var _this = this
+					this.$request.baseRequest('post', '/companyInfo/api/editCompanyInfo', _this.dataDetails).then(res => {
+							uni.hideLoading()
+							uni.$u.toast('提交成功')
+							this.submitstatus=false
+							uni.navigateBack({
+								delta: 1
+							})
+							// this.goDetailPage('/pages/mine/company/index')
+						})
+						.catch(res => {
+							uni.hideLoading()
+							this.submitstatus=false
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				}
+				
 			},
 			consent() {
 				this.consentStatus = !this.consentStatus

pages/mine/manageBankCards/addBankCard.vue

@@ -100,6 +100,7 @@
 				},
 				disabled:false,
 				imagesrc: '',
+				submitstatus:false,
 				columns: [
 
 				],
@@ -364,7 +365,9 @@
 				// 	});
 				console.log(this.name)
 				if (that.validate()) return //校验  511303198809243079
-				if (that.dataDetails.cardholderName != this.name&&this.name!='') {
+				if(!this.submitstatus){
+					this.submitstatus=true
+					if (that.dataDetails.cardholderName != this.name&&this.name!='') {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "收款人须为货主本人！",
@@ -392,6 +395,7 @@
 											message: "提交成功",
 										}
 										uni.hideLoading()
+										this.submitstatus=false
 										that.$refs.uToast.show({
 											...params
 										})
@@ -401,18 +405,23 @@
 										});
 					
 									} else {
+										this.submitstatus=false
 										uni.$u.toast(res.message);
 									}
 					
 								})
 								.catch(res => {
+									this.submitstatus
 									uni.$u.toast(res.message);
 								});
 						} else {
+							this.submitstatus=false
 							uni.$u.toast(response.data.distinguish);
 						}
 					})
 				}
+				}
+				
 				
 
 

pages/mine/manageBankCards/editBankCard.vue

@@ -70,6 +70,7 @@
 				dataDetails: {},
 				imagesrc: '',
 				bankType: [],
+				submitstatus:false,
 				isShowBank: false,
 				isShowManualInput: false,
 				index: ''

pages/order/driverDetail.vue

@@ -177,7 +177,7 @@
 		},
 		onLoad(options) {
 			this.dataObj =JSON.parse(options.driver) 
-			// console.log(this.dataObj)
+			console.log(this.dataObj)
 			that = this
 			// this.getList()
 		},
@@ -204,7 +204,7 @@
 				});
 			},
 			confirmBtn(e) {
-				console.log(e.value)
+				console.log(this.driverList)
 				if (e.value == '投诉') {
 					uni.$u.route('/pages/order/fk', {
 						val: JSON.stringify(this.driverList)
@@ -238,6 +238,10 @@
 					}).then(res => {
 						console.log(res.data)
 						that.driverList=res.data
+						if(that.dataObj){
+							that.driverList.orderId=that.dataObj.id
+							that.driverList.orderNo=that.dataObj.orderNo
+						}
 						if(res.data.hyDriverCarInfoList){
 							for (var i = 0; i < res.data.hyDriverCarInfoList.length; i++) {
 								res.data.hyDriverCarInfoList[i].carApprovedWeight=res.data.hyDriverCarInfoList[i].carApprovedWeight/1000

pages/order/fk.vue

@@ -8,6 +8,13 @@
 			</view>
 		</view>
 		<u-line class="line"></u-line>
+		<view class="row1 flex flex-space-between">
+			<view>关联订单（选填）</view>
+			<view style='align-items: center;' class='flex'>
+				<view @click='selectorder'>{{dataDetails.orderNo?dataDetails.orderNo:'选择订单'}}></view>
+			</view>
+		</view>
+		<u-line class="line"></u-line>
 		<view class="row2">
 			<view class="title">投诉信息</view>
 			<u--textarea v-model="value1" placeholder="输入要反馈的内容，10-300字" count maxlength='300'></u--textarea>
@@ -15,6 +22,9 @@
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
 		<view class="row3" @click="submit">提交</view>
+		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
+		</u-picker>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -24,14 +34,16 @@
 		mapState
 	} from 'vuex';
 	import uploadImage from '@/components/ossutil/uploadFile.js';
-	import permision from "@/js_sdk/wa-permission/permission.js"
+	import permision from "@/js_sdk/wa-permission/permission.js";
 	export default {
 		data() {
 			return {
 				imgList: [],
 				value1: '',
 				fileList1: [],
+				orderList:[],
 				dataDetails: {},
+				isShow:false,
 			};
 		},
 		computed: {
@@ -39,9 +51,36 @@
 		},
 		onLoad(options) {
 			this.dataDetails = JSON.parse(options.val)
+			console.log(this.dataDetails)
 			this.imgList = []
 		},
+		onShow(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
+				commonId: this.dataDetails.commonId,
+				cargoCommonId:this.userInfo.id
+			}).then(res => {
+				let that = this
+				uni.hideLoading()
+				this.orderList=[res.data]
+				// console.log(this.orderList)
+			})
+			.catch(res => {
+				uni.$u.toast(res.message);
+			});
+		},
 		methods: {
+			confirmorder(e){
+				console.log(e)
+				this.dataDetails.orderId=e.value[0].id
+				this.dataDetails.orderNo=e.value[0].orderNo
+				this.isShow=false
+			},
+			selectorder(){
+				this.isShow=true
+			},
 			submit() {
 				if (!this.value1) {
 					that.$refs.uToast.show({
@@ -67,6 +106,8 @@
 						passive: this.dataDetails.driverName,
 						passiveNumber: this.dataDetails.driverPhone,
 						passiveCommonId:this.dataDetails.commonId,
+						orderId:this.dataDetails.orderId,
+						orderNo:this.dataDetails.orderNo,
 						content: this.value1,
 						url: this.imgList.toString(),
 						flag: 1,
@@ -78,9 +119,9 @@
 							type: 'success',
 							message: "反馈成功",
 							complete() {
-								uni.$u.route('/pages/order/driverDetail',{
-									driver:JSON.stringify(that.dataDetails)
-								});
+								uni.navigateBack({
+									delta:1
+								})
 								
 							}
 						})

pages/order/index.vue

@@ -14,10 +14,11 @@
 							}"></u-tabs>
 			</view> -->
 		<view class="top-content">
-
-			<view class="fixed1"></view>
+			
+				<view class="fixed1"></view>
 			<view class="fix-content">
-				<u-search placeholder="搜索订单" v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
+				<u-search placeholder="搜索订单" 
+				v-model="searchKeyWord" bgColor='white' :actionStyle='searchStyle'
 					@custom="getSearch" @search="getSearch" :clearabled="true"></u-search>
 				<view class="tab-content">
 					<u-tabs :list="tabList" @click="clickTab" lineColor='transparent' :current='tabIndex'
@@ -38,7 +39,7 @@
 					</view>
 				</view>
 			</view>
-
+		
 		</view>
 		<view class="all-menu">
 			<u-transition :show="showMenu" mode="fade">
@@ -51,19 +52,18 @@
 			</u-transition>
 			<view class="modal-black" v-show="showMenu" @click="closeMenu"></view>
 		</view>
-		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			class="mescroll">
-			<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10" @click="evaluationRecord">
-				<view class="left flex flex-space-between">
-					<!-- <u-icon size="20" name="edit-pen"></u-icon> -->
-					<image class="pingjia" src="@/static/images/order/pingjia.png"></image>
-					<view style="margin-left: 20prx;">我的评价</view>
-				</view>
-				<view class="right">
-					<image style='width:12px;height:12px;' src="@/static/images/order/right.png"></image>
-					<!-- <u-icon size="20" name="arrow-right"></u-icon> -->
-				</view>
-			</view>
+		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+	<view class="evaluatePage flex flex-space-between" v-show="tabIndex == 10"  @click="evaluationRecord">
+		<view class="left flex flex-space-between">
+			<!-- <u-icon size="20" name="edit-pen"></u-icon> -->
+			<image class="pingjia" src="@/static/images/order/pingjia.png"></image>
+			<view style="margin-left: 20prx;">我的评价</view> 
+		</view>
+		<view class="right">
+			<image style='width:12px;height:12px;' src="@/static/images/order/right.png"></image>
+				<!-- <u-icon size="20" name="arrow-right"></u-icon> -->
+		</view>
+		</view>
 			<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
 				@click="toDetail(good.id)">
 				<view style="padding: 0 35rpx 20rpx 35rpx;">
@@ -79,9 +79,7 @@
 					<view class="flex row2">
 						<view class="left">
 							<view class="top">
-								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
-								</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
 								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}</view>
 							</view>
 							<view class="bottom">{{$helper.filterArea(good.sendArea)}}</view>
@@ -106,20 +104,15 @@
 					<view class="flex row3 s-row">
 						<view class="flex align-center">
 							<image class="hz" src="@/static/images/news/sj.png"></image>
-							<view style="margin-right: 20rpx;" @click.stop="goTodriverDetail(good)">{{good.driverName}}
-							</view>
+							<view style="margin-right: 20rpx;" @click.stop="goTodriverDetail(good)">{{good.driverName}}</view>
 							<!-- <view style="margin-right: 20rpx;">{{good.driverCall}}</view> -->
 							<image class="hz-good" src="@/static/images/order/good-img.png"></image>
 							<view>{{good.goodsName}}</view>
 						</view>
 						<view class="flex align-center">
 							<view style="margin-right: 20rpx;">运距 {{good.distance}}km</view>
-							<view v-if="good.cargoOwnerStatus!='已完结'" class="car">
-								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
-							</view>
-							<view v-else class="car">
-								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
-							</view>
+							<view v-if="good.cargoOwnerStatus!='已完结'" class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
+							<view v-else class="car">{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}</view>
 						</view>
 						<!-- 		<view class="right">
 							<view class="flex fontsize-26 row">
@@ -140,8 +133,7 @@
 						<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
 							@click.stop="toMap(good)">
 						</image> -->
-						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'"
-							class="start normal look-map" @click.stop="toMap(good)">
+						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'" class="start normal look-map" @click.stop="toMap(good)">
 							查看轨迹</view>
 						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受
 						</view>
@@ -152,16 +144,14 @@
 						<!-- <view class="stop active" @click.stop="stop(good)">终止</view> -->
 
 						<!-- confirmLoading(good,3) -->
-						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal"
-							@click.stop="toDetail(good.id)">确认装车</view>
-						<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal"
-							@click.stop="toDetail(good.id)">确认运费</view>
+						<view v-if="good.cargoOwnerStatus=='待确认装车'" class="start normal" @click.stop="toDetail(good.id)"
+							>确认装车</view>
+						<view v-if="good.cargoOwnerStatus=='司机驳回运费信息'" class="start normal" @click.stop="toDetail(good.id)">确认运费</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,1)">确认装车</view> -->
-						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'"
-							@click.stop="$helper.contactCustomerService()">
+						<view class="start normal" v-if="good.cargoOwnerStatus!='待接单'&&good.cargoOwnerStatus!='未装车'" @click.stop="$helper.contactCustomerService()">
 							联系客服</view>
-						<view class="start normal" @click.stop="toDetail(good.id)" v-if="good.cargoOwnerStatus=='待收货'">
-							确认卸车</view>
+							<view class="start normal" @click.stop="toDetail(good.id)"
+								v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view>
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,4)"
 							v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view> -->
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
@@ -169,10 +159,8 @@
 						<!-- <view class="normal" @click.stop="stop(good)"
 							v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view> -->
 
-						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> -->
-						<!-- driverEvaluated 为1是已评价过-->
-						<view class="start normal" @click.stop="addevaluation(good)"
-							v-if="good.cargoOwnerStatus=='已完结' && good.ownerEvaluated != 1">评价</view>
+						<!-- <view class="start normal" @click.stop="addevaluation(good)"  v-if="good.cargoOwnerStatus=='已完结'">评价</view> --><!-- driverEvaluated 为1是已评价过-->
+						<view class="start normal" @click.stop="addevaluation(good)" v-if="good.cargoOwnerStatus=='已完结' && good.ownerEvaluated != 1"  >评价</view>
 					</view>
 				</view>
 			</view>
@@ -204,27 +192,26 @@
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
 			<view class="">
-				<view>
-					<image style='width:12px;height:12px;' @click='closepopup' class='close'
-						src="../../static/images/order/guanbi@3x.png" mode=""></image>
+				<view >
+					<image style='width:12px;height:12px;' @click='closepopup' class='close'  src="../../static/images/order/guanbi@3x.png" mode=""></image>
 					<!-- <u-icon @click="closepopup" class='close' name="close" size="20"></u-icon> -->
 				</view>
-
+				
 				<view style='fon-size:34rpx;margin-bottom:20px;text-align:center;font-weight: 600;'>确认终止订单</view>
 				<view style="margin: 0 auto;">
-					<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="">
-						<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>
-				</view>
-				<view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
-				<view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
-				<u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
-				</u--textarea>
-				<view class='termination' :class="{'active':value2.length>0}" @click='termination'>终止</view>
+		           	<u-radio-group iconPlacement="right" v-model="radiovalue1" placement="" >
+		           	<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>
+		           </view>
+				   <view style='border-top:10px solid #F2F4F7;position:absolute;left:0;height:0;width:100%;'></view>
+		           <view style='padding:40rpx 0 30rpx;'>终止原因描述</view>
+		           <u--textarea class="row" v-model="value2" placeholder="终止原因描述" count maxlength='50'>
+		           </u--textarea>
+				   <view class='termination' :class="{'active':value2.length>0}" @click='termination'>终止</view>
 			</view>
-
+		           
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -241,14 +228,14 @@
 		apiGoods
 	} from "@/api/mock.js"
 	export default {
-		components: {
+		components:{
 			uniPopup
 		},
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
 				confirmText: '',
-				show: false,
+				show:false,
 				showCancelButton: true,
 				type: null,
 				objData: {},
@@ -259,16 +246,16 @@
 					position: "absolute",
 					right: "30rpx",
 					padding: "6rpx 20rpx",
-					margin: '0 20rpx 0 0',
+					margin:'0 20rpx 0 0',
 					"border-radius": '30rpx'
 				},
 				upOption: {
 					page: {
-						size: 10 // 每页数据的数量,默认10
-					},
-					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+												size: 10 // 每页数据的数量,默认10
+											},
+											noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						tip: ''
+						tip: '暂无相关数据'
 					}
 				},
 				searchKeyWord: '',
@@ -278,22 +265,22 @@
 				id: '',
 				value2: '',
 				radiolist1: [{
-						name: '已与货主协商',
+						name: '已与司机协商',
 						disabled: false
 					},
 					{
-						name: '货主原因终止',
+						name: '司机原因终止',
 						disabled: false
 					},
 					{
-						name: '司机个人原因终止',
+						name: '货主个人原因终止',
 						disabled: false
 					}, {
 						name: '其他',
 						disabled: false
 					}
 				],
-				radiovalue1: '已与货主协商',
+				radiovalue1: '已与司机协商',
 				confirmText: '终止',
 				alertTitle: '确定终止订单？',
 				alertContent: "",
@@ -366,7 +353,7 @@
 		// 		if(res.data){
 		// 			return res.data.authenticationStatus
 		// 		}
-
+				
 		// 	})
 		// 	if (_status == '已禁用') {
 		// 		this.isShowAlert = true
@@ -387,7 +374,7 @@
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 				reCommonId: this.userInfo.id,
 			}).then(res3 => {
-				if (res3.data || res3.data == 0) {
+				if (res3.data||res3.data==0) {
 					let name = 'myTip';
 					let value = res3.data
 					if (value == 0) {
@@ -429,23 +416,21 @@
 
 		// },
 		methods: {
-			closepopup() {
-				this.show = false
+			closepopup(){
+				this.show=false
 			},
-			close() {
-				this.show = false
+			close(){
+				this.show=false
 			},
-			goTodriverDetail(val) {
-				uni.$u.route('/pages/order/driverDetail', {
-					driver: JSON.stringify(val)
+			goTodriverDetail(val){
+				uni.$u.route('/pages/order/driverDetail',{
+					driver:JSON.stringify(val)
 				});
 			},
-			addevaluation(val) {
-				uni.$u.route('/pages/order/addEvaluation', {
-					val: JSON.stringify(val)
-				});
+			addevaluation(val){
+					uni.$u.route('/pages/order/addEvaluation',{val:JSON.stringify(val)});
 			},
-			evaluationRecord() {
+			evaluationRecord(){
 				uni.$u.route('/pages/order/evaluationRecord');
 			},
 			toMap(val) {
@@ -526,7 +511,7 @@
 				// } else {
 				// 	this.isShowTerminationReason = true
 				// }
-				// this.alertTitle = '确定终止订单？'
+					// this.alertTitle = '确定终止订单？'
 				this.id = item.id
 				this.show = true
 			},
@@ -536,44 +521,45 @@
 			del() {
 				this.isShowAlert = true
 			},
-			termination() {
-				var that = this
+			termination(){
+				var that=this
 				let _terminationReason = ''
-				if (this.radiovalue1 == '已与货主协商') {
+				if (this.radiovalue1 == '已与司机协商') {
 					_terminationReason = 1
-				} else if (this.radiovalue1 == '货主原因终止') {
+				} else if (this.radiovalue1 == '司机原因终止') {
 					_terminationReason = 2
-				} else if (this.radiovalue1 == '司机个人原因终止') {
+				} else if (this.radiovalue1 == '货主个人原因终止') {
 					_terminationReason = 3
 				} else if (this.radiovalue1 == '其他') {
 					_terminationReason = 4
 				}
-				this.$request.baseRequest('post', '/orderInfo/api/end', {
-						id: this.id,
-						terminator: 2,
-						terminationReason: _terminationReason,
-						terminationReasonDescription: this.value2
-					}).then(res => {
-						if (res.code == 200) {
-							this.show = false
-							this.$refs.uToast.show({
-								type: 'success',
-								message: '终止订单成功',
-							})
-						} else {
-							this.$refs.uToast.show({
-								type: 'success',
-								message: '终止订单失败',
-							})
-						}
-						that.mescroll.resetUpScroll()
-					})
-					.catch(res => {
-						uni.$u.toast(res.message);
-					});
+					this.$request.baseRequest('post', '/orderInfo/api/end', {
+							id: this.id,
+							terminator: 2,
+							terminationReason: _terminationReason,
+							terminationReasonDescription: this.value2
+						}).then(res => {
+							if (res.code == 200) {
+								this.show=false
+								this.value2=''
+								this.$refs.uToast.show({
+									type: 'success',
+									message: '终止订单成功',
+								})
+							} else {
+								this.$refs.uToast.show({
+									type: 'success',
+									message: '终止订单失败',
+								})
+							}
+							that.mescroll.resetUpScroll()
+						})
+						.catch(res => {
+							uni.$u.toast(res.message);
+						});
 			},
 			confirmClick() {
-				var that = this
+				var that =this
 				// // #ifdef APP-PLUS
 				// if (this.alertTitle == '账号审核中') {
 				// 	if (uni.getSystemInfoSync().platform == 'ios') {
@@ -601,10 +587,7 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({
-											size: 10,
-											num: 1
-										})
+										that.upCallback({size: 10,num: 1})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -618,10 +601,7 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({
-											size: 10,
-											num: 1
-										})
+										that.upCallback({size: 10,num: 1})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -656,7 +636,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				}
+				} 
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -721,16 +701,12 @@
 </script>
 
 <style scoped lang="scss">
-	.content {
+	.content{
 		padding-bottom: 160px;
-		background: white;
 	}
-
-	.ssx {
-		position: relative;
-		top: 3rpx;
+	.ssx{
+		position:relative;top:3rpx;
 	}
-
 	.top-content {
 		background: url(../../static/images/order/bg.png) no-repeat;
 		background-size: cover;
@@ -741,8 +717,7 @@
 		// margin-top: var(--status-bar-height);
 		// padding-bottom: 320rpx;
 	}
-
-	.fix-content {
+	.fix-content{
 		// width: 96%;
 		margin-right: 20rpx;
 	}
@@ -1098,53 +1073,46 @@
 
 	.look-map {
 		background: #2772FB;
-		border: 1px solid #2772FB;
+		border:1px solid #2772FB;
 		color: white;
 	}
-
-	.evaluatePage {
+	.evaluatePage{
 		background: white;
 		margin: 20rpx;
 		padding: 20rpx;
 		border-radius: 20rpx;
 	}
-
-	/deep/.u-popup__content {
+	/deep/.u-popup__content{
 		border-radius: 10px;
-		padding: 20px;
+		padding:20px;
 	}
-
-	/deep/.u-radio {
-		margin: 40rpx 0;
+	/deep/.u-radio{
+		margin:40rpx 0;
 	}
-
-	.close {
-		position: absolute;
-		right: 20px;
-		top: 26px;
+	.close{
+		position:absolute;
+		right:20px;
+		top:26px;
 	}
-
-	.termination {
-		background: #F1F3F6;
-		color: #C5CAD4;
-		padding: 10px;
-		border-radius: 30px;
+	.termination{
+		background:#F1F3F6;
+		color:#C5CAD4;
+		padding:10px;
+		border-radius:30px;
 		text-align: center;
-		margin-top: 30rpx;
+		margin-top:30rpx;
 	}
-
-	.termination.active {
+	.termination.active{
 		background: #2772FB;
 		color: white;
 	}
-
-	.quanbu {
-		width: 16px;
-		height: 16px;
+	.quanbu{
+		width:16px;
+		height:16px;
 	}
-
-	.pingjia {
-		width: 14px;
-		height: 14px;
+	.pingjia{
+		width:14px;
+		height:14px;
 	}
+	
 </style>

pages/order/jb.vue

@@ -8,6 +8,13 @@
 			</view>
 		</view>
 		<u-line class="line"></u-line>
+		<view class="row1 flex flex-space-between">
+			<view>关联订单（选填）</view>
+			<view style='align-items: center;' class='flex'>
+				<view @click='selectorder'>{{dataDetails.orderNo?dataDetails.orderNo:'选择订单'}}></view>
+			</view>
+		</view>
+		<u-line class="line"></u-line>
 		<view class="row2">
 			<view class="title">举报信息</view>
 			<u--textarea v-model="value1" placeholder="输入要举报的内容，10-300字" count maxlength='300'></u--textarea>
@@ -15,6 +22,9 @@
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
 		<view class="row3" @click="submit">提交</view>
+		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
+			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
+		</u-picker>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -32,7 +42,9 @@
 				imgList: [],
 				value1: '',
 				fileList1: [],
+				orderList:[],
 				dataDetails: {},
+				isShow:false,
 			};
 		},
 		computed: {
@@ -44,7 +56,33 @@
 			console.log(this.dataDetails)
 			this.imgList = []
 		},
+		onShow(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder',{
+				commonId: this.dataDetails.commonId,
+				cargoCommonId:this.userInfo.id
+			}).then(res => {
+				let that = this
+				uni.hideLoading()
+				this.orderList=[res.data]
+				// console.log(this.orderList)
+			})
+			.catch(res => {
+				uni.$u.toast(res.message);
+			});
+		},
 		methods: {
+			confirmorder(e){
+				console.log(e)
+				this.dataDetails.orderId=e.value[0].id
+				this.dataDetails.orderNo=e.value[0].orderNo
+				this.isShow=false
+			},
+			selectorder(){
+				this.isShow=true
+			},
 			async get_camera_permission() {
 				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
 				if(photol == false){
@@ -87,6 +125,8 @@
 						commonId: this.userInfo.id,
 						passive: this.dataDetails.driverName,
 						passiveNumber: this.dataDetails.driverPhone,
+						orderId:this.dataDetails.orderId,
+						orderNo:this.dataDetails.orderNo,
 						passiveCommonId:this.dataDetails.commonId,
 						content: this.value1,
 						url: this.imgList.toString(),

pages/order/orderDetails.vue

@@ -20,7 +20,7 @@
 			<!-- flex flex-space-between -->
 			<view class="item2">
 
-				<u-button class="btn" text="驳回" @click="accept(2)" v-if="dataObj.cargoOwnerStatus=='待接单'">
+				<u-button class="btn" text="拒绝" @click="accept(2)" v-if="dataObj.cargoOwnerStatus=='待接单'">
 				</u-button>
 				<u-button class="btn" text="接受" @click="accept(1)" v-if="dataObj.cargoOwnerStatus=='待接单'">
 				</u-button>
@@ -361,22 +361,22 @@
 				show:false,
 				value2: '',
 				radiolist1: [{
-						name: '已与货主协商',
+						name: '已与司机协商',
 						disabled: false
 					},
 					{
-						name: '货主原因终止',
+						name: '司机原因终止',
 						disabled: false
 					},
 					{
-						name: '司机个人原因终止',
+						name: '货主个人原因终止',
 						disabled: false
 					}, {
 						name: '其他',
 						disabled: false
 					}
 				],
-				radiovalue1: '已与货主协商',
+				radiovalue1: '已与司机协商',
 				confirmText: '终止',
 				alertTitle: '确定终止订单？',
 				alertContent: "",
@@ -703,11 +703,11 @@
 											return
 										}
 										let _terminationReason = ''
-										if (this.radiovalue1 == '已与货主协商') {
+										if (this.radiovalue1 == '已与司机协商') {
 											_terminationReason = 1
-										} else if (this.radiovalue1 == '货主原因终止') {
+										} else if (this.radiovalue1 == '司机原因终止') {
 											_terminationReason = 2
-										} else if (this.radiovalue1 == '司机个人原因终止') {
+										} else if (this.radiovalue1 == '货主个人原因终止') {
 											_terminationReason = 3
 										} else if (this.radiovalue1 == '其他') {
 											_terminationReason = 4
@@ -720,6 +720,7 @@
 											}).then(res => {
 												if (res.code == 200) {
 													that.show=false
+													that.value2=''
 													this.$refs.uToast.show({
 														type: 'success',
 														message: '终止订单成功',
@@ -747,11 +748,11 @@
 						return
 					}
 					let _terminationReason = ''
-					if (this.radiovalue1 == '已与货主协商') {
+					if (this.radiovalue1 == '已与司机协商') {
 						_terminationReason = 1
-					} else if (this.radiovalue1 == '货主原因终止') {
+					} else if (this.radiovalue1 == '司机原因终止') {
 						_terminationReason = 2
-					} else if (this.radiovalue1 == '司机个人原因终止') {
+					} else if (this.radiovalue1 == '货主个人原因终止') {
 						_terminationReason = 3
 					} else if (this.radiovalue1 == '其他') {
 						_terminationReason = 4
@@ -764,6 +765,7 @@
 						}).then(res => {
 							if (res.code == 200) {
 								that.show=false
+								that.value2=''
 								this.$refs.uToast.show({
 									type: 'success',
 									message: '终止订单成功',

pages/public/login.vue

@@ -9,45 +9,16 @@
 				class="flex">
 				<view class="phone-before-num NumberMedium">+86</view>
 				<view style='width:85%;'>
-					<!-- <u--input class="phone-number" border="none" maxlength='11' v-model='phone'
-						placeholder="请输入手机号码" type="number"></u--input>
-					<u-input /> -->
 					<input class='phone' maxlength='11' v-model='phone'  placeholder="请输入手机号码" type="number">
-					<!-- <u--input v-model="phone" border="none" type='number' placeholder="请输入手机号码" class="phone-number"
-						maxlength='11' :clearable='true'></u--input> -->
 				</view>
 			</view>
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
-				<!-- <u--input class='password' border="none" v-model='password'
-					placeholder="请输入密码，6-16位字符" :type="type" value="">
-					</u--input> -->
 				<view style='position:relative;'>
-					
 					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
 					<input class='password' v-model='password' v-else type="text" placeholder="请输入密码">
-					<!-- <u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
-							v-if="isShowPassword=='password'"></u-icon>
-					<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
-						</u-icon> -->
 						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/xianshi.png" mode=""></image>
 						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(2)" v-else src="../../static/yioncang.png" mode=""></image>
 				</view>
-				<!-- <u-input v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					type="password" :clearable='true'>
-					
-					<template slot="suffix">
-						
-					</template>
-				</u-input>
-				<u-input v-else class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
-					type="text" :clearable='true'>
-					<template slot="suffix">
-						<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
-							v-if="isShowPassword=='password'"></u-icon>
-						<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
-						</u-icon>
-					</template>
-				</u-input> -->
 			</view>
 			<button :class='phone!=""&&password!=""?"active":""' @click='passlogin'
 				class='Regular verificationCode'>登录</button>

pages/release/editRelease.vue

@@ -59,11 +59,41 @@
 				<input type="text" value="" class="input" placeholder="自动计算" v-model="dataObj.distance" disabled="" />
 				<view>Km</view>
 			</view>
+			<view class="row">
+				<view class="left">货物类别</view>
+				<view class="right" @click="goodstypeChange">{{dataObj.goodsType?dataObj.goodsType:"请选择货物类别"}}</view>
+			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right"><input type="text" class="input" value="" placeholder="输入货物名称"
 						v-model="dataObj.goodsName" /></view>
 			</view>
+			<view class="row">
+				<view class="left">收货方</view>
+				<view class="right flex">
+					<input type="text" value="" placeholder="输入收货人姓名或企业名称" class="input" v-model="dataObj.receiver" />
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货方手机号</view>
+				<view class="right flex">
+					<input type="number" maxlength="11" placeholder="输入收货方手机号" class="input"
+						v-model="dataObj.receiverPhone" />
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">收货人身份证号</view>
+				<view class="right flex">
+					<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 maxlength="18" placeholder="统一社会信用代码" class="input" v-model="dataObj.receiverCreditCode" />
+				</view>
+			</view>
 			<view class="flex row">
 				<view class="left-text">运费计算方式</view>
 				<u-radio-group placement="row" v-model="dataObj.billingMethod" class="select-type">
@@ -102,19 +132,7 @@
 						v-model="dataObj.senderPhone" />
 				</view>
 			</view>
-			<view class="row">
-				<view class="left">收货联系人</view>
-				<view class="right flex">
-					<input type="text" value="" placeholder="输入收货联系人姓名" class="input" v-model="dataObj.receiver" />
-				</view>
-			</view>
-			<view class="row">
-				<view class="left">收货联系人电话</view>
-				<view class="right flex">
-					<input type="number" maxlength="11" placeholder="输入收货联系人手机号" class="input"
-						v-model="dataObj.receiverPhone" />
-				</view>
-			</view>
+			
 			<view class="row">
 				<view class="left">重量（吨）</view>
 				<view class="right flex">
@@ -365,6 +383,19 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			goodstypeChange(){
+				this.isGoodsType = true
+			},
+			goodsSubmit(e){
+				this.dataObj.goodsType = e.value[0].constValue
+				this.dataObj.goodsTypeKey = e.value[0].constKey
+				let _obj={
+					name:e.value[0].constValue,
+					key:e.value[0].constKey
+				}
+				uni.setStorageSync("goodsType",_obj)
+				this.isGoodsType = false
+			},
 			getSFList() {
 				this.dataObj.commonId = this.userInfo.id
 				this.$request.baseRequest('get', '/cargoOwnerCompInfo/cargoOwnerList', {

pages/release/release.vue

@@ -411,8 +411,12 @@
 				this.dataObj.sendDetailedAddress = _faddress.detailedAddress
 				this.dataObj.sendLongitude = _faddress.longitude
 				this.dataObj.sendLatitude = _faddress.latitude
-				this.dataObj.senderPhone = _faddress.contactPhone
-				this.dataObj.sender = _faddress.contacts
+				if(_faddress.contactPhone){
+					this.dataObj.senderPhone = _faddress.contactPhone
+				}
+				if(_faddress.contacts){
+					this.dataObj.sender = _faddress.contacts
+				}
 			} else {
 				this.getDefaultPlace(0)
 			}
@@ -423,8 +427,12 @@
 				this.dataObj.unloadPrivate = _saddress.province
 				this.dataObj.unsendLongitude = _saddress.longitude
 				this.dataObj.unsendLatitude = _saddress.latitude
-				this.dataObj.receiver = _saddress.contacts
-				this.dataObj.receiverPhone = _saddress.contactPhone
+				if(_saddress.contacts){
+					this.dataObj.receiver = _saddress.contacts
+				}
+				if(_saddress.contactPhone){
+					this.dataObj.receiverPhone = _saddress.contactPhone
+				}
 			} else {
 				this.getDefaultPlace(1)
 			}
@@ -598,6 +606,8 @@
 					})
 					return true
 				}
+				console.log(this.dataObj.receiver,"收货方")
+				console.log(this.dataObj.receiverPhone,"收货方手机号")
 				if (uni.$u.test.isEmpty(this.dataObj.receiver)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -634,14 +644,14 @@
 				// 	})
 				// 	return true
 				// }
-				if(this.dataObj.receiverIdcard&&this.dataObj.receiverIdcard.length !=18){
+				if(this.dataObj.receiverIdcard&&this.dataObj.receiverIdcard.length!=18){
 					this.$refs.uToast.show({
 							type: 'error',
 							message: "身份证号输入错误！",
 						})
 						return true
 				}
-				if(this.dataObj.receiverCreditCode&&!uni.$u.test.rangeLength(this.dataObj.receiverCreditCode, [18, 18])){
+				if(this.dataObj.receiverCreditCode&&this.dataObj.receiverCreditCode.length!=18){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "信用代码输入错误！",
@@ -789,6 +799,12 @@
 				} else {
 					this.dataObj.freightAdvance = 0
 				}
+				if(this.dataObj.receiverIdcard){
+					this.dataObj.receiverIdcard=''
+				}
+				if(this.dataObj.receiverCreditCode){
+					this.dataObj.receiverCreditCode=''
+				}
 				let _list = []
 				for (let i = 0; i < this.checkboxValue1.length; i++) {
 					if (this.checkboxValue1[i] == '不限') {

util/request.js

@@ -29,7 +29,7 @@ const baseRequest = (method, url, data, header) => {
 			} else {
 				uni.request(baseDefaultOpts).then(
 					(res) => {
-						console.log(JSON.stringify(res[1].data))
+						// console.log(JSON.stringify(res[1].data))
 						// if(res[1].data.code == '200' || res[1].data.code == 200){
 						// 	// 后端返回的状态码100为成功状态,成功则返回请求结果,在app调试时可以通过console.log(JSON.stringify(res[1].data))来查看返回值（以项目实际情况为准）
 						// 	resolve(res[1].data)