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

App.vue

@@ -169,8 +169,8 @@
 									content='身份信息已过期！'
 									confirmtext='立即修改'
 								}else{
-									content='身份信息未认证，去认证?'
-									confirmtext='确认'
+									content='身份信息未认证！'
+									confirmtext='去认证'
 								}
 								let options = {
 								    title: '提示', 

config/index.js

@@ -1,11 +1,11 @@
 const dev = {
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }
 
 export function def() {
 	return dev
-}
-
+}

pages/carSource/index.vue

@@ -132,8 +132,8 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<u-modal :show="tipsShow" :content='tipsText' :confirmText="btnTips" @confirm="authentication"></u-modal>
+			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		<u-modal :show="tipsShow" :content='tipsText' :confirmText="btnTips" @confirm="$u.throttle(authentication(), 5000)"></u-modal>
 	</view>
 </template>
 

pages/mine/agentCargoOwner.vue

@@ -34,7 +34,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</mescroll-body>
 </template>

pages/mine/cargoowner/addEnerprise.vue

@@ -4,27 +4,27 @@
 		<view class="wrap">
 			<view style='border-bottom:1px solid #eee;padding:10px 0 10px;' class="flex flex-space-between row">
 				<view class="left-text">企业</view>
-				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectshow">
+				<view style='' class='flex flex-space-between' @click="selectshow">
 					<view :style="{'color':dataDetails.company ? '#000':'#C6CBD5'}">
 						{{dataDetails.company?dataDetails.company:'选择所属企业'}}
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<u-icon name="arrow-right" color="#ccc" size="14"></u-icon>
 					</view>
 				</view>
 
 			</view>
-			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center width100">
-				<view style='width:100px;font-size:14px;'>法定代表人姓名</view>
+			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center ">
+				<view style=''>法定代表人姓名</view>
 				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='right' border="none"
 						v-model="legalPersonName">
 					</u--input>
 				</view>
 			</view>
 		</view>
 		<view class='content1'>
-			<view class="flex">
+			<view class="flex flex-space-between">
 				<view class="title">上传企业授权书</view>
 				<view class="title title_css" @click="formWork">授权书模板</view>
 			</view>
@@ -44,7 +44,7 @@
 				</view>
 				<nk-select-file v-model="show" @confirm="getPath"></nk-select-file> -->
 			<u-upload class="uview-upload" :fileList="fileList1" @beforeRead='beforeRead($event)'
-				@afterRead="afterRead($event)" @delete="deletePic" name="1" multiple :maxCount="9"></u-upload>
+				@afterRead="afterRead($event)" @delete="deletePic" name="1" multiple :maxCount="1"></u-upload>
 			<!-- 		<view style='position:relative;'>
 				<view v-if='!dataDetails.certificateAddressUrl' @click="uploadImg(1)" class="picture picture7">
 					<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
@@ -59,14 +59,14 @@
 				<image class="" :src="dataDetails.certificateAddressUrl" mode="aspectFit"></image>
 			</view>
 			</view> -->
-			<view class="flex row noborder">
+			<view class="flex row noborder flex-space-between">
 				<view class="left-text">授权截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectdate">
+				<view style='' class='flex flex-space-between' @click="selectdate">
 					<view :style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">
 						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<u-icon name="arrow-right" color="#ccc" size="14"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -81,15 +81,15 @@
 			@close="isShowimgType=false">
 		</u-action-sheet>
 		<view class="content4">
-			<view style='margin:0 0 18px;font-size:16px;color:#999;' class='flex items-center'>
-				<u--image style='margin-right:5px;margin-top: 16rpx;' @click='consent'
+			<view style='margin:0 0 18px;color:#999;' class='flex items-center align-center'>
+				<u--image style='margin-right:5px;' @click='consent'
 					:src="checked?'../../../static/mine/duihao@2x.png':'../../../static/mine/wxz.png'" width="12px"
 					height="12px"></u--image>
 				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
 			<!-- :class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}" -->
-			<view class="next-btn active" @click="submit()">
+			<view class="next-btn active" @click="$u.throttle(submit, 5000)">
 				提交
 			</view>
 		</view>
@@ -226,13 +226,13 @@
 				uploadImage('image', url, 'appData/',
 					result => {
 						// 上传成功回调函数
-						this.urlList.push(result)
+						this.urlList = result
 					}
 				)
 			},
 			// 删除图片
 			deletePic(event) {
-				this.urlList = this.urlList.splice(event.index, 1)
+				this.urlList = ""
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
@@ -288,43 +288,52 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.authorizationDeadline = e.value[0]
+					
 				} else {
-					if(e.value[0]==''){
+					if (e.value[0] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "年份不能为空！",
 						})
 						return
-					}else if(e.value[1]==''){
+					} else if (e.value[1] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "月份不能为空！",
 						})
 						return
-					}else if(e.value[2]==''){
+					} else if (e.value[2] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "日期不能为空！",
 						})
 						return
 					}
-					var date=new Date()
-					if(e.value[0]<date.getFullYear()){
+					var date = new Date()
+					if (e.value[0] < date.getFullYear()) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e.value[
+							2]) <= (date.getDate())) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
@@ -426,16 +435,17 @@
 				if (this.validate()) {
 					return
 				}
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
+				// uni.showLoading({
+				// 	title: '加载中',
+				// 	mask: true
+				// })
+				// debugger
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
-				this.dataDetails.certificateAddressUrl = this.urlList.toString()
+				this.dataDetails.certificateAddressUrl = this.urlList
 				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/addCargoOwnerComp', _this.dataDetails).then(
 						res => {
-							uni.hideLoading()
+							// uni.hideLoading()
 							// uni.removeStorage('cargoOwnerId')
 							// uni.removeStorage('currectcompany')
 							uni.removeStorageSync('cargoOwnerId')
@@ -446,7 +456,7 @@
 							})
 						})
 					.catch(res => {
-						uni.hideLoading()
+						// uni.hideLoading()
 						uni.showToast({
 							title: res.message,
 							icon: 'none',
@@ -493,8 +503,8 @@
 
 	.content1 {
 		background: #fff;
-		padding: 40rpx 20rpx 20rpx;
-		margin: 20rpx 0rpx 0;
+		padding: 20rpx;
+		margin: 20rpx;
 		border-radius: 10rpx;
 
 		.row {
@@ -510,7 +520,6 @@
 			color: #333333;
 			display: flex;
 			align-items: center;
-			font-size: 14px;
 		}
 
 		.picture {
@@ -539,22 +548,15 @@
 		}
 
 		.title {
-			width: 50%;
 			color: #999999;
-			margin: 20rpx 0;
 		}
 
 		.title_css {
-			text-align: right;
 			color: #2772FB;
-			margin: 20rpx 0;
-			font-size: 30rpx;
 		}
 	}
 
-	.u-input {
-		font-size: 16px;
-	}
+	.u-input {}
 
 	.content4 {
 		position: fixed;

pages/mine/cargoowner/cargoowner.vue

@@ -67,7 +67,7 @@
 							<image v-if='item.status!="企业审核中"&&item.status!="平台审核中"' @click='edit(item)'
 								style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png">
 							</image>
-							<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
+							<image @click='delbtnBClick(item)' style='width:17px;height:17px;margin:0 10px;'
 								src="@/static/mine/company/del.png"></image>
 						</view>
 					</view>
@@ -140,7 +140,11 @@
 			edit(val){
 				uni.$u.route('/pages/mine/cargoowner/editEnerprise', val);
 			},
+			delbtnBClick(val) {
+				uni.$u.throttle(this.del(val), 500)
+			},
 			del(val){
+				
 				uni.showLoading({
 					mask:true,
 					title:'加载中...'

pages/mine/cargoowner/editEnerprise.vue

@@ -3,20 +3,20 @@
 		<view class="wrap">
 			<view style='border-bottom:1px solid #eee;padding:10px 0 10px;' class="flex flex-space-between row">
 				<view class="left-text">企业</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between'>
+				<view style='' class='flex flex-space-between'>
 					<view :style="{'color':dataDetails.company ? '#000':'#C6CBD5'}">
 						{{dataDetails.company?dataDetails.company:'选择所属企业'}}
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<u-icon name="arrow-right" color="#ccc" size="14"></u-icon>
 					</view>
 				</view>
 
 			</view>
-			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center width100">
-				<view style='width:100px;font-size:14px;'>法定代表人姓名</view>
+			<view style='padding:10px 0 10px;' class="flex flex-space-between items-center">
+				<view style=''>法定代表人姓名</view>
 				<view class="flex">
-					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' disabled placeholder="自动获取" inputAlign='right' border="none"
 						v-model="dataDetails.legalPersonName1">
 					</u--input>
 				</view>
@@ -24,7 +24,7 @@
 		</view>
 		<view class='content1'>
 			<!-- <view class="title">上传企业授权书</view> -->
-			<view class="flex">
+			<view class="flex flex-space-between">
 				<view class="title">上传企业授权书</view>
 				<view class="title title_css" @click="formWork">授权书模板</view>
 			</view>
@@ -43,7 +43,7 @@
 				</view>
 				<nk-select-file v-model="show" @confirm="getPath"></nk-select-file> -->
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
-				name="1" multiple :maxCount="9"></u-upload>
+				name="1" multiple :maxCount="1"></u-upload>
 			<!-- 		<view style='position:relative;'>
 				<view v-if='!dataDetails.certificateAddressUrl' @click="uploadImg(1)" class="picture picture7">
 					<image class="xj-image" src="@/static/mine/ic_shanchuan@2x.png"></image>
@@ -58,15 +58,15 @@
 				<image class="" :src="dataDetails.certificateAddressUrl" mode="aspectFit"></image>
 			</view>
 			</view> -->
-			<view class="flex row noborder">
-				<view stlye='width:100px;' class="left-text">授权截止日期</view>
-				<view style='font-size:16px;width:50%;' class='flex flex-space-between' @click="selectdate">
+			<view class="flex row noborder flex-space-between">
+				<view stlye='' class="left-text">授权截止日期</view>
+				<view style='' class='flex flex-space-between' @click="selectdate">
 					<view style='padding-left:20px;'
 						:style="{'color':dataDetails.authorizationDeadline ? '#000':'#C6CBD5'}">
 						{{dataDetails.authorizationDeadline?dataDetails.authorizationDeadline:'选择期限截止日期'}}
 					</view>
 					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
+						<u-icon name="arrow-right" color="#ccc" size="14"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -89,7 +89,7 @@
 			<view class='line'></view>
 			<view
 				:class="{'active':dataDetails.certificateAddressUrl&&dataDetails.company&&dataDetails.legalPersonName&&dataDetails.authorizationDeadline}"
-				class="next-btn" @click="submit()">
+				class="next-btn" @click="$u.throttle(submit, 5000)">
 				提交
 			</view>
 		</view>
@@ -121,7 +121,7 @@
 				uploadType: '',
 				index: 0,
 				fileList1: [],
-				urlList:[],
+				urlList: [],
 				formWorkShow: false,
 				formWorkColumns: [
 					["复制下载链接", "预览模板"]
@@ -153,16 +153,12 @@
 
 			console.log(this.dataDetails)
 			if (options.certificateAddressUrl) {
-				var arr = options.certificateAddressUrl.split(',')
-				this.urlList = options.certificateAddressUrl.split(',')
+				debugger
+				this.urlList = options.certificateAddressUrl
 				this.fileList1 = []
-				for (var i = 0; i < arr.length; i++) {
-					if (arr[i] != '') {
-						this.fileList1.push({
-							url: arr[i]
-						})
-					}
-				}
+				this.fileList1.push({
+					url: this.urlList
+				})
 			}
 
 
@@ -231,7 +227,7 @@
 					result => {
 						// 上传成功回调函数
 						console.log('图片地址', result)
-						this.urlList.push(result)
+						this.urlList = result
 						// this.dataDetails.certificateAddressUrl=this.dataDetails.certificateAddressUrl +',' +result
 
 					}
@@ -239,7 +235,7 @@
 			},
 			// 删除图片
 			deletePic(event) {
-				this.urlList = this.urlList.splice(event.index, 1)
+				this.urlList = ''
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
 			// 新增图片
@@ -279,43 +275,51 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.authorizationDeadline = e.value[0]
 				} else {
-					if(e.value[0]==''){
+					if (e.value[0] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "年份不能为空！",
 						})
 						return
-					}else if(e.value[1]==''){
+					} else if (e.value[1] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "月份不能为空！",
 						})
 						return
-					}else if(e.value[2]==''){
+					} else if (e.value[2] == '') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "日期不能为空！",
 						})
 						return
 					}
-					var date=new Date()
-					if(e.value[0]<date.getFullYear()){
+					var date = new Date()
+					if (e.value[0] < date.getFullYear()) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
 						})
 						return
 					}
-					if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+					if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e.value[
+							2]) <= (date.getDate())) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "授权已过期！",
@@ -390,23 +394,24 @@
 				var _this = this
 				this.dataDetails.commonId = this.userInfo.id
 				this.dataDetails.certificateAddressUrl = this.urlList.toString()
-				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(res => {
-					uni.hideLoading()
-					uni.removeStorage('cargoOwnerId')
-					uni.removeStorage('currectcompany')
-					uni.$u.toast('提交成功')
-					uni.navigateBack({
-						delta: 1
-					})
-				})
-				.catch(res => {
-					uni.hideLoading()
-					uni.showToast({
-						title: res.message,
-						icon: 'none',
-						duration: 2000
-					})
-				});
+				this.$request.baseRequest('post', '/cargoOwnerCompInfo/api/editCargoOwnerComp', _this.dataDetails).then(
+						res => {
+							uni.hideLoading()
+							uni.removeStorage('cargoOwnerId')
+							uni.removeStorage('currectcompany')
+							uni.$u.toast('提交成功')
+							uni.navigateBack({
+								delta: 1
+							})
+						})
+					.catch(res => {
+						uni.hideLoading()
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
 		}
 	}
@@ -454,8 +459,8 @@
 
 	.content1 {
 		background: #fff;
-		padding: 40rpx 20rpx 20rpx;
-		margin: 20rpx 0rpx 200rpx;
+		padding: 20rpx;
+		margin: 20rpx;
 		border-radius: 10rpx;
 
 		.row {
@@ -471,7 +476,6 @@
 			color: #333333;
 			display: flex;
 			align-items: center;
-			font-size: 14px;
 		}
 
 		.picture {
@@ -501,20 +505,14 @@
 
 		.title {
 			color: #999999;
-			margin: 20rpx 0;
-			width: 50%;
 		}
+
 		.title_css {
-			text-align: right;
 			color: #2772FB;
-			margin: 20rpx 0;
-			font-size: 30rpx;
 		}
 	}
 
-	.u-input {
-		font-size: 16px;
-	}
+	.u-input {}
 
 	.content4 {
 		position: fixed;

pages/mine/cargoowner/editpersonalinformation.vue

@@ -30,7 +30,7 @@
 
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit"></image>
 			</view>
-			<view style='padding:5px 0 10px;border-bottom:1px solid #eee;' class="flex flex-space-between width100">
+			<view style='border-bottom:1px solid #eee;' class="flex row flex-space-between width100">
 				<view class="left-text" style='font-size:14px;'>姓名</view>
 				<view style='padding-right:10px;' class="flex">
 					<u--input @input='nameinput' placeholder="输入姓名" inputAlign='right' border="none"
@@ -38,7 +38,7 @@
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row flex-space-between" style='padding:10px 0 5px;border-bottom:1px solid #eee;'>
+			<view class="flex row flex-space-between" style='border-bottom:1px solid #eee;'>
 				<view class="left-text" style='font-size:14px;'>性别</view>
 				<view>
 					<u-radio-group v-model="dataDetails.sex" placement="row">
@@ -48,7 +48,7 @@
 					</u-radio-group>
 				</view>
 			</view>
-			<view class="flex row row-ch flex-space-between" style='padding:10px 0 5px;'>
+			<view style='margin-top:10px;padding-bottom:11px;' class="flex row flex-space-between" >
 				<view class="left-text" style='font-size:14px;'>称呼</view>
 				<view style='padding-right:10px;' class='flex flex-space-between'>
 					<view style="width: 160rpx;">
@@ -61,18 +61,18 @@
 				</view>
 			</view>
 
-			<view style='padding:10px 0 5px;border-bottom:1px solid #eee;' class="flex width100 flex-space-between">
+			<view style='border-bottom:1px solid #eee;margin-top:10px;padding-bottom:11px;' class="flex row width100 flex-space-between">
 				<view class="left-text" style='font-size:14px;'>联系电话</view>
 				<view style='padding-right:10px;' class="flex">
 					<u--input disabledColor='#fff' disabled placeholder="输入联系电话" inputAlign='right' border="none"
-						v-model="dataDetails.phone">
+						v-model="dataDetails.phone" maxlength="11">
 					</u--input>
 				</view>
 			</view>
-			<view style='padding-right:10px;' class="flex row">
+			<view style='padding-right:10px;margin-top:10px;padding-bottom:11px;' class="flex row">
 				<view class="left-text">身份证号</view>
 				<u--input :disabled='dataDetails.id?true:false' placeholder="请输入身份证号" inputAlign='right' border="none"
-					v-model="dataDetails.cardNumber">
+					v-model="dataDetails.cardNumber" maxlength="18">
 				</u--input>
 			</view>
 
@@ -101,7 +101,7 @@
 				我已阅读并同意全部细则
 			</view>
 			<view class='line'></view>
-			<view class="next-btn" @click="submit()">
+			<view class="next-btn" @click="$u.throttle(submit, 5000)">
 				提交
 			</view>
 		</view>
@@ -284,7 +284,6 @@
 			confirmValidityPeriod(e) {
 				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',
@@ -292,6 +291,8 @@
 						})
 						return
 					}
+					this.dataDetails.cardValidityDate = e.value[0]
+					
 				} else {
 					if(e.value[0]==''){
 						this.$refs.uToast.show({
@@ -408,13 +409,16 @@
 					})
 					var _this = this
 					delete _this.dataDetails.hyCargoOwnerCompInfoList
-					console.log( _this.dataDetails,122121)
+					_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.route('/pages/mine/cargoowner/cargoowner')
+							uni.hideLoading()
 							uni.$u.toast('提交成功')
-							uni.$u.route('/pages/mine/cargoowner/cargoowner')
+							uni.navigateBack({
+								delta: 1
+							})
 						})
 						.catch(res => {
 							console.log(res)
@@ -467,18 +471,21 @@
 													personImg: result,
 													flag: 1
 												}).then(res => {
-												if (res.data.recPersonNo) {
-													that.dataDetails.cardNumber = res.data.recPersonNo
-													if(that.dataDetails.cardNumber[16]%2==0){
-														that.dataDetails.sex='女'
-													}else{
-														that.dataDetails.sex='男'
+												if(!that.dataDetails.id){
+													if (res.data.recPersonNo) {
+														that.dataDetails.cardNumber = res.data.recPersonNo
+														if(that.dataDetails.cardNumber[16]%2==0){
+															that.dataDetails.sex='女'
+														}else{
+															that.dataDetails.sex='男'
+														}
+													}
+													if (res.data.recPerson) {
+														that.dataDetails.name = res.data.recPerson
+														that.dataDetails.call=that.dataDetails.name[0]
 													}
 												}
-												if (res.data.recPerson) {
-													that.dataDetails.name = res.data.recPerson
-													that.dataDetails.call=that.dataDetails.name[0]
-												}
+												
 												
 												that.$forceUpdate()
 											})

pages/mine/company/addcompany.vue

@@ -12,7 +12,7 @@
 		<view v-show="videoPlay">
 			<video controls id="myvideo" :src="dataDetails.videoAddressUrl" @fullscreenchange="screenChange"></video>
 		</view>
-		<view style='margin:10px 0 0 19px;font-size:12px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
+		<view style='margin:10px 0 0 19px;font-size:13px;color:#EF4034;'>注：企业认证仅限该企业法定代表人本人完成。</view>
 
 		<view class='content1'>
 			<view class="title">上传营业执照</view>
@@ -30,54 +30,53 @@
 					<image class="" :src="dataDetails.businessLicenseAddressUrl" mode="aspectFit"></image>
 				</view>
 			</view>
-			<view class="flex row">
+			<view class="flex row flex-space-between">
 				<view class="left-text">营业期限截止日期</view>
-				<view style='font-size:14px;width:50%;' class='flex flex-space-between' @click="selectData(0)">
+				<view style='' class='flex flex-space-between align-center' @click="selectData(0)">
 					<view :style="{'color':dataDetails.businessTermDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.businessTermDate?dataDetails.businessTermDate:'选择期限截止日期'}}
 					</view>
-					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
-					</view>
+					<u-icon name="arrow-right" color="#7E7E7E" size="14"></u-icon>
 				</view>
 			</view>
-			<view class="flex row noborder">
+			<view class="flex row noborder flex-space-between">
 				<view class="left-text">统一社会信用代码</view>
-				<u--input @blur='codeBlur' placeholder="请输入统一社会信用代码" inputAlign='left' border="none"
+				<u--input @blur='codeBlur' placeholder="请输入统一社会信用代码" inputAlign='right' border="none"
 					v-model="dataDetails.unifiedSocialCreditCode" maxlength='18'>
 				</u--input>
 			</view>
 
 		</view>
 		<view class='wrap'>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between">
 				<view class="left">企业名称</view>
 				<view class="flex right">
-					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='left' border="none"
+					<u--input placeholder="输入企业名称" @input='companyNamechange' inputAlign='right' border="none"
 						v-model="dataDetails.companyName" @blur='companyNameBlur'>
 					</u--input>
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between">
 				<view class="left">法定代表人姓名</view>
-				<view class="flex right">
-					<u--input disabled placeholder="输入法定代表人姓名" inputAlign='left' border="none"
-						v-model="dataDetails.legalPersonName">
-					</u--input>
+				<view class="flex">
+					<!-- <u--input disabled placeholder="输入法定代表人姓名" inputAlign='right' border="none"
+						v-model="dataDetails.legalPersonName" >
+					</u--input> -->
+					{{dataDetails.legalPersonName}}
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between">
 				<view class="left">联系电话</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入联系电话" maxlength="15" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入联系电话" maxlength="15" inputAlign='right' border="none"
 						v-model="dataDetails.phone">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between">
 				<view class="left">通讯地址</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入通讯地址" maxlength="15" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入通讯地址" maxlength="15" inputAlign='right' border="none"
 						v-model="dataDetails.mailingAddress">
 					</u--input>
 				</view>
@@ -98,63 +97,60 @@
 			<view v-if="dataDetails.cardBackAddressUrl" @click.stop="uploadImg(3)" class="preview-card-img picture">
 				<image class="" :src="dataDetails.cardBackAddressUrl" mode="aspectFit" style=""></image>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between">
 				<view class="left-text">身份证号</view>
 				<view class="flex right">
-					<u--input disabledColor='#fff' placeholder="输入身份证号" maxlength="18" inputAlign='left' border="none"
+					<u--input disabledColor='#fff' placeholder="输入身份证号" maxlength="18" inputAlign='right' border="none"
 						v-model="dataDetails.cardNumber">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex border-bottom mt20 align-center">
+			<view class="flex border-bottom mt20 flex-space-between align-center">
 				<view class="left-text">身份证有效期</view>
-				<view class='flex right' @click="selectData(1)">
+				<view class='flex' @click="selectData(1)">
 					<span :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证有效期'}}
 					</span>
-					<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
-					<view>
-					</view>
+					<u-icon name="arrow-right" color="#7E7E7E" size="14"></u-icon>
 				</view>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">对公账户</view>
-				<view class="flex  right">
-					<u--input disabled placeholder="户名与企业名称一致" inputAlign='left' border="none"
+				<view class="flex">
+					<!-- <u--input disabled placeholder="户名与企业名称一致" inputAlign='right' border="none"
 						v-model="dataDetails.corporateAccount">
-					</u--input>
+					</u--input> -->
+					{{dataDetails.corporateAccount}}
 				</view>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">卡号</view>
 				<view class="flex right">
-					<u--input placeholder="输入银行卡号码" inputAlign='left' border="none" v-model="dataDetails.bankCard">
+					<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="dataDetails.bankCard">
 					</u--input>
-					<view class="" @click="uploadImg(5)">
-						<image src="../../../static/images/xiangji-2.png" mode=""
-							style="width: 40rpx ;height: 40rpx;margin-top: 10rpx;"></image>
+					<view class="" @click="uploadImg(5)" style="display: flex;align-items: center;margin-left: 20rpx;">
+						<image src="../../../static/images/xiangji-2.png" mode="" style="width: 40rpx ;height: 40rpx;">
+						</image>
 					</view>
 				</view>
 
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view class="flex row border-bottom mt20 flex-space-between">
 				<view class="left-text">开户行</view>
 				<view class="flex right">
-					<u--input placeholder="输入开户行" inputAlign='left' border="none" v-model="dataDetails.bankDeposit">
+					<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="dataDetails.bankDeposit">
 					</u--input>
 				</view>
 			</view>
-			<view class="flex row border-bottom mt20">
+			<view class="flex row border-bottom mt20 flex-space-between noborder">
 				<view class="left-text khzh-styel">开户支行</view>
-				<view class="flex align-center flex-space-between right" v-if="isShowManualInput">
+				<view class="flex align-center flex-space-between" v-if="isShowManualInput">
 					<u--input class="select-bankzh point" placeholder="输入开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
 					</u--input>
 					<view @click="manualInput" class="type">选择支行</view>
 				</view>
-				<view class="flex align-center flex-space-between right" v-if="!isShowManualInput">
-					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
-				</u--input> -->
+				<view class="flex align-center flex-space-between" v-if="!isShowManualInput">
 					<view class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
 					</view>
@@ -195,7 +191,7 @@
 		</view>
 
 		<view class='content3'>
-			<view class="flex row noborder mt20 flex-space-between">
+			<view class="flex row noborder flex-space-between">
 				<view class="left-text">申请开通平台垫付运费业务</view>
 				<view>
 					<u-switch @change="change" v-model="value" inactiveColor='#ABB0BB' size="20"></u-switch>
@@ -259,7 +255,7 @@
 
 		<view class='footer'>
 			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
-			<view @click="submit" class='newlyIncreased'>提交</view>
+			<view @click="$u.throttle(submit, 5000)" class='newlyIncreased'>提交</view>
 		</view>
 		<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			@change="changeHandler" @cancel="isShowcardValidity=false">
@@ -314,10 +310,15 @@
 				index: '',
 				isShowimgType: false,
 				validityPeriod: [],
-				submitstatus:false,
+				submitstatus: false,
 				checked: false,
 				checked1: false,
 				dataDetails: {
+					legalPersonName: '',
+					cardAddressUrl: '',
+					cardBackAddressUrl: '',
+					cardNumber: '',
+					cardValidityDate: '',
 					phone: '',
 					businessLicenseAddressUrl: '',
 					propertyAddressUrl: '',
@@ -331,6 +332,7 @@
 			}
 		},
 		onShow() {
+			debugger
 			console.log(uni.getStorageSync("videoSrc"))
 			var viderSrc = uni.getStorageSync("videoSrc")
 			if (viderSrc) {
@@ -339,20 +341,11 @@
 
 		},
 		onLoad(options) {
-			this.get_camera_permission()
-			this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
-			console.log(this)
-			this.dataDetails.commonId = this.userInfo.id
-			this.dataDetails.phone = this.userInfo.phone
-			console.log('```````````````')
-			console.log(options)
-			if (uni.getStorageSync('companydata')) {
-				this.dataDetails = JSON.parse(uni.getStorageSync('companydata'))
-				if (!this.dataDetails.businessLicenseAddressUrl) {
-					this.dataDetails.businessLicenseAddressUrl = ""
-				}
-			}
+			debugger
 			this.dataDetails.videoAddressUrl = options.videoSrc
+			// #ifdef APP-PLUS
+			this.get_camera_permission()
+			//#endif
 			this.getName()
 		},
 		computed: {
@@ -388,7 +381,7 @@
 				if (uni.$u.test.isEmpty(this.columns)) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "请先上传银行卡！",
+						message: "支行获取失败，请手动输入！",
 					})
 					return true
 				}
@@ -397,25 +390,24 @@
 			},
 			manualInput() {
 				if (this.isShowManualInput) {
-					if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "请填写卡号！",
-						})
-						return true
-					}
-					if (this.columns.length == 0) {
-						this.$refs.uToast.show({
-							type: 'error',
-							message: "请选择手动输入！",
-						})
-						return true
-					}
-
-					this.isShowBank = true
+					// this.isShowBank = true
+					// if (uni.$u.test.isEmpty(this.dataDetails.payeeAddressUrl)) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'error',
+					// 		message: "请填写卡号！",
+					// 	})
+					// 	return true
+					// }
+					// if (this.columns.length == 0) {
+					// 	this.$refs.uToast.show({
+					// 		type: 'error',
+					// 		message: "请选择手动输入！",
+					// 	})
+					// 	return true
+					// }
 
 				} else {
-					this.isShowBank = false
+					// this.isShowBank = false
 				}
 				this.isShowManualInput = !this.isShowManualInput
 			},
@@ -424,25 +416,26 @@
 				this.dataDetails.bankDepositBranch = e.value[0]
 				this.isShowBank = false
 			},
-			uploadImg() {
-				this.uploadType = 5
-				this.imgTypeSelect()
-				// this.isShowimgType = true
-			},
+			// uploadImg() {
+			// 	debugger
+			// 	this.uploadType = 5
+			// 	this.imgTypeSelect()
+			// 	// this.isShowimgType = true
+			// },
 			confirmValidityPeriod(e) {
-				if(e.value[0]==''&&e.value[0] != '长期'){
+				if (e.value[0] == '' && e.value[0] != '长期') {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "年份不能为空！",
 					})
 					return
-				}else if(e.value[1]==''&&e.value[0] != '长期'){
+				} else if (e.value[1] == '' && e.value[0] != '长期') {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "月份不能为空！",
 					})
 					return
-				}else if(e.value[2]==''&&e.value[0] != '长期'){
+				} else if (e.value[2] == '' && e.value[0] != '长期') {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "日期不能为空！",
@@ -453,30 +446,33 @@
 					case 0:
 						if (e.value[0] == '长期') {
 							this.dataDetails.businessTermDate = e.value[0]
-							if(e.value[1]!=''||e.value[2]!=''){
+							if (e.value[1] != '' || e.value[2] != '') {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "选择长期时不允许选择月日！",
 								})
 								return
 							}
+							this.dataDetails.businessTermDate = e.value[0]
+
 						} else {
-							var date=new Date()
-							if(e.value[0]<date.getFullYear()){
+							var date = new Date()
+							if (e.value[0] < date.getFullYear()) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "营业截止日期已过期！",
 								})
 								return
 							}
-							if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+							if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "营业截止日期已过期！",
 								})
 								return
 							}
-							if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+							if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e
+									.value[2]) <= (date.getDate())) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "营业截止日期已过期！",
@@ -489,7 +485,7 @@
 					case 1:
 						if (e.value[0] == '长期') {
 							this.dataDetails.cardValidityDate = e.value[0]
-							if(e.value[1]!=''||e.value[2]!=''){
+							if (e.value[1] != '' || e.value[2] != '') {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "选择长期时不允许选择月日！",
@@ -497,22 +493,23 @@
 								return
 							}
 						} else {
-							var date=new Date()
-							if(e.value[0]<date.getFullYear()){
+							var date = new Date()
+							if (e.value[0] < date.getFullYear()) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "身份证已过期！",
 								})
 								return
 							}
-							if(e.value[0]==date.getFullYear()&&Number(e.value[1])<(date.getMonth()+1)){
+							if (e.value[0] == date.getFullYear() && Number(e.value[1]) < (date.getMonth() + 1)) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "身份证已过期！",
 								})
 								return
 							}
-							if(e.value[0]==date.getFullYear()&&Number(e.value[1])==(date.getMonth()+1)&&Number(e.value[2])<=(date.getDate())){
+							if (e.value[0] == date.getFullYear() && Number(e.value[1]) == (date.getMonth() + 1) && Number(e
+									.value[2]) <= (date.getDate())) {
 								this.$refs.uToast.show({
 									type: 'error',
 									message: "身份证已过期！",
@@ -594,7 +591,7 @@
 						})
 					});
 			},
-			codeBlur(){
+			codeBlur() {
 
 
 				this.$request.baseRequest('get', '/companyInfo/checkCreditCode', {
@@ -627,7 +624,23 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.code == 200) {
+							this.validityPeriod = this.$helper.makeValidityPeriod(0, '长期')
+							console.log(this)
+							if (uni.getStorageSync('companydata')) {
+								this.dataDetails = JSON.parse(uni.getStorageSync('companydata'))
+								if (!this.dataDetails.businessLicenseAddressUrl) {
+									this.dataDetails.businessLicenseAddressUrl = ""
+								}
+							}
+							this.dataDetails.commonId = this.userInfo.id
+							this.dataDetails.phone = this.userInfo.phone
 							that.dataDetails.legalPersonName = res.data.name
+							that.dataDetails.cardAddressUrl = res.data.cardAddressUrl
+							that.dataDetails.cardBackAddressUrl = res.data.cardBackAddressUrl
+							that.dataDetails.cardNumber = res.data.cardNumber
+							that.dataDetails.cardValidityDate = res.data.cardValidityDate
+
+
 						}
 					})
 					.catch(res => {
@@ -722,13 +735,13 @@
 					})
 					return true
 				}
-				if (!uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [18, 18])) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "统一社会信用代码输出错误！",
-					})
-					return true
-				}
+				// if (!uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [18, 18])) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "统一社会信用代码输出错误！",
+				// 	})
+				// 	return true
+				// }
 				//先注释掉
 				// if (this.dataDetails.advanceFreightService == 1 && uni.$u.test.isEmpty(this.dataDetails
 				// 		.propertyAddressUrl)) {
@@ -758,9 +771,9 @@
 			},
 			submit() {
 				if (this.validate()) return
-				if(!this.submitstatus){
-					this.submitstatus=true
-					
+				if (!this.submitstatus) {
+					this.submitstatus = true
+
 					if (!this.consentStatus) {
 						uni.showToast({
 							title: '请勾选协议',
@@ -777,16 +790,16 @@
 					this.$request.baseRequest('post', '/companyInfo/api/addCompanyInfo', _this.dataDetails).then(res => {
 							uni.hideLoading()
 							uni.$u.toast('提交成功')
-							this.submitstatus=false
+							this.submitstatus = false
 							uni.removeStorageSync("videoSrc")
 							uni.navigateBack({
 								delta: 1
 							})
-					
+
 						})
 						.catch(res => {
 							uni.hideLoading()
-							this.submitstatus=false
+							this.submitstatus = false
 							uni.showToast({
 								title: res.message,
 								icon: 'none',
@@ -794,7 +807,7 @@
 							})
 						});
 				}
-				
+
 			},
 			consent() {
 				this.consentStatus = !this.consentStatus
@@ -843,6 +856,7 @@
 			// 	this.isShowcardValidity = false
 			// },
 			imgTypeSelect(val) {
+				debugger
 				var _this = this
 				// if (val.name == '相册') {
 				uni.chooseImage({
@@ -856,7 +870,6 @@
 								// 上传成功回调函数
 								switch (_this.uploadType) {
 
-									// 身份正面
 									case 1:
 										_this.dataDetails.businessLicenseAddressUrl = result
 										// 识别
@@ -889,7 +902,7 @@
 											});
 										console.log(_this.dataDetails.businessLicenseAddressUrl)
 										break
-										// 身份反面
+										// 身份正面
 									case 2:
 										_this.dataDetails.cardAddressUrl = result
 										// 识别
@@ -1085,21 +1098,21 @@
 		margin: 20rpx;
 
 		.left {
-			width: 50%;
-			font-size: 28rpx;
+			// width: 50%;
+			// font-size: 28rpx;
 		}
 
 		.left-text {
 			// background: red;
-			width: 50%;
+			// width: 50%;
 			color: #333333;
 			display: flex;
 			align-items: center;
-			font-size: 14px;
+			// font-size: 14px;
 		}
 
 		.right {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			width: calc(100% - 240rpx);
 		}
 	}
@@ -1138,13 +1151,14 @@
 		border-radius: 10rpx;
 		color: white;
 		box-sizing: border-box;
-		padding: 4rpx 10rpx;
-		font-size: 26rpx;
+		padding: 8rpx 14rpx;
+		// font-size: 26rpx;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		height: 68rpx;
-		min-width: 124rpx;
+		margin-left: 8rpx;
+		// height: 68rpx;
+		min-width: 160rpx;
 	}
 
 	.content1 {
@@ -1162,11 +1176,11 @@
 
 		.left-text {
 			// background: red;
-			width: 320rpx;
+			// width: 320rpx;
 			color: #333333;
 			display: flex;
 			align-items: center;
-			font-size: 14px;
+			// font-size: 14px;
 		}
 
 		.picture {
@@ -1206,7 +1220,7 @@
 	}
 
 	.u-input {
-		font-size: 16px;
+		// font-size: 16px;
 	}
 
 	.content4 {}
@@ -1274,6 +1288,10 @@
 
 	.myVideo {}
 
+	.khzh-styel {
+		min-width: 160rpx;
+	}
+
 	// /deep/.u-input:disabled{
 	// 	background:transparent !important;
 	// }

pages/mine/company/addcompanytwo.vue

@@ -141,6 +141,13 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.siteLeaseDate = e.value[0]
 				} else {
 					this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/mine/company/editcompany.vue

@@ -253,7 +253,7 @@
 
 		<view class='footer'>
 			<!-- <view @click="goDetailPage('/pages/mine/company/addcompanythree')" class='newlyIncreased'>下一步</view> -->
-			<view @click="submit" class='newlyIncreased'>提交</view>
+			<view @click="$u.throttle(submit, 5000)" class='newlyIncreased'>提交</view>
 		</view>
 		<u-picker :show="isShowBank" :columns="columns" :closeOnClickOverlay='true' @close='zhBankClose'
 			@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
@@ -409,7 +409,6 @@
 				switch (this.dataType) {
 					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',
@@ -417,6 +416,8 @@
 								})
 								return
 							}
+							this.dataDetails.businessTermDate = e.value[0]
+							
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){
@@ -445,7 +446,6 @@
 						break
 					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',
@@ -453,6 +453,8 @@
 								})
 								return
 							}
+							this.dataDetails.cardValidityDate = e.value[0]
+							
 						} else {
 							var date=new Date()
 							if(e.value[0]<date.getFullYear()){

pages/mine/company/editcompanytwo.vue

@@ -141,6 +141,13 @@
 			confirmValidityPeriod(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.siteLeaseDate = e.value[0]
 				} else {
 					this.dataDetails.siteLeaseDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/mine/company/index.vue

@@ -22,7 +22,7 @@
 					<view class="row2">
 						<image v-if='item.status!="审核中"' @click='edit(item)'
 							style='width:17px;height:17px;margin:0 10px;' src="@/static/mine/company/edit.png"></image>
-						<image @click='del(item)' style='width:17px;height:17px;margin:0 10px;'
+						<image @click='delbtnAClick(item)' style='width:17px;height:17px;margin:0 10px;'
 							src="@/static/mine/company/del.png"></image>
 					</view>
 				</view>
@@ -83,6 +83,9 @@
 			edit(item) {
 				this.goDetailPage('/pages/mine/company/editcompany?id=' + item.id)
 			},
+			delbtnAClick(val) {
+				uni.$u.throttle(this.del(val), 5000)
+			},
 			del(item) {
 				var _this = this
 				uni.showModal({ title: '友情提示',

pages/mine/driverCertification.vue

@@ -268,6 +268,13 @@
 				// 
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataDetails.cardValidityDate = e.value[0]
 				} else {
 					this.dataDetails.cardValidityDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]

pages/mine/index.vue

@@ -6,7 +6,7 @@
 				<view style='margin-bottom:14px;' class="row flex flex-end">
 					<u--image class='image' :showLoading="true" src="../../static/mine/saoma.png" width="20px"
 						height="20px" @click="scanCode()" v-if='hasLogin'></u--image>
-					<u--image @click="goDetailPage('/pages/mine/set')" style='margin-right:0;' class='image'
+					<u--image @click="goDetailPage('/pages/mine/set',true)" style='margin-right:0;' class='image'
 						:showLoading="true" src="../../static/mine/shezhi.png" width="20px" height="20px"></u--image>
 				</view>
 				<view class="flex">
@@ -17,102 +17,107 @@
 						<view class='flex items-center'>
 							<view v-if='userName' class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-else class='username'>{{userInfo.userName}} </view>
-							<view v-if='status' class='currectstatus'>已认证</view>
-							<view v-if='!status' class='currectstatus1'>{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}</view>
+							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" v-if='status'
+								class='currectstatus'>已认证</view>
+							<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" v-if='!status'
+								class='currectstatus1'>
+								{{CargoOwner.authenticationStatus?CargoOwner.authenticationStatus:'未认证'}}
 						</view>
-						<view class='phone'>{{starUserphone}}</view>
 					</view>
-					<view class='information' v-else @click="toLogin">立即登录</view>
+					<view class='phone'>{{starUserphone}}</view>
 				</view>
-				<view v-if='hasLogin&&!status1' class='authentication flex flex-space-between'>
-					<view>
-						<view style='font-size:14px;'>货主身份认证</view>
-						<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
-					</view>
-					<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner')" class='promptlyAuthentication'>立即认证
-					</view>
+				<view class='information' v-else @click="toLogin">立即登录</view>
+			</view>
+			<view v-if='hasLogin&&!status1' class='authentication flex flex-space-between'>
+				<view>
+					<view style='font-size:14px;'>货主身份认证</view>
+					<view style='color:#DDA558;font-size:12px;'>您还没有完成货主认证哦~</view>
+				</view>
+				<view @click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)" class='promptlyAuthentication'>立即认证
 				</view>
 			</view>
+		</view>
 
-			<view class='flex operate flex-space-around'>
-				<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
-						src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
+		<view class='flex operate flex-space-around'>
+			<view style='font-size:14px;' class='flex items-center' @click="toMyRelease">
+				<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+					src="../../static/mine/wodefabu.png" width="42px" height="42px"></u--image>我的发布
+			</view>
+			<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
+				<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
+					src="../../static/mine/pingjia.png" width="42px" height="42px"></u--image>
+				司机评价
+			</view>
+		</view>
+		<view class="content1">
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/myAccount/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/zhanghu.png"
+						width="20px" height="20px"></u--image>我的账户
 				</view>
-				<view style='font-size:14px;' class='flex items-center' @click="goDetailPage('/pages/mine/evaluate')">
-					<u--image style='margin-right:8px;position:relative;top:3px;' :showLoading="true"
-						src="../../static/mine/pingjia.png" width="42px" height="42px"></u--image>
-					司机评价
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
 			</view>
-			<view class="content1">
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/myAccount/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/zhanghu.png"
-							width="20px" height="20px"></u--image>我的账户
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/company/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodegongsi.png"
+						width="20px" height="20px"></u--image>我的公司
 				</view>
-				<view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/company/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/wodegongsi.png"
-							width="20px" height="20px"></u--image>我的公司
-					</view>
-					<view class='flex'>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view class='flex'>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/manageBankCards/index')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/yinhangka.png"
-							width="20px" height="20px"></u--image>我的银行卡
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/manageBankCards/index',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/yinhangka.png"
+						width="20px" height="20px"></u--image>我的银行卡
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/cargoowner/cargoowner')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/huozhu.png"
-							width="20px" height="20px"></u--image>货主认证
-					</view>
-					<view class='flex'>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/agentCargoOwner')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
-							width="20px" height="20px"></u--image>代理货主
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/cargoowner/cargoowner',true)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/huozhu.png"
+						width="20px" height="20px"></u--image>货主认证
 				</view>
-				<view class="flex flex-space-between content1-item"
-					@click="goDetailPage('/pages/mine/helpDescription')">
-					<view class='flex items-center'>
-						<u--image style='margin-right:8px;' :showLoading="true"
-							src="../../static/mine/bangzhushuoming.png" width="20px" height="20px"></u--image>帮助说明
-					</view>
-					<view>
-						<image class='right' src="@/static/mine/right.png" mode=""></image>
-						<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
-					</view>
+				<view class='flex'>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/agentCargoOwner',false)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
+						width="20px" height="20px"></u--image>代理货主
+				</view>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
+			<view class="flex flex-space-between content1-item"
+				@click="goDetailPage('/pages/mine/helpDescription',true)">
+				<view class='flex items-center'>
+					<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/bangzhushuoming.png"
+						width="20px" height="20px"></u--image>帮助说明
 				</view>
+				<view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon> -->
+				</view>
+			</view>
 
-				<!-- 		<view class="flex flex-space-between content1-item"
+			<!-- 		<view class="flex flex-space-between content1-item"
 					@click="goDetailPage('/pages/mine/driverEvaluation')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
@@ -122,7 +127,7 @@
 						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
 					</view>
 				</view> -->
-				<!-- <view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
+			<!-- <view class="flex flex-space-between content1-item" @click="goDetailPage('/pages/mine/set')">
 					<view class='flex items-center'>
 						<u--image style='margin-right:8px;' :showLoading="true" src="../../static/mine/dailihuozhu.png"
 							width="20px" height="20px"></u--image>设置
@@ -132,12 +137,12 @@
 					</view>
 				</view> -->
 
-			</view>
 		</view>
-		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
-			@cancel="cancelClick"></u-modal>
-		<u-toast ref="uToast"></u-toast>
+	</view>
+	<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+		:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+		@cancel="cancelClick"></u-modal>
+	<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -156,7 +161,7 @@
 				userName: '',
 				phone: '',
 				status: false,
-				status1:false,
+				status1: false,
 				alertContent: '您尚未登录，是否立即登录？',
 				cargoCall: "",
 			};
@@ -174,12 +179,12 @@
 						if (res.data) {
 							this.CargoOwner = res.data
 							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回' || res
-								.data.authenticationStatus == '未认证') {
-									if(res.data.authenticationStatus == '未认证'){
-										this.status1 = false
-									}else{
-										this.status1 = true
-									}
+								.data.authenticationStatus == '未认证' || res.data.authenticationStatus == '已过期') {
+								if (res.data.authenticationStatus == '未认证') {
+									this.status1 = false
+								} else {
+									this.status1 = true
+								}
 								this.status = false
 							} else {
 								this.status = true
@@ -205,7 +210,7 @@
 					uni.setStorageSync("firstAuthentication", res.data)
 					if (res.data) {
 						this.userName = res.data.call
-						if(res.data.sex){
+						if (res.data.sex) {
 							if (res.data.sex == '男') {
 								this.cargoCall = "先生"
 							} else {
@@ -287,19 +292,38 @@
 			toMyRelease() {
 				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
 					uni.$u.route('/pages/public/login');
-				} else {uni.$u.route('/pages/release/record');}
-				
+				} else {
+					uni.$u.route('/pages/release/record');
+				}
+
 			},
-			goDetailPage(src) {
+			goDetailPage(src, isClick) {
 				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
-					if(src!='/pages/mine/helpDescription'){
-						uni.$u.route('/pages/public/login');
-					}else{
-						uni.$u.route(src);
-					}
-					
-				} else {uni.$u.route(src);}
-				
+					// if(src!='/pages/mine/helpDescription'){
+					uni.$u.route('/pages/public/login');
+					// }else{
+					// 	uni.$u.route(src);
+					// }
+				} else {
+					this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.userInfo.phone
+					}).then(res => {
+						uni.setStorageSync("firstAuthentication", res.data)
+						if (res.data.authenticationStatus!='已认证'&&!isClick) {
+							uni.$u.toast('请先完成货主认证！')
+						}else{
+							uni.$u.route(src);
+						}
+					})
+					// if (isClick) {
+					// 	uni.$u.route(src);
+					// } else {
+					// 	uni.$u.toast('请先完成货主认证！')
+					// }
+
+
+				}
+
 			},
 			toLogin() {
 				console.log("userInfo", this.userInfo)
@@ -420,7 +444,9 @@
 	.items-center {
 		align-items: center;
 	}
-	.right{
-		width:10px;height:10px;
+
+	.right {
+		width: 10px;
+		height: 10px;
 	}
 </style>

pages/mine/manageBankCards/addBankCard.vue

@@ -70,7 +70,7 @@
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>

pages/mine/manageBankCards/editBankCard.vue

@@ -50,7 +50,7 @@
 		</view>
 
 		<u-toast ref="uToast"></u-toast>
-		<view class="submit-btn" @click="submit">提交</view>
+		<view class="submit-btn" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true" @close="isShowimgType=false">
 		</u-action-sheet>

pages/mine/myAccount/bankList.vue

@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
-		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>

pages/mine/myAccount/withdrawal.vue

@@ -65,9 +65,9 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
-			<view @click="submit" class='newlyIncreased'>提交</view>
+			<view @click="$u.throttle(submit, 5000)" class='newlyIncreased'>提交</view>
 		<!-- <u-button type="primary" text="提交" @click="submit" class="btn_css"></u-button> -->
 	</view>
 </template>

pages/mine/settings/editAvatar.vue

@@ -5,7 +5,7 @@
 			<image class="xj-image" :src="deptListurl.avatarUrl" v-if="deptListurl.avatarUrl"></image>
 			
 		</view>
-			<view @click="submit" class="submit">提交</view>
+			<view @click="$u.throttle(submit, 5000)" class="submit">提交</view>
 		<u-action-sheet :actions="$helper.imgTypeList" :title="$helper.imgType" :show="isShowimgType"
 			@select="imgTypeSelect" :closeOnClickOverlay="true" :closeOnClickAction="true"
 			@close="isShowimgType=false">

pages/mine/settings/editPassword.vue

@@ -20,7 +20,7 @@
 					@end="disabled1 = false">
 				</u-code>
 			</u--form>
-			<button class="code-style reset" @click="reset">重置密码</button>
+			<button class="code-style reset" @click="$u.throttle(reset, 5000)">重置密码</button>
 		</view>
 	</view>
 </template>

pages/mine/settings/editPhone.vue

@@ -13,7 +13,7 @@
 			<u-code ref="uCode" @change="codeChange" seconds="20" @start="disabled1 = true" @end="disabled1 = false">
 			</u-code>
 		</u--form>
-		<u-button type="primary" @click='reset'>确定修改</u-button>
+		<u-button type="primary" @click='$u.throttle(reset, 5000)'>确定修改</u-button>
 
 	</view>
 </template>

pages/news/feedbackResults.vue

@@ -40,7 +40,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="showPips" :title="title" :content='content' showCancelButton @close="showPips = false"
-			@cancel="showPips=false" @confirm="confirmSubmit"></u-modal>
+			@cancel="showPips=false" @confirm="$u.throttle(confirmSubmit(), 5000)"></u-modal>
 		<u-button type="primary" text="提交" @click="submit"></u-button>
 	</view>
 </template>

pages/news/index.vue

@@ -1,37 +1,37 @@
 <template>
-		<view>
+	<view>
 		<u-navbar title="消息中心" leftIconSize='0' :bgColor="bgColor" :placeholder='true' leftIconColor="#fff"
 			titleStyle='color:#fff' rightText='一键已读' @rightClick="rightClick">
 		</u-navbar>
-		<view class="top-bgc"></view>
+		<!-- <view class="top-bgc"></view> -->
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			style="background-color: #F5F6FA;">
-		<view class="content">
-			<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
-				<view class="left">
-					<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">
-					</image>
-					<image src="@/static/images/news/xt.png" class="img" v-else>
-					</image>
+			style="background-color: #fff;">
+			<view class="content" v-if="news.length!=0">
+				<view class="info-item flex" v-for="(item,index) in news" :key="index" @click="read(item)">
+					<view class="left">
+						<image src="@/static/images/news/cy.png" class="img" v-if="item.newsType=='承运通知'">
+						</image>
+						<image src="@/static/images/news/xt.png" class="img" v-else>
+						</image>
 
-				</view>
-				<view class="right">
-					<view class="row1 flex flex-space-between">
-						<view class="title">
-							{{item.newsType}}
-						</view>
-						<view class="time">
-							{{item.createDate}}
-						</view>
 					</view>
-					<view class="row2 flex flex-space-between align-center">
-						<view class="text point">
-							{{item.newsContent}}
+					<view class="right">
+						<view class="row1 flex flex-space-between">
+							<view class="title">
+								{{item.newsType}}
+							</view>
+							<view class="time">
+								{{item.createDate}}
+							</view>
+						</view>
+						<view class="row2 flex flex-space-between align-center">
+							<view class="text point">
+								{{item.newsContent}}
+							</view>
+							<view class="red-point" v-if="item.newsFlag==0"></view>
 						</view>
-						<view class="red-point" v-if="item.newsFlag==0"></view>
 					</view>
-				</view>
-				<!-- 	<view class="flex flex-space-between">
+					<!-- 	<view class="flex flex-space-between">
 					<view class="left">
 						<view>系统消息</view>
 						<u-badge :isDot="true" bgColor='red' :absolute='true' :offset='badgeOffset'></u-badge>
@@ -43,13 +43,13 @@
 				<view class="flex flex-space-between">
 					您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。
 				</view> -->
+				</view>
+				<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
+					:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick(), 5000)"
+					@close="cancelClick" @cancel="cancelClick" class="modal">
+				</u-modal>
 			</view>
-			<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-				:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick"
-				@close="cancelClick" @cancel="cancelClick" class="modal">
-			</u-modal>
-		</view>
-	</mescroll-body>
+		</mescroll-body>
 	</view>
 </template>
 
@@ -97,14 +97,14 @@
 
 		// },
 		onLoad() {
-		
+
 		},
 		onShow() {
-			var that=this
+			var that = this
 			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) {
@@ -131,8 +131,7 @@
 				}).then(res => {
 					this.news = res.data.records //追加新数据
 				})
-				.catch(res => {
-				});
+				.catch(res => {});
 			// this.mescroll.resetUpScroll()
 		},
 		computed: {
@@ -151,7 +150,7 @@
 				}
 				// #endif
 			},
-			cancelClick(){
+			cancelClick() {
 				this.isShowAlert = false
 			},
 			rightClick() {
@@ -174,12 +173,12 @@
 					});
 			},
 			read(val) {
-			     let that = this
-				if(val.newsType == "投诉结果" || val.newsType == "举报结果"){
+				let that = this
+				if (val.newsType == "投诉结果" || val.newsType == "举报结果") {
 					uni.$u.route("/pages/news/feedbackResults?id=" + val.bussId + "&type=" + val.newsType)
-				}else{
+				} else {
 					uni.$u.route("/pages/news/newsSee?_obj=" + JSON.stringify(val))
-					}
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -253,7 +252,7 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						if(page.num == 1){
+						if (page.num == 1) {
 							this.news = []; //追加新数据
 						}
 						this.news = this.news.concat(res.data.records); //追加新数据

pages/order/fk.vue

@@ -21,7 +21,7 @@
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
-		<view class="row3" @click="submit">提交</view>
+		<view class="row3" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>

pages/order/index.vue

@@ -1,6 +1,6 @@
 <!-- 货源 -->
 <template>
-	<view class="content">
+	<view :style="{'overflow':showMenu?'hidden':'scroll'}" class="content">
 		<!-- <view v-if="!isSearch"> -->
 		<!-- 		<view class="fixed">
 				<view class='title flex flex-center'>
@@ -14,11 +14,10 @@
 							}"></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'
@@ -39,7 +38,7 @@
 					</view>
 				</view>
 			</view>
-		
+
 		</view>
 		<view class="all-menu">
 			<u-transition :show="showMenu" mode="fade">
@@ -50,20 +49,21 @@
 					</view>
 				</view>
 			</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 @touchmove.stop.prevent="moveHandle" class="modal-black" v-show="showMenu"></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,7 +79,9 @@
 					<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>
@@ -104,26 +106,31 @@
 					<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>
-						<!-- 		<view class="right">
-							<view class="flex fontsize-26 row">
-								<view>{{good.compName}}</view>
-								<view class="sline"></view>
-								<view>{{good.cargoOwner}}</view>
+							<view v-if="good.cargoOwnerStatus!='已完结'" class="car">
+								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
-							<view class="flex align-center">
-								<view class="fontsize-26 ">运距 {{good.distance}}km</view>
+							<view v-else class="car">
+								{{good.freight?good.freight:good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
-						</view> -->
+						</view>
+						<!-- 		<view class="right">
+								<view class="flex fontsize-26 row">
+									<view>{{good.compName}}</view>
+									<view class="sline"></view>
+									<view>{{good.cargoOwner}}</view>
+								</view>
+								<view class="flex align-center">
+									<view class="fontsize-26 ">运距 {{good.distance}}km</view>
+								</view>
+							</view> -->
 					</view>
 					<view class="row4 flex align-center">
 						<view class="time">{{good.updateDate}}</view>
@@ -131,9 +138,10 @@
 					</view>
 					<view class="row5 flex flex-end">
 						<!-- <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)">
+								@click.stop="toMap(good)">
+							</image> -->
+						<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>
@@ -144,23 +152,27 @@
 						<!-- <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> -->
+								v-if="good.cargoOwnerStatus=='待收货'">确认卸车</view> -->
 						<!-- <view class="start normal" @click.stop="confirmLoading(good,2)">确认卸车</view> -->
 						<!-- <view class="normal" @click.stop="stop(good)" v-if="good.cargoOwnerStatus=='已结算'">付款</view> -->
 						<!-- <view class="normal" @click.stop="stop(good)"
-							v-if="good.cargoOwnerStatus=='待还款'||good.cargoOwnerStatus=='已还款'">还款</view> -->
+								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>
@@ -187,31 +199,33 @@
 			</view>
 		</view> -->
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="confirmClick"
+			:closeOnClickOverlay='true' :showCancelButton='showCancelButton' @confirm="$u.throttle(confirmClick, 5000)"
 			@close="cancelClick" @cancel="cancelClick" class="modal">
 		</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 class="u-popup-wrap">
+				<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='$u.throttle(termination, 5000)'>终止
+				</view>
 			</view>
-		           
+
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -228,14 +242,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: {},
@@ -246,16 +260,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: '',
@@ -344,28 +358,29 @@
 			// this.getLngLat();
 			//#endif
 		},
-		// async onLoad() {
-		// 	that = this
-		// 	// #ifdef APP-PLUS
-		// 	let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
-		// 		phone: this.userInfo.phone,
-		// 	}).then(res => {
-		// 		if(res.data){
-		// 			return res.data.authenticationStatus
-		// 		}
-				
-		// 	})
-		// 	if (_status == '已禁用') {
-		// 		this.isShowAlert = true
-		// 		this.alertTitle = '账号审核中'
-		// 		this.confirmText = '退出APP'
-		// 		this.showCancelButton = false
-		// 	} else {
-		// 		console.log(1231233212332312312213)
-		// 	}
-		// 	// #endif
+		onLoad() {
+
+			// that = this
+			// // #ifdef APP-PLUS
+			// let _status = await that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+			// 	phone: this.userInfo.phone,
+			// }).then(res => {
+			// 	if(res.data){
+			// 		return res.data.authenticationStatus
+			// 	}
+
+			// })
+			// if (_status == '已禁用') {
+			// 	this.isShowAlert = true
+			// 	this.alertTitle = '账号审核中'
+			// 	this.confirmText = '退出APP'
+			// 	this.showCancelButton = false
+			// } else {
+			// 	console.log(1231233212332312312213)
+			// }
+			// // #endif
 
-		// },
+		},
 		onShow() {
 			this.upCallback({
 				size: 10,
@@ -374,7 +389,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) {
@@ -416,21 +431,30 @@
 
 		// },
 		methods: {
-			closepopup(){
-				this.show=false
+			closepopup() {
+				this.show = false
+			},
+			moveHandle() {
+				// console.log(1111)
 			},
-			close(){
-				this.show=false
+			open() {
+				// console.log('open');
 			},
-			goTodriverDetail(val){
-				uni.$u.route('/pages/order/driverDetail',{
-					driver:JSON.stringify(val)
+			close() {
+				this.show = false
+				// console.log('close');
+			},
+			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) {
@@ -511,7 +535,7 @@
 				// } else {
 				// 	this.isShowTerminationReason = true
 				// }
-					// this.alertTitle = '确定终止订单？'
+				// this.alertTitle = '确定终止订单？'
 				this.id = item.id
 				this.show = true
 			},
@@ -521,8 +545,8 @@
 			del() {
 				this.isShowAlert = true
 			},
-			termination(){
-				var that=this
+			termination() {
+				var that = this
 				let _terminationReason = ''
 				if (this.radiovalue1 == '已与司机协商') {
 					_terminationReason = 1
@@ -533,33 +557,33 @@
 				} 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.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);
-						});
+				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') {
@@ -587,7 +611,10 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({size: 10,num: 1})
+										that.upCallback({
+											size: 10,
+											num: 1
+										})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -601,7 +628,10 @@
 									type: 'success',
 									message: _title,
 									complete() {
-										that.upCallback({size: 10,num: 1})
+										that.upCallback({
+											size: 10,
+											num: 1
+										})
 										that.mescroll.resetUpScroll()
 									}
 								})
@@ -636,7 +666,7 @@
 						.catch(res => {
 							uni.$u.toast(res.message);
 						});
-				} 
+				}
 			},
 			cancelClick() {
 				this.isShowAlert = false
@@ -701,12 +731,15 @@
 </script>
 
 <style scoped lang="scss">
-	.content{
+	.content {
 		padding-bottom: 160px;
 	}
-	.ssx{
-		position:relative;top:3rpx;
+
+	.ssx {
+		position: relative;
+		top: 3rpx;
 	}
+
 	.top-content {
 		background: url(../../static/images/order/bg.png) no-repeat;
 		background-size: cover;
@@ -717,7 +750,8 @@
 		// margin-top: var(--status-bar-height);
 		// padding-bottom: 320rpx;
 	}
-	.fix-content{
+
+	.fix-content {
 		// width: 96%;
 		margin-right: 20rpx;
 	}
@@ -1060,59 +1094,70 @@
 		background: black;
 		height: 100vh;
 		width: 100vw;
-		position: absolute;
+		position: fixed;
 		z-index: 999;
 		opacity: 0.3;
 	}
 
 	.all-menu {
-		position: absolute;
+		position: fixed;
 		z-index: 99;
 		top: 260rpx;
 	}
 
 	.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;
+	}
+
+	.u-popup-wrap {
+		padding: 20px;
 	}
-	
 </style>

pages/order/jb.vue

@@ -21,7 +21,7 @@
 			<u-upload class="uview-upload" :fileList="fileList1" @afterRead="afterRead($event)" @delete="deletePic"
 				name="1" multiple :maxCount="9"></u-upload>
 		</view>
-		<view class="row3" @click="submit">提交</view>
+		<view class="row3" @click="$u.throttle(submit(), 5000)">提交</view>
 		<u-picker :show="isShow" ref="uPicker"  :columns="orderList" keyName="orderNo" @confirm="confirmorder"
 			:closeOnClickOverlay='true' @close='isShow=false' @cancel='isShow=false'>
 		</u-picker>

pages/order/orderDetails.vue

@@ -186,21 +186,29 @@
 						v-for="(item,index) in zcImgList" @click='ylImg(zcImgList)'></u--image>
 				</view>
 			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">合计应付运费</view>
-				<view class="row-right-text">
-					 <u--input placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
+			<view v-if='dataObj.orderStatus=="待货主确认卸车"||dataObj.orderStatus=="待平台确认卸车"||dataObj.orderStatus=="货主驳回装车信息"||dataObj.orderStatus=="平台驳回装车信息"||dataObj.orderStatus=="待确认运费"||dataObj.cargoOwnerStatus=="已完结"'>
+				<view class='row-between'>
+					<view class="row-left-text gray">合计应付运费</view>
+					<view class="row-right-text">
+						 <u--input placeholder="请输入合计应付运费" border="none" inputAlign="right" clearable v-model="totalFreight"></u--input>
+					</view>
 				</view>
-			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">卸车时间</view>
-				<view class="row-right-text">{{dataObj.hyCarrierInfo.unloadingDate}}</view>
-			</view>
-			<view class='row-between'>
-				<view class="row-left-text gray">卸车照片</view>
-				<view class="flex">
-					<u--image :showLoading="true" :src="item" width="40px" height="40px"
-						v-for="(item,index) in xcImgList" @click='ylImg(xcImgList)'></u--image>
+				<view class='row-between'>
+					<view class="row-left-text gray">卸车时间</view>
+					<view class="row-right-text">{{dataObj.hyCarrierInfo.unloadingDate}}</view>
+				</view>
+				<view class='row-between'>
+					<view class="row-left-text gray">卸车照片</view>
+					<view class="flex">
+						<u--image :showLoading="true" :src="item" width="40px" height="40px"
+							v-for="(item,index) in xcImgList" @click='ylImg(xcImgList)'></u--image>
+					</view>
+				</view>
+				<view class='row-between'>
+					<view class="row-left-text gray">回单照片</view>
+					<view class="flex">
+						<u--image @click='ylImg(hdImgList)' :showLoading="true" :src='item' width="40px" height="40px" v-for="(item,index) in hdImgList"></u--image>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -255,7 +263,7 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="$u.throttle(confirmClick(), 5000)" @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"
@@ -267,7 +275,7 @@
 			</u--textarea>
 		</u-modal>
 		<u-popup :show="show" mode="bottom" @close="close" @open="open">
-			<view class="">
+			<view class="u-popup-wrap">
 				<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> -->
@@ -285,7 +293,7 @@
 		           <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 class='termination' :class="{'active':value2.length>0}" @click='$u.throttle(termination(), 5000)'>终止</view>
 			</view>
 		</u-popup>
 		<u-toast ref="uToast"></u-toast>
@@ -305,7 +313,7 @@
 		<u-modal :show="moneyShow"  title="合计运费" showCancelButton @confirm="moneyClick" @close="moneyclose"
 			@cancel="moneyclose">
 					<view class="slot-content">
-						<u--input v-model="totalFreight" type="number" placeholder="请输入合计运费"></u--input>
+						<u--input v-model="totalFreight" type="number" placeholder="请输入合计应付运费"></u--input>
 					</view>
 		</u-modal>
 		<!-- 		<view v-if="lookAlert" class="look-contract" @click="lookAlert==false">
@@ -383,6 +391,7 @@
 				isShowAlert: false,
 				zcImgList: [],
 				xcImgList: [],
+				hdImgList:[],
 				contractSrc: '',
 				canvasName: 'handWriting',
 				ctx: '',
@@ -447,8 +456,12 @@
 			closepopup(){
 				this.show=false
 			},
-			close(){
-				this.show=false
+			open() {
+			          // console.log('open');
+			},
+			close() {
+				this.show = false
+			          // console.log('close');
 			},
 			ylImg(src) {
 				uni.previewImage({
@@ -485,6 +498,7 @@
 				});
 			},
 			signContract() {
+				
 				// this.lookAlert = true
 				uni.$u.route('/pages/order/signContract', {
 					obj: JSON.stringify(this.dataObj)
@@ -621,6 +635,7 @@
 					let _flag = ''
 					if (this.type == 3) _flag = 1
 					if (this.type == 4) _flag = 2
+					
 					this.$request.baseRequest('post', '/carrierInfo/cargoOwnerLoadingAdd', {
 							orderId: this.dataObj.id,
 							id: this.dataObj.hyCarrierInfo.id,
@@ -866,6 +881,14 @@
 									if (_xcList[i]) this.xcImgList.push(_xcList[i])
 								}
 							}
+							if (res.data.hyCarrierInfo.receiptImg) {
+								this.hdImgList=[]
+								let _hdList = res.data.hyCarrierInfo.receiptImg.split(',')
+								console.log(_hdList)
+								for (let i = 0; i < _hdList.length; i++) {
+									if (_hdList[i]) this.hdImgList.push(_hdList[i])
+								}
+							}
 						}
 					}
 
@@ -1224,7 +1247,7 @@
 	}
 	/deep/.u-popup__content{
 		border-radius: 10px;
-		padding:20px;
+		// padding:20px;
 	}
 	/deep/.u-radio{
 		margin:40rpx 0;
@@ -1264,4 +1287,7 @@
 			line-height: 50rpx;
 		}
 	}
+	.u-popup-wrap{
+		padding:20px;
+	}
 </style>

pages/order/signContract.vue

@@ -76,7 +76,7 @@
 					:class="[selectColor === 'red' ? 'color_select' : '', 'black-select']"></image> -->
 
 				<!-- <button @click="saveCanvasAsImg" class="saveBtn">保存</button> -->
-				<view @click="submit" class="saveBtn">提交</view>
+				<view @click="$u.throttle(submit, 5000)" class="saveBtn">提交</view>
 				<!-- <button @click="previewCanvasImg" class="previewBtn">预览</button> -->
 				<!-- <button @click="subCanvas" class="subBtn">完成</button> -->
 			</view>
@@ -86,6 +86,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	var that;
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
@@ -121,9 +124,20 @@
 				chargeProportion:"",//收费比例
 			};
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
 		onLoad(options) {
 			that = this
-			that.chargeProportion =uni.getStorageSync("firstAuthentication").chargeProportion*100//收费比例从缓存中取
+			// 如果登录之后没有切换到我的页面缓存不会存上，所以在这调用接口取收费比例
+			this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+				phone: this.userInfo.phone
+			}).then(res => {
+				uni.setStorageSync("firstAuthentication", res.data)
+				//收费比例从缓存中取
+				that.chargeProportion =uni.getStorageSync("firstAuthentication").chargeProportion*100
+			})
+			
 			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
 			// this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.ctx = uni.createCanvasContext("handWriting");

pages/public/register.vue

@@ -9,31 +9,32 @@
 				<view style='width:85%;'>
 					<!-- <u-input border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
 						placeholder="请输入手机号码" type="number" class="Regular" /> -->
-					<input placeholder-style="color:#AFB3BF" border="none" maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;'
-							placeholder="请输入手机号码" type="number" class="Regular" />
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="11" v-model='phone'
+						@input='phoneinput' style='padding-left:10px;' placeholder="请输入手机号码" type="number"
+						class="Regular" />
 				</view>
 				<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
 			</view>
-			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px 0;' class="flex">
 				<view style='width:70%;position:relative;'>
-				<!-- 	<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
+					<!-- 	<u-input border="none" v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number" maxlength="6" />
 					 -->
-					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode'  style='padding-left:10px;'
-							placeholder="请输入验证码" type="number" class="Regular" /><!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
+					<input placeholder-style="color:#AFB3BF" border="none" maxlength="6" v-model='verifyCode' style=''
+						placeholder="请输入验证码" type="number" class="Regular" />
 				</view>
-				<button  :class='codestatus?"activeCode":""' @click='getcode'
+				<button :class='codestatus?"activeCode":""' @click='getcode'
 					class='getcode Regular'>{{sendText}}</button>
 			</view>
-			<view style='border-bottom:1px solid #E8E9ED;padding:10px;position:relative;'>
+			<view style='border-bottom:1px solid #E8E9ED;padding:10px 0;position:relative;'>
 				<!-- <u-input border="none" maxlength='16' class='Regular input-style' style='height:30px;'
 					v-model='password' placeholder="请输入密码，6-16位字符" :type="type" /> -->
-				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style='padding-left:10px;'
-							placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
+				<input placeholder-style="color:#AFB3BF" border="none" maxlength="16" v-model='password' style=''
+					placeholder="请输入密码，6-16位字符" :type="type" class="Regular input-style" />
 				<!-- 				<input maxlength='16' class='password Regular input-style' style='height:30px;' v-model='password' placeholder="请输入密码，6-16位字符" :type="type"> -->
 				<!-- <image v-if='password!=""' @click='password=""' class='close2' src='../../static/img/login/guanbi@2x.png'></image> -->
 				<!-- <view @click='switchover' style='position:absolute;right:0;top:38%;z-index:10;cursor:pointer;' class="iconfont " :class='type=="password"?"icon-yanjing-biyan":"icon-yanjing-zhengyan"'></view> -->
 			</view>
-			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='register'
+			<button :class='phone!=""&&verifyCode!=""&&password!=""?"active":""' @click='$u.throttle(register(), 5000)'
 				class='verificationCode'>注册</button>
 			<view
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
@@ -101,7 +102,7 @@
 				canIUseProfile: false
 			}
 		},
-		
+
 		onShow() {
 			// this.loginType = "wechat"
 
@@ -156,8 +157,7 @@
 			phoneinput(e) {
 				if (e.detail.value.length == 11) {
 					this.codestatus = true
-				}
-				else{
+				} else {
 					this.codestatus = false
 				}
 			},
@@ -235,8 +235,8 @@
 						password: this.password,
 						verifyCode: this.verifyCode,
 						userName: username,
-						identification:2,
-						avatarUrl:"https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165672849620975.png"//司机默认头像
+						identification: 2,
+						avatarUrl: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165672849620975.png" //司机默认头像
 					}).then(res => {
 						if (res.code == '11002') {
 							uni.showToast({
@@ -261,7 +261,7 @@
 									phone: this.phone,
 									password: this.password,
 									loginFlag: 1,
-									identification:2
+									identification: 2
 								}).then(res => {
 									if (res.code == 200) {
 										console.log("userInfo", res.data)
@@ -269,7 +269,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) {

pages/release/addAddress.vue

@@ -20,7 +20,9 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" inputAlign="left"  placeholder="详细地址"></u--input> -->
+						<u--textarea v-model="addressInfo.detailedAddress" border="none" inputAlign="left" placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -34,7 +36,7 @@
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<view class="submit" @click="submit">提交</view>
+		<view class="submit" @click="$u.throttle(submit(), 5000)">提交</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -160,7 +162,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符！",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -207,4 +219,11 @@
 	/deep/input{
 		word-break:break-all;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>

pages/release/editAddress.vue

@@ -19,7 +19,8 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none"  placeholder="详细地址" autoHeight  maxlength="30"></u--textarea>
+						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
 						<u--input v-model="addressInfo.contacts" border="none" placeholder="联系人">></u--input>
@@ -32,7 +33,7 @@
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<view class="submit" @click="submit">提交</view>
+		<view class="submit" @click="$u.throttle(submit, 5000)">提交</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -154,7 +155,17 @@
 				// 	id: 1,
 				// });
 			},
+			validate() {
+				if (this.addressInfo.contacts.length<2||this.addressInfo.contacts.length>10) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人姓名长度2-10个字符！",
+					})
+					return true
+				}
+			},
 			submit() {
+				if (this.validate()) return
 				this.isShowAlert = true
 
 			},
@@ -194,5 +205,12 @@
 		right: 0;
 		margin: auto;
 	}
+	/deep/.u-textarea{
+		padding:9px 0;
+	}
+	/deep/.u-textarea__field{
+		color:#000;
+		text-align:right;
+	}
 </style>
 

pages/release/editRelease.vue

@@ -220,7 +220,7 @@
 			:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
 		</u-picker>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -812,6 +812,13 @@
 			confirmValidityPeriodcq(e) {
 				console.log('confirm', e)
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataObj.taskValidity = e.value[0]
 				} else {
 					if (!e.value[1] || !e.value[2]) {

pages/release/record.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" class="mescroll"
+			:up="upOption">
 			<view class="top">
 				<u-icon class="back" name="arrow-left" color="" size="20" @click="back"></u-icon>
 				<u-search placeholder="可按编号、货主、收发地查找" v-model="searchKeyWord" @search="search" @custom="search"
@@ -23,7 +24,9 @@
 					<view class="flex row2">
 						<view class="left flex">
 							<view class="flex">
-								<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">{{good.sendCity}}</view>
 							</view>
 							<view class="level2-title">{{good.sendArea}}</view>
@@ -50,7 +53,9 @@
 									<view>{{good.goodsName}}</view>
 								</view>
 								<view class="sline" v-if="good.carLengthSmall&&good.carLength"></view>
-								<view class="cc" v-if="good.carLengthSmall&&good.carLength">{{good.carLengthSmall}} - {{good.carLength}} 米</view>
+								<view class="cc" v-if="good.carLengthSmall&&good.carLength">{{good.carLengthSmall}} -
+									{{good.carLength}} 米
+								</view>
 								<view class="sline" v-if="carType(good)"></view>
 								<view>{{carType(good)}}</view>
 							</view>
@@ -70,15 +75,17 @@
 						<view class="normal" @click.stop="del(good)">删除</view>
 						<!-- v-if="good.status!='已通过'" -->
 						<view class="normal" @click.stop="Refresh(good)" v-if="good.status=='已通过'">刷新</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'&&good.status=='已通过'">隐藏</view>
-						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'&&good.status=='已通过'">显示</view>
+						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='1'&&good.status=='已通过'">
+							隐藏</view>
+						<view class="normal" @click.stop="hideShow(good)" v-if="good.showHide=='2'&&good.status=='已通过'">
+							显示</view>
 					</view>
 				</view>
 			</view>
 		</mescroll-body>
 
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
+			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
 			@cancel="cancelClick" class="modal">
 		</u-modal>
 
@@ -113,7 +120,16 @@
 				isShowAlert: false,
 				goods: [], // 数据列表
 				delOrShowHidden: '',
-				rowObj: {}
+				rowObj: {},
+				upOption: {
+					page: {
+						size: 10 // 每页数据的数量,默认10
+					},
+					noMoreSize: 0, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+					empty: {
+						tip: ''
+					}
+				},
 			}
 		},
 		computed: {
@@ -167,7 +183,7 @@
 				this.mescroll = mescroll;
 			},
 			search() {
-				
+
 				this.mescroll.resetUpScroll()
 			},
 			back() {
@@ -178,13 +194,13 @@
 				if (good.carModel == 1) {
 					_val = ''
 				} else {
-					if (good.carModel&&good.carModel.includes(2)) {
+					if (good.carModel && good.carModel.includes(2)) {
 						_val += '高栏/'
 					}
-					if (good.carModel&&good.carModel.includes(3)) {
+					if (good.carModel && good.carModel.includes(3)) {
 						_val += '集装箱/'
 					}
-					if (good.carModel&&good.carModel.includes(4)) {
+					if (good.carModel && good.carModel.includes(4)) {
 						_val += '自卸车'
 					}
 				}
@@ -192,7 +208,7 @@
 			},
 			confirmDel() {
 				let that = this
-					that.isShowAlert = false
+				that.isShowAlert = false
 				this.$request.baseRequest('post', '/publishTaskInfo/deleteTask', {
 						id: this.rowObj.id,
 					}).then(res => {
@@ -201,7 +217,7 @@
 								type: 'success',
 								message: "删除成功!",
 								complete() {
-								
+
 									that.mescroll.resetUpScroll()
 								}
 							})
@@ -235,7 +251,7 @@
 						id: val.id,
 						commonId: this.userInfo.id
 					}).then(res => {
-						
+
 						if (res.code == 200) {
 							this.$refs.uToast.show({
 								type: 'success',
@@ -270,7 +286,7 @@
 				this.$request.baseRequest('post', '/publishTaskInfo/api/showHidden', {
 						id: this.rowObj.id,
 					}).then(res => {
-						
+
 						console.log(this.rowObj)
 						if (res.code == 200) {
 							if (this.rowObj.showHide == 2) {
@@ -349,6 +365,7 @@
 <style scoped lang="scss">
 	.content {
 		padding-top: var(--status-bar-height);
+		background: white;
 
 		.top {
 			display: flex;

pages/release/release.vue

@@ -239,11 +239,11 @@
 			:closeOnClickOverlay='true' @close='isGoodsType=false' @cancel='isGoodsType=false'>
 		</u-picker>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='false'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-modal :show="isShowAlert1" :title="alertTitle" :confirmText='confirmText' :content='alertContent'
 			:closeOnClickOverlay='false' :showCancelButton='showCancelButton' confirmColor='#2772FB'
-			@confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			@confirm="$u.throttle(confirmClick(), 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 
 	</view>
@@ -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)
 			}
@@ -584,6 +592,13 @@
 					})
 					return true
 				}
+				if (uni.$u.test.isEmpty(this.dataObj.goodsType)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "货物类别不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataObj.goodsName)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -598,6 +613,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',
@@ -789,10 +806,10 @@
 				} else {
 					this.dataObj.freightAdvance = 0
 				}
-				if(this.dataObj.receiverIdcard){
+				if(!this.dataObj.receiverIdcard){
 					this.dataObj.receiverIdcard=''
 				}
-				if(this.dataObj.receiverCreditCode){
+				if(!this.dataObj.receiverCreditCode){
 					this.dataObj.receiverCreditCode=''
 				}
 				let _list = []
@@ -857,7 +874,9 @@
 									taskDescription: '',
 									taskValidity: '',
 									sendLongitude: '',
+									receiverIdcard:'',
 									sendLatitude: '',
+									receiverCreditCode:'',
 									unsendLongitude: '',
 									unsendLatitude: '',
 								}
@@ -961,6 +980,7 @@
 							}else{
 								this.dataObj.compId=this.qyList[i].id
 							}
+							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
 							uni.setStorageSync('releasecompId', this.dataObj.compId)
 						}
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
@@ -1040,6 +1060,13 @@
 			},
 			confirmValidityPeriodcq(e) {
 				if (e.value[0] == '长期') {
+					if(e.value[1]||e.value[2]){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "选择长期时不允许选择月日！",
+						})
+						return
+					}
 					this.dataObj.taskValidity = e.value[0]
 				} else {
 					if (!e.value[1] || !e.value[2]) {
@@ -1087,7 +1114,8 @@
 			submit() {
 				if (this.validate()) return
 				if (this.dataObj.cargoOwner == '个人货主') {
-					this.dataObj.compId == ""
+					this.dataObj.compId = ""
+					this.dataObj.freightAdvance = 0
 				} else {
 					for (let i = 0; i < this.qyList.length; i++) {
 						if (this.dataObj.cargoOwner == this.qyList[i].companyName) {

pages/release/selectAddress.vue

@@ -53,7 +53,7 @@
 			<view class="btn-right" @click="selectAddress(1)">新增地址</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -108,7 +108,6 @@
 			console.log(options)
 			this.type = options.type
 			that = this
-
 		},
 		onShow() {
 			this.getList()

static/css/common.scss

@@ -11,7 +11,7 @@
 .flex{
 	display: flex;
 }
-.align-center{
+.align-center,.items-center{
 	align-items: center;
 }
 .inline-block{
@@ -91,7 +91,7 @@
 // 边线相关start
 .border-bottom{
 	border-bottom: 1px solid #EEEEEE;
-	padding-bottom: 10rpx;
+	padding-bottom: 30rpx;
 }
 // 边线相关end
 

uni_modules/mescroll-uni/components/mescroll-diy/beibei/mescroll-uni-option.js

@@ -18,7 +18,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "https://www.mescroll.com/img/mescroll-empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "/static/empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置
@@ -29,7 +29,7 @@ const GlobalOption = {
 				textLoading: '加载中 ...', // 加载中的提示文本
 				textNoMore: ' 没有更多了~ ', // 没有更多数据的提示文本
 				empty: {
-					tip: '~ 暂无相关数据 ~' // 空提示
+					tip: '~ 没有更多记录啦！ ~' // 空提示
 				}
 			}
 		},
@@ -46,4 +46,4 @@ const GlobalOption = {
 	}
 }
 
-export default GlobalOption
+export default GlobalOption

uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-uni-option.js

@@ -19,7 +19,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "https://www.mescroll.com/img/mescroll-empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "/static/empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置

uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue

@@ -3,114 +3,118 @@
 <mescroll-empty v-if="isShowEmpty" :option="optEmpty" @emptyclick="emptyClick"></mescroll-empty>
 -->
 <template>
-	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
-		<view> <image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" /> </view>
+	<view class="mescroll-empty" :class="{ 'empty-fixed': option.fixed }"
+		:style="{ 'z-index': option.zIndex, top: option.top }">
+		<view>
+			<image v-if="icon" class="empty-icon" :src="icon" mode="widthFix" />
+		</view>
 		<view v-if="tip" class="empty-tip">{{ tip }}</view>
 		<view v-if="btnText" class="empty-btn" @click="emptyClick">{{ btnText }}</view>
 	</view>
 </template>
 
 <script>
-// 引入全局配置
-import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
-// 引入国际化工具类
-import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
-export default {
-	props: {
-		// empty的配置项: 默认为GlobalOption.up.empty
-		option: {
-			type: Object,
-			default() {
-				return {};
-			}
-		}
-	},
-	// 使用computed获取配置,用于支持option的动态配置
-	computed: {
-		// 图标
-		icon() {
-			if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
-				return this.option.icon
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				if (this.option.i18n) {
-					return this.option.i18n[i18nType].icon
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+	// 引入全局配置
+	import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
+	// 引入国际化工具类
+	import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
+	export default {
+		props: {
+			// empty的配置项: 默认为GlobalOption.up.empty
+			option: {
+				type: Object,
+				default () {
+					return {};
 				}
 			}
 		},
-		// 文本提示
-		tip() {
-			if (this.option.tip != null) { // 支持传空串不显示文本提示
-				return this.option.tip
-			} else{
-				let i18nType = mescrollI18n.getType() // 国际化配置
+		// 使用computed获取配置,用于支持option的动态配置
+		computed: {
+			// 图标
+			icon() {
+				if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
+					return this.option.icon
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].icon
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+					}
+				}
+			},
+			// 文本提示
+			tip() {
+				if (this.option.tip != null) { // 支持传空串不显示文本提示
+					return this.option.tip
+				} else {
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					if (this.option.i18n) {
+						return this.option.i18n[i18nType].tip
+					} else {
+						return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					}
+				}
+			},
+			// 按钮文本
+			btnText() {
 				if (this.option.i18n) {
-					return this.option.i18n[i18nType].tip
-				} else{
-					return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+					let i18nType = mescrollI18n.getType() // 国际化配置
+					return this.option.i18n[i18nType].btnText
+				} else {
+					return this.option.btnText
 				}
 			}
 		},
-		// 按钮文本
-		btnText() {
-			if (this.option.i18n) {
-				let i18nType = mescrollI18n.getType() // 国际化配置
-				return this.option.i18n[i18nType].btnText
-			} else{
-				return this.option.btnText
+		methods: {
+			// 点击按钮
+			emptyClick() {
+				this.$emit('emptyclick');
 			}
 		}
-	},
-	methods: {
-		// 点击按钮
-		emptyClick() {
-			this.$emit('emptyclick');
-		}
-	}
-};
+	};
 </script>
 
 <style>
-/* 无任何数据的空布局 */
-.mescroll-empty {
-	box-sizing: border-box;
-	width: 100%;
-	padding: 100rpx 50rpx;
-	text-align: center;
-}
+	/* 无任何数据的空布局 */
+	.mescroll-empty {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 100rpx 50rpx;
+		text-align: center;
+	}
 
-.mescroll-empty.empty-fixed {
-	z-index: 99;
-	position: absolute; /*transform会使fixed失效,最终会降级为absolute */
-	top: 100rpx;
-	left: 0;
-}
+	.mescroll-empty.empty-fixed {
+		z-index: 99;
+		position: absolute;
+		/*transform会使fixed失效,最终会降级为absolute */
+		top: 100rpx;
+		left: 0;
+	}
 
-.mescroll-empty .empty-icon {
-	width: 280rpx;
-	height: 280rpx;
-}
+	.mescroll-empty .empty-icon {
+		width: 496rpx;
+		height: 308rpx;
+	}
 
-.mescroll-empty .empty-tip {
-	margin-top: 20rpx;
-	font-size: 24rpx;
-	color: gray;
-}
+	.mescroll-empty .empty-tip {
+		margin-top: 20rpx;
+		font-size: 26rpx;
+		color: #333;
+	}
 
-.mescroll-empty .empty-btn {
-	display: inline-block;
-	margin-top: 40rpx;
-	min-width: 200rpx;
-	padding: 18rpx;
-	font-size: 28rpx;
-	border: 1rpx solid #e04b28;
-	border-radius: 60rpx;
-	color: #e04b28;
-}
+	.mescroll-empty .empty-btn {
+		display: inline-block;
+		margin-top: 40rpx;
+		min-width: 200rpx;
+		padding: 18rpx;
+		font-size: 28rpx;
+		border: 1rpx solid #e04b28;
+		border-radius: 60rpx;
+		color: #e04b28;
+	}
 
-.mescroll-empty .empty-btn:active {
-	opacity: 0.75;
-}
+	.mescroll-empty .empty-btn:active {
+		opacity: 0.75;
+	}
 </style>

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni-option.js

@@ -19,7 +19,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "https://www.mescroll.com/img/mescroll-empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "/static/empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置

uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js

@@ -30,10 +30,11 @@ export default function MeScroll(options, isScrollBody) {
 			}
 		}
 		// 自动触发上拉加载
-		if(!me.isUpAutoLoad){ // 部分小程序(头条小程序)emit是异步, 会导致isUpAutoLoad判断有误, 先延时确保先执行down的callback,再执行up的callback
-			setTimeout(function(){
+		if (!me
+			.isUpAutoLoad) { // 部分小程序(头条小程序)emit是异步, 会导致isUpAutoLoad判断有误, 先延时确保先执行down的callback,再执行up的callback
+			setTimeout(function() {
 				me.optUp.use && me.optUp.auto && !me.isUpAutoLoad && me.triggerUpScroll();
-			},100)
+			}, 100)
 		}
 	}, 30); // 需让me.optDown.inited和me.optUp.inited先执行
 }
@@ -121,7 +122,7 @@ MeScroll.prototype.extendUpScroll = function(optUp) {
 		empty: {
 			use: true, // 是否显示空布局
 			icon: null, // 图标路径
-			tip: '~ 暂无相关数据 ~', // 提示
+			tip: '~ 没有更多记录啦！ ~', // 提示
 			btnText: '', // 按钮
 			btnClick: null, // 点击按钮的回调
 			onShow: null, // 是否显示的回调
@@ -153,7 +154,7 @@ MeScroll.extend = function(userOption, defaultOption) {
 
 /* 简单判断是否配置了颜色 (非透明,非白色) */
 MeScroll.prototype.hasColor = function(color) {
-	if(!color) return false;
+	if (!color) return false;
 	let c = color.toLowerCase();
 	return c != "#fff" && c != "#ffffff" && c != "transparent" && c != "white"
 }
@@ -163,16 +164,17 @@ MeScroll.prototype.initDownScroll = function() {
 	let me = this;
 	// 配置参数
 	me.optDown = me.options.down || {};
-	if(!me.optDown.textColor && me.hasColor(me.optDown.bgColor)) me.optDown.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	if (!me.optDown.textColor && me.hasColor(me.optDown.bgColor)) me.optDown.textColor =
+	"#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
 	me.extendDownScroll(me.optDown);
-	
+
 	// 如果是mescroll-body且配置了native,则禁止自定义的下拉刷新
-	if(me.isScrollBody && me.optDown.native){
+	if (me.isScrollBody && me.optDown.native) {
 		me.optDown.use = false
-	}else{
+	} else {
 		me.optDown.native = false // 仅mescroll-body支持,mescroll-uni不支持
 	}
-	
+
 	me.downHight = 0; // 下拉区域的高度
 
 	// 在页面中加入下拉布局
@@ -211,16 +213,17 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 	// scroll-view在滚动时不会触发touchmove,当触顶/底/左/右时,才会触发touchmove
 	// scroll-view滚动到顶部时,scrollTop不一定为0,也有可能大于0; 在iOS的APP中scrollTop可能为负数,不一定和startTop相等
 	if (moveY > 0 && (
-			(me.isScrollBody && scrollTop <= 0)
-			||
-			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me.startTop)) )
+			(me.isScrollBody && scrollTop <= 0) ||
+			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me
+				.startTop)))
 		)) {
 		// 可下拉的条件
-		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling &&
+		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me
+				.isUpScrolling &&
 				me.optUp.isBoth))) {
 
 			// 下拉的初始角度是否在配置的范围内
-			if(!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
+			if (!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
 			if (me.startAngle < me.optDown.minAngle) return; // 如果小于配置的角度,则不往下执行下拉刷新
 
 			// 如果手指的位置超过配置的距离,则提前结束下拉,避免Webview嵌套导致touchend无法触发
@@ -229,7 +232,7 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 				me.touchendEvent(); // 提前触发touchend
 				return;
 			}
-			
+
 			me.preventDefault(e); // 阻止默认事件
 
 			let diff = curPoint.y - me.lastPoint.y; // 和上次比,移动的距离 (大于0向下,小于0向上)
@@ -257,7 +260,7 @@ MeScroll.prototype.touchmoveEvent = function(e) {
 					me.downHight += diff; // 向上收回高度,则向上滑多少收多少高度
 				}
 			}
-			
+
 			me.downHight = Math.round(me.downHight) // 取整
 			let rate = me.downHight / me.optDown.offset; // 下拉区域当前高度与指定距离的比值
 			me.optDown.onMoving && me.optDown.onMoving(me, rate, me.downHight); // 下拉过程中的回调,一直在执行
@@ -350,7 +353,7 @@ MeScroll.prototype.showDownScroll = function() {
 	if (this.optDown.native) {
 		uni.startPullDownRefresh(); // 系统自带的下拉刷新
 		this.showDownLoadingCall(0); // 仍触发showLoading,因为上拉加载用到
-	} else{
+	} else {
 		this.downHight = this.optDown.offset; // 更新下拉区域高度
 		this.showDownLoadingCall(this.downHight); // 下拉刷新中...
 	}
@@ -382,16 +385,16 @@ MeScroll.prototype.endDownScroll = function() {
 		me.downHight = 0;
 		me.isDownScrolling = false;
 		me.endDownScrollCall(me);
-		if(!me.isScrollBody){
+		if (!me.isScrollBody) {
 			me.setScrollHeight(0) // scroll-view重置滚动区域,使数据不满屏时仍可检查触发翻页
-			me.scrollTo(0,0) // scroll-view需重置滚动条到顶部,避免startTop大于0时,对下拉刷新的影响
+			me.scrollTo(0, 0) // scroll-view需重置滚动条到顶部,避免startTop大于0时,对下拉刷新的影响
 		}
 	}
 	// 结束下拉刷新时的回调
 	let delay = 0;
 	if (me.optDown.beforeEndDownScroll) {
 		delay = me.optDown.beforeEndDownScroll(me); // 结束下拉刷新的延时,单位ms
-		if(me.isDownEndSuccess == null) delay = 0; // 没有执行加载中,则不延时
+		if (me.isDownEndSuccess == null) delay = 0; // 没有执行加载中,则不延时
 	}
 	if (typeof delay === 'number' && delay > 0) {
 		setTimeout(endScroll, delay);
@@ -421,8 +424,11 @@ MeScroll.prototype.lockUpScroll = function(isLock) {
 MeScroll.prototype.initUpScroll = function() {
 	let me = this;
 	// 配置参数
-	me.optUp = me.options.up || {use: false}
-	if(!me.optUp.textColor && me.hasColor(me.optUp.bgColor)) me.optUp.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	me.optUp = me.options.up || {
+		use: false
+	}
+	if (!me.optUp.textColor && me.hasColor(me.optUp.bgColor)) me.optUp.textColor =
+	"#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
 	me.extendUpScroll(me.optUp);
 
 	if (me.optUp.use === false) return; // 配置不使用上拉加载时,则不初始化上拉布局
@@ -449,7 +455,7 @@ MeScroll.prototype.onReachBottom = function() {
 /*列表滚动事件 (仅mescroll-body生效)*/
 MeScroll.prototype.onPageScroll = function(e) {
 	if (!this.isScrollBody) return;
-	
+
 	// 更新滚动条的位置 (主要用于判断下拉刷新时,滚动条是否在顶部)
 	this.setScrollTop(e.scrollTop);
 
@@ -674,8 +680,8 @@ MeScroll.prototype.endErr = function(errDistance) {
 		this.optUp.page.num--;
 		this.endUpScroll(false);
 		// 如果是mescroll-body,则需往回滚一定距离
-		if(this.isScrollBody && errDistance !== 0){ // 不处理0
-			if(!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
+		if (this.isScrollBody && errDistance !== 0) { // 不处理0
+			if (!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
 			this.scrollTo(this.getScrollTop() - errDistance, 0) // 往上回滚的距离
 		}
 	}
@@ -796,4 +802,4 @@ MeScroll.prototype.preventDefault = function(e) {
 	// app的bounce只能通过配置pages.json的style.app-plus.bounce为"none"来禁止, 或使用renderjs禁止
 	// cancelable:是否可以被禁用; defaultPrevented:是否已经被禁用
 	if (e && e.cancelable && !e.defaultPrevented) e.preventDefault()
-}
+}

util/request.js

@@ -46,15 +46,21 @@ const baseRequest = (method, url, data, header) => {
 							if (res[1].data.code == '200' || res[1].data.code == 200) {
 								resolve(res[1].data)
 							}else{
-								resolve(res[1].data)
+								uni.showToast({
+									icon:'none',
+									title: res[1].data.message,
+									duration: 2000 
+								}); 
+								// resolve(res[1].data)
 							}
 						} else {
+							uni.showToast({
+								icon: 'none',
+								title: '网络异常，请检查网络状况',
+								duration: 2000
+							});
 							reject(response)
-							// uni.showToast({
-							// 	icon: 'none',
-							// 	title: '网络异常，请检查网络状况',
-							// 	duration: 2000
-							// });
+							
 						}
 						// // 登录失败
 						// if(res[1].data.code == '11006' || res[1].data.code == 11006){
@@ -73,6 +79,11 @@ const baseRequest = (method, url, data, header) => {
 					}
 				).catch(
 					(response) => {
+						uni.showToast({
+							icon: 'none',
+							title: '系统未知异常，请联系管理员',
+							duration: 2000
+						});
 						reject(response)
 					}
 				)