前端

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

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

@@ -190,6 +190,19 @@
 			...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

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
+					console.log( _this.dataDetails,122121)
+					_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

@@ -314,6 +314,7 @@
 				index: '',
 				isShowimgType: false,
 				validityPeriod: [],
+				submitstatus:false,
 				checked: false,
 				checked1: false,
 				dataDetails: {
@@ -452,6 +453,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()){
@@ -481,6 +489,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()){
@@ -743,36 +758,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/order/fk.vue

@@ -7,10 +7,11 @@
 				<view>{{dataDetails.driverName}}</view>
 			</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}}></view>
+				<view @click='selectorder'>{{dataDetails.orderNo?dataDetails.orderNo:'选择订单'}}></view>
 			</view>
 		</view>
 		<u-line class="line"></u-line>
@@ -21,7 +22,7 @@
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
 		<view class="row3" @click="submit">提交</view>
-		<u-picker :show="isShow" ref="uPicker" keyName="label" :columns="orderList" @confirm="confirmorder"
+		<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>
@@ -50,28 +51,32 @@
 		},
 		onLoad(options) {
 			this.dataDetails = JSON.parse(options.val)
-		console.log(11111,this.dataDetails)
+			console.log(this.dataDetails)
 			this.imgList = []
 		},
 		onShow(){
 			uni.showLoading({
 				title: '加载中'
 			})
-			this.$request.baseRequest('get', '/orderInfo/getAssociatedOrder', {
-					commonId: this.dataDetails.id,
-					cargoCommonId:this.userInfo.id
-				}).then(res => {
-					let that = this
-					uni.hideLoading()
-					this.orderList=res.data
-				})
-				.catch(res => {
-					uni.$u.toast(res.message);
-				});
+			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
@@ -101,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,

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/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/release.vue

@@ -634,14 +634,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 +789,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] == '不限') {