更新

pages.json

@@ -125,9 +125,10 @@
 				"app-plus": {
 					"titleNView": {
 						"buttons": [{
-							"text": "&#xe622",
+							"text": "\ue622",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "22"
+							 // "redDot": "true"
 						}]
 					}
 				}

pages/mine/driverCertificationNext.vue

@@ -199,6 +199,10 @@
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">通讯地址</view>
+					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress"></u--input>
+				</view>
 			</view>
 			<view class="flex service align-center">
 				<u--image @click='consent'
@@ -538,6 +542,13 @@
 						return true
 					}
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.postalAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "通讯地址不能为空！",
+					})
+					return true
+				}
 				return false
 			},
 			submit() {

pages/mine/editDriverCertificationNext.vue

@@ -200,6 +200,10 @@
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}
 					</view>
 				</view>
+				<view class="flex row">
+					<view class="left-text">通讯地址</view>
+					<u--input placeholder="输入通讯地址" inputAlign='left' border="none" v-model="dataDetails.postalAddress"></u--input>
+				</view>
 			</view>
 			<view class="flex service align-center">
 				<u--image @click='consent'
@@ -527,6 +531,13 @@
 						return true
 					}
 				}
+				if (uni.$u.test.isEmpty(this.dataDetails.postalAddress)) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "通讯地址不能为空！",
+					})
+					return true
+				}
 				return false
 			},
 			delSubmitObj() {

pages/order/orderDetails.vue

@@ -17,8 +17,7 @@
 			<!-- flex flex-space-between -->
 			<view class="item2">
 				<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
-				<u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'">
-				</u-button>
+				<u-button class="btn" text="签订合同" @click="signContract" ></u-button>
 				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='待货主确认'||dataObj.orderStatus=='未装车'"></u-button>
 				<!-- <u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService"></u-button> -->
 				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading" v-if="dataObj.orderStatus=='未装车'&&dataObj.driverContract=='1'"></u-button> -->
@@ -280,7 +279,7 @@
 			},
 			signContract() {
 				// this.lookAlert = true
-				uni.$u.route('/pages/order/signContract',{obj:JSON.stringify(this.dataObj)} 
+				uni.$u.route('/pages/order/signContract',{obj:encodeURIComponent(JSON.stringify(this.dataObj))} 
 				);
 				
 			},
@@ -318,7 +317,6 @@
 			},
 			confirmClick() {
 				let  that = this
-				console.log('终止')
 				if (this.radiovalue1 == '其他' && !this.value2) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -342,7 +340,6 @@
 						terminationReasonDescription: this.value2,
 						terminator:1
 					}).then(res => {
-						console.log(res) 
 						this.isShowAlert = false
 						// this.mescroll.resetUpScroll()
 						this.$refs.uToast.show({
@@ -401,8 +398,6 @@
 					})
 			},
 			goConfirmLoading(id) {
-				
-				console.log('点击详情id：', id)
 				uni.$u.route('/pages/order/confirmLoading', {
 					id: this.id,
 				});

pages/order/signContract.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-<!-- 		<view class="content1">
+		<!-- 		<view class="content1">
 			<view style='width:70px'>付款方式</view>
 			<u-radio-group v-model="dataDetails.advanceFreightService" placement="row">
 				<u-radio :customStyle="radioCustomStyle" v-for="(item, index) in radiolist1" :key="index"
@@ -37,12 +37,68 @@
 				<view class="gray">距离</view>
 				<view class="">约{{dataDetails.distance}}公里</view>
 			</view>
+
+			<view class="title">
+				完善信息
+			</view>
 			<view class='row-between'>
 				<view class="gray">运费</view>
-				<view class="">{{dataDetails.freight}}{{dataDetails.illingMethod==0?'元/吨':'元/车'}}</view>
+				<!-- <view class="">{{dataDetails.freight}}{{dataDetails.illingMethod==0?'元/吨':'元/车'}}</view> -->
 				<!-- 				<view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
 						class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
+				<view class="flex">
+					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freightCars" inputAlign='right'
+						clearable></u--input>
+					<!-- <span>元/车</span> -->
+				</view>
+			</view>
+			<view class='row-between'>
+				<view class="gray">挂车号（选填）</view>
+				<view class="">
+					<u--input placeholder="请输入挂车号" border="none" v-model="dataDetails.trailerNumber" inputAlign='right'
+						clearable></u--input>
+				</view>
+			</view>
+			<view class='row-between'>
+				<view class="gray">运输开始日期</view>
+				<view class="">
+					<view @click="dateShow">{{dataDetails.startDates?dataDetails.startDates:'请选择运输开始日期'}}
+					</view>
+					<u-datetime-picker :show="startShow" mode="date"
+						@cancel="removeStart" @confirm="startDate" @close="removeStart"></u-datetime-picker>
+				</view>
+			</view>
+			<view class='row-between'>
+				<view class="gray">运输截止日期</view>
+				<view class="">
+				<!-- 	<u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
+						clearable></u--input> -->
+						<view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}</view>
+					<u-datetime-picker :show="endShow"  mode="date" @cancel="removeEnd" @confirm="endDate" @close="removeEnd"></u-datetime-picker>
+				</view>
+			</view>
+			<view class='row-between'>
+				<view class="gray">联络人姓名</view>
+				<view class="">
+					<u--input placeholder="请输入联络人姓名" border="none" v-model="dataDetails.contactPersonName" inputAlign='right'
+						clearable></u--input>
+				</view>
 			</view>
+			<view class='row-between'>
+				<view class="gray">联络人电话</view>
+				<view class="">
+					<u--input placeholder="请输入联络人电话" border="none" type="number" maxlength="11" v-model="dataDetails.contactPersonPhone" inputAlign='right'
+						clearable></u--input>
+				</view>
+			</view>
+			<view class='row-between'>
+				<view class="gray">装车后预付款</view>
+				<view class="">
+					<u--input placeholder="请输入装车后预付款" border="none" v-model="dataDetails.advanceCharge" inputAlign='right'
+						clearable></u--input>
+				</view>
+			</view>
+
 		</view>
 		<view class="wrapper content3">
 			<view class="qm-row">
@@ -87,7 +143,7 @@
 					margin: '0 0 0 10rpx'
 				},
 				canvasName: 'handWriting',
-				ctx: '',
+				ctx: "",
 				startX: null,
 				startY: null,
 				canvasWidth: 0,
@@ -106,12 +162,17 @@
 						disabled: false
 					},
 				],
+				startShow: false,
+				endShow:false,
+				
+			
 			};
 		},
 		onLoad(options) {
 			that = this
-			console.log(options)
-			this.dataDetails =JSON.parse(options.obj) 
+			console.log(JSON.parse(options.obj))
+			// this.dataDetails = JSON.parse(options.obj)
+			this.dataDetails = JSON.parse(decodeURIComponent(options.obj))
 			this.dataDetails.advanceFreightService = '平台垫付运费'
 			this.ctx = uni.createCanvasContext("handWriting");
 			this.$nextTick(() => {
@@ -125,6 +186,25 @@
 			});
 		},
 		methods: {
+			dateShow(){
+				this.startShow = true
+			},
+			removeStart(){
+				this.startShow = false
+			},
+			removeEnd(){
+				this.endShow = false
+			},
+			startDate(e) {
+				let timeFormat = uni.$u.timeFormat
+				this.dataDetails.startDates = timeFormat(e.value,"yyyy-mm-dd")
+				this.startShow = false
+			},
+			endDate(e){
+				let timeFormat = uni.$u.timeFormat
+				this.dataDetails.endDates = timeFormat(e.value,"yyyy-mm-dd")
+				this.endShow = false
+			},
 			submit() {
 				if (!that.isScaleStart) {
 					that.$refs.uToast.show({
@@ -133,13 +213,59 @@
 					})
 					return
 				}
-				// if (uni.$u.test.isEmpty(that.dataDetails.freight)) {
-				// 	that.$refs.uToast.show({
-				// 		type: 'error',
-				// 		message: "运费不能为空！",
-				// 	})
-				// 	return
-				// }
+				if (uni.$u.test.isEmpty(that.dataDetails.freightCars)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "运费不能为空！",
+					})
+					return
+				}
+				if (uni.$u.test.isEmpty(that.dataDetails.startDates)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "运输起始日期不能为空！",
+					})
+					return
+				}
+				if (uni.$u.test.isEmpty(that.dataDetails.endDates)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "运输截止日期不能为空！",
+					})
+					return
+				}
+				if (uni.$u.test.isEmpty(that.dataDetails.contactPersonName)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "联络人姓名不能为空！",
+					})
+					return
+				}
+				if (uni.$u.test.isEmpty(that.dataDetails.contactPersonPhone)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "联络人电话不能为空！",
+					})
+					return
+				}
+				if (uni.$u.test.isEmpty(that.dataDetails.advanceCharge)) {
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "装车后预付款不能为空！",
+					})
+					return
+				}
+				console.log(that.dataDetails)
+				let _obj = {}
+				_obj.trailerNumber = that.dataDetails.trailerNumber
+				_obj.startDates = that.dataDetails.startDates
+				_obj.endDates = that.dataDetails.endDates
+				_obj.contactPersonName = that.dataDetails.contactPersonName
+				_obj.contactPersonPhone = that.dataDetails.contactPersonPhone
+				_obj.freightCars = that.dataDetails.freightCars
+				_obj.advanceCharge = that.dataDetails.advanceCharge
+				_obj.id = that.dataDetails.id
+				
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
 					fileType: 'png',
@@ -149,44 +275,42 @@
 						uploadImage('image', res.tempFilePath, 'appData/',
 							result => {
 								// 上传成功
-								console.log('图片地址', result)
 								that.dataDetails.cargoOwnerAutograph = result
-
-
+								_obj.driverAutograph = result
 								uni.showLoading({
 									title: '加载中',
 									mask: true
 								})
-
-								that.$request.baseRequest('get', '/orderInfo/setPdf', that.dataDetails).then(res => {
-										if (res.code == 200) {
-											// that.contractSrc = res.data
-											// uni.downloadFile({
-											// 	url: res.data,
-											// 	success: function(res) {
-											// 		var filePath = res.tempFilePath;
-											// 		uni.openDocument({
-								   //  		filePath: filePath,
-											// 			showMenu: true,
-								   // 			success: function(res) {
-											// 				console.log('打开文档成功');
-											// 			}
-											// 		});
-											// 	}
-											// });
-											// this.$refs.uToast.show({
-											// 	type: 'success',
-											// 	message: "提交成功",
-											// 	complete() {
-											// 		that.upCallback({
-											// 			size: 10,
-											// 			num: 1
-											// 		})
-											// 	}
-											// })
-
-										}
-									})
+								that.$request.baseRequest('get', '/orderInfo/setPdf', _obj).then(
+										res => {
+											if (res.code == 200) {
+												uni.hideLoading()
+												that.contractSrc = res.data
+												uni.downloadFile({
+													url: res.data,
+													success: function(res) {
+														var filePath = res.tempFilePath;
+														uni.openDocument({
+												 		filePath: filePath,
+															showMenu: true,
+															success: function(res) {
+																console.log('打开文档成功');
+															}
+														});
+													}
+												});
+												that.$refs.uToast.show({
+													type: 'success',
+													message: "提交成功",
+													complete() {
+														that.upCallback({
+															size: 10,
+															num: 1
+														})
+													}
+												})
+											}
+										})
 									.catch(res => {
 										uni.$u.toast(res.message);
 									});

pages/riders/fleetInvitation.vue

@@ -34,6 +34,7 @@
 				</u-swipe-action-item>
 			</u-swipe-action>
 		</view>
+		<u-loadmore :status="status" :nomore-text="nomoreText" />
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -51,9 +52,43 @@
 						// height:'180rpx',
 						backgroundColor: '#FE5C5C',
 					}
-				}]
+				}],
+				status: 'loadmore',
+				nomoreText: '暂无记录',
+				isLoadMore: false, //是否加载中
+				pages: 1, //分页
+				limit: 10, //每次取条目数
 			}
 		},
+		// onPullDownRefresh() { //下拉刷新
+		//     this.$refs.udb.loadData({
+		//       clear: true //可选参数，是否清空数据
+		//     }, () => {
+		//       uni.stopPullDownRefresh()
+		//     })
+		//   },
+		//   onReachBottom() { //滚动到底翻页
+		//     this.$refs.udb.loadMore()
+		//   },
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.pages += 1
+				this.getList()
+			}
+		},
+		onPullDownRefresh() {
+			this.pages = 1
+			this.isLoadMore = false
+			this.status = 'loading'
+			this.getList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		onShow() {
 
 		},
@@ -127,14 +162,20 @@
 					});
 			},
 			getList() {
+				this.status = 'loading'
 				this.$request.baseRequest('get', '/fleetMemberInfo/selectFleetMemberInfo', {
 						commonId: this.commonId,
 						flag: 2,
 						pageSize: 10,
-						currentPage: 1
+						currentPage: this.pages
 					}).then(res => {
 						if (res.code == 200) {
 							this.applyList = res.data.records
+							if (res.data.total == 0) {
+								this.status = 'nomore'
+							} else {
+								this.status = 'loadmore'
+							}
 						}
 					})
 					.catch(res => {
@@ -164,7 +205,7 @@
 			.fleet_name {
 				width: 50%;
 				margin-top: 20rpx;
-				color: #333333 ;
+				color: #333333;
 				font-size: 34rpx;
 				font-weight: 600;
 			}

pages/riders/fleetSee.vue

@@ -3,8 +3,11 @@
 
 		<view class="fleet_info">
 			<view class="fleet_top_css">
-				<u-avatar :src="fleetInfo.coverUrl" size="75" class="fleetInfo_img"></u-avatar>
-				<view class="fleetInfo_top_right">
+				<!-- {{fleetInfo.coverUrl}} -->
+				<view class="">
+					<u-avatar :src="fleetInfo.coverUrl" size="75" class="fleetInfo_img"  mode="circle"></u-avatar>
+				</view>
+				<view class="fleetInfo_top_right"> 
 					<view class="fleetInfo_name">{{fleetInfo.fleetName}}
 						<!-- type 1队长 2队员 -->
 						<image v-if="type == 1" src="../../static/images/riders/shezhi.png" mode=""
@@ -24,7 +27,6 @@
 					{{fleetInfo.fleetProfile}}
 				</view>
 				<u-popup :show="seeInfoShow" @close="seeInfoClose" @open="seeInfo" round="20" >
-					
 					<view class="popUp">
 						<view class="fleet_introduce_css">车队简介</view>
 						<text>{{fleetInfo.fleetProfile}}</text>
@@ -96,9 +98,10 @@
 		</view>
 		<!-- chunLei-popups v-model="value" :popData="dataList" @tapPopup="tapPopup" :x="344" :y="20" placement="top-end">
 		</chunLei-popups> -->
+		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="quitShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
-		<u-toast ref="uToast"></u-toast>
+		
 	</view>
 </template>
 
@@ -281,7 +284,7 @@
 			.fleetInfo_img {
 				position: absolute;
 				top: -40rpx;
-				left: 40rpx
+				left: 40rpx;
 			}
 
 			.fleetInfo_top_right {

pages/riders/inTeam.vue

@@ -56,6 +56,7 @@
 				</view>
 			</view> -->
 		</view>
+		<u-loadmore :status="status"  :nomore-text="nomoreText" />
 		<u-modal :show="auditShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
@@ -79,7 +80,9 @@
 				auditShow: false,
 				alertTitle: "",
 				btnSign: "",
-				btnInfo: {}
+				btnInfo: {},
+				status: 'loadmore',
+				 nomoreText: '暂无记录'
 			}
 		},
 		onShow() {
@@ -180,6 +183,7 @@
 					});
 			},
 			getList() {
+				this.status = 'loading';
 				this.$request.baseRequest('get', '/fleetMemberInfo/selectFleetMemberInfo', {
 						commonId: this.commonId,
 						flag: 1,
@@ -188,6 +192,11 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.applyList = res.data.records
+							if(res.data.total == 0){
+								this.status = 'nomore'
+							}else{
+								this.status = 'loadmore'
+							}
 						}
 					})
 					.catch(res => {