更新

pages/mine/driverCertification.vue

@@ -38,7 +38,7 @@
 			
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard">
+					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard" maxlength="18">
 					</u--input>
 				</view>
 			
@@ -62,7 +62,7 @@
 					<view class="left-text">性别</view>
 					<u-radio-group v-model="dataDetails.driverSex" placement="row">
 						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"
-							:label="item.name" :name="item.name" @change="radioChange">
+							:label="item.name" :name="item.name" @change="radioChange" style="margin: 0 20rpx;">
 						</u-radio>
 					</u-radio-group>
 				</view>
@@ -70,7 +70,7 @@
 				<view class="flex row row-ch">
 					<view class="left-text">称呼</view>
 					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
-						v-model="dataDetails.driverCall">
+						v-model="dataDetails.driverCall" maxlength="1">
 					</u--input>
 					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
 					<view class="flex align-center" v-else>女士</view>
@@ -385,7 +385,6 @@
 				// maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				// isAdd: true,
 				imagesrc: null,
-				payCheck: true
 			};
 		},
 		onLoad() {
@@ -680,18 +679,17 @@
 			},
 			uploadImg(type, index) {
 				this.uploadType = type
-				this.isShowimgType = true
+				// this.isShowimgType = true
+				this.imgTypeSelect()
 				this.index = index
 
 			},
 			// 上传图片
 			imgTypeSelect(val) {
-				console.log(val)
-				console.log(this.uploadType)
-				if (val.name == '相册') {
+				// if (val.name == '相册') {
 					uni.chooseImage({
 						count: 1,
-						sourceType: this.$helper.chooseImage.sourceType,
+						// sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
 							uploadImage('image', res.tempFilePaths[0], 'appData/',
@@ -709,9 +707,8 @@
 													}).then(res => {
 													_this.dataDetails.numberCard = res.data.recPersonNo
 													if (res.data.recPerson) {
-														_this.dataDetails.driverName = res.data
-															.recPerson
-
+														_this.dataDetails.driverName = res.data.recPerson
+														_this.dataDetails.driverCall = res.data.recPerson.substring(0,1)
 														for (let i = 0; i < _this.dataDetails
 															.hyDriverPayeeInfoList.length; i++
 															) { //收款人需与司机本人一致
@@ -768,27 +765,28 @@
 						}
 					});
 
-				} else {
-					switch (this.uploadType) {
-						// case 0:
-						// 	console.log('人车合影')
-						// 	break
-						case 1:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
-							console.log('身份正面')
-							break
-						case 2:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
-							console.log('身份反面')
-							break
-						case 3:
-							uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
-							console.log('银行卡')
-
-							break
-						case 4:
-					}
-				}
+				// } 
+				// else {
+				// 	switch (this.uploadType) {
+				// 		// case 0:
+				// 		// 	console.log('人车合影')
+				// 		// 	break
+				// 		case 1:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=idcardface');
+				// 			console.log('身份正面')
+				// 			break
+				// 		case 2:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=badge');
+				// 			console.log('身份反面')
+				// 			break
+				// 		case 3:
+				// 			uni.$u.route('/pages/mine/camera/idcard/idcard?dotype=bank');
+				// 			console.log('银行卡')
+
+				// 			break
+				// 		case 4:
+				// 	}
+				// }
 
 			},
 			//车牌号弹出键盘
@@ -886,18 +884,22 @@
 						}).then(
 							res => {
 								if (res.data.distinguishNum != "01") { //不等于01 证明银行卡验证不通过
-									this.payCheck = false //验证开关
+									// this.payCheck = false //验证开关
 									uni.$u.toast(res.data.distinguish);
+								}else{
+									uni.$u.route('/pages/mine/driverCertificationNext', {
+										data: JSON.stringify(this.dataDetails),
+									});
 								}
 							})
 					}
 
 				}
-				if (this.payCheck) {
-					uni.$u.route('/pages/mine/driverCertificationNext', {
-						data: JSON.stringify(this.dataDetails),
-					});
-				}
+				// if (this.payCheck) {
+				// 	uni.$u.route('/pages/mine/driverCertificationNext', {
+				// 		data: JSON.stringify(this.dataDetails),
+				// 	});
+				// }
 
 			},
 			validate() {

pages/mine/editDriverCertification.vue

@@ -20,7 +20,7 @@
 				<view class="flex row row-ch">
 					<view class="left-text">称呼</view>
 					<u--input placeholder="输入姓氏" class="ch-style" inputAlign='center' border="none"
-						v-model="dataDetails.driverCall">
+						v-model="dataDetails.driverCall" maxlength="1">
 					</u--input>
 					<view class="flex align-center" v-if="dataDetails.driverSex=='男'">先生</view>
 					<view class="flex align-center" v-else>女士</view>
@@ -62,7 +62,7 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">身份证号</view>
-					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard">
+					<u--input placeholder="请输入身份证号" inputAlign='left' border="none" v-model="dataDetails.numberCard" maxlength="18">
 					</u--input>
 				</view>
 
@@ -374,7 +374,6 @@
 
 			},
 			next(val) {
-				// console.log(111111111111)
 				if (this.validate()) return
 				uni.$u.route('/pages/mine/editDriverCertificationNext', {
 					data: JSON.stringify(this.dataDetails),

pages/mine/index.vue

@@ -14,9 +14,7 @@
 					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} {{hasLogin?driverSex:""}}</view>
 					<view @click="toLogin" class="phone" v-if="hasLogin">{{starUserphone}}</view>
 				</view>
-
 			</view>
-
 			<view></view>
 		</view>
 		<view class="content1">
@@ -142,7 +140,7 @@
 				isFirstRZ: null,
 				driverCall: '',
 				isFirstSH: false,
-				driverSex:"先生"
+				driverSex:""
 
 			};
 		},

pages/news/index.vue

@@ -1,10 +1,13 @@
 <template>
-	<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-		style="background-color: #F5F6FA;">
+	<!-- <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+		style="background-color: #F5F6FA;"> -->
+		<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>
+		        <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">
@@ -20,7 +23,7 @@
 							{{item.newsType}}
 						</view>
 						<view class="time">
-							{{item.updateDate}}
+							{{item.createDate}}
 						</view>
 					</view>
 					<view class="row2 flex flex-space-between align-center">
@@ -48,6 +51,7 @@
 			</view>
 		</view>
 	</mescroll-body>
+	</view>
 </template>
 
 <script>
@@ -92,35 +96,42 @@
 
 		},
 		onShow() {
-			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-				reCommonId: this.userInfo.id,
-			}).then(res3 => {
-				if (res3.data) {
-					let name = 'myTip';
-					let value = res3.data
-					if (value == 0) {
-						uni.removeTabBarBadge({
-							index: 2
-						})
-					}
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					if (value != 0 && value) {
-						uni.setTabBarBadge({
-							index: 2,
-							text: value + ""
-						})
-					}
-				}
+			this.newsNumber()
+			this.upCallback({
+				size:10,
+				num:1
 			})
-			// this.mescroll.resetUpScroll()
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			newsNumber(){
+				that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+					reCommonId: this.userInfo.id,
+				}).then(res3 => {
+					if (res3.data) {
+						let name = 'myTip';
+						let value = res3.data
+						if (value == 0) {
+							uni.removeTabBarBadge({
+								index: 3
+							})
+						}
+						that.$store.commit('$uStore', {
+							name,
+							value
+						});
+						if (value != 0 && value) {
+							uni.setTabBarBadge({
+								index: 3,
+								text: value + ""
+							})
+						}
+						that.$forceUpdate()
+					}
+				})
+			},
 			confirmClick() {
 				// #ifdef APP-PLUS
 				if (this.alertTitle == '账号审核中') {
@@ -146,6 +157,7 @@
 						uni.removeTabBarBadge({
 							index: 2
 						})
+						this.newsNumber()//消息气泡
 
 					})
 					.catch(res => {
@@ -163,6 +175,7 @@
 						this.mescroll.resetUpScroll()
 						this.look()
 						uni.hideLoading()
+						this.newsNumber()//查询消息气泡
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -178,7 +191,7 @@
 						let value = res3.data
 						if (value == 0) {
 							uni.removeTabBarBadge({
-								index: 2
+								index: 3
 							})
 						}
 						that.$store.commit('$uStore', {
@@ -187,7 +200,7 @@
 						});
 						if (value != 0 && value) {
 							uni.setTabBarBadge({
-								index: 2,
+								index: 3,
 								text: value + ""
 							})
 						}

pages/order/index.vue

@@ -80,9 +80,9 @@
 							</view>
 							<view class="right">
 								<view class="flex row">
-									<view>{{good.compName}}</view>
+									<view >{{good.compName}}</view>
 									<view class="sline"></view>
-									<view>{{good.cargoOwner}}</view>
+									<view style="min-width: 100rpx;">{{good.cargoOwner}}</view>
 								</view>
 								<view class="flex align-center">
 									<view class="">运距 {{good.distance}}km</view>
@@ -789,7 +789,7 @@
 		height: 28rpx;
 		width: 1px;
 		background: black;
-		margin: 0 20rpx;
+		margin: 0 10rpx;
 	}
 
 	.search-view {

pages/order/orderDetails.vue

@@ -18,7 +18,7 @@
 				<u-button class="btn" text="查看合同" @click="lookContract" v-if="dataObj.driverContract=='1'"></u-button>
 			     <!-- <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></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="$helper.contactCustomerService()"></u-button> -->
 				<u-button class="btn" text="确认装车" @click="confirmLoading" v-if="dataObj.orderStatus=='未装车'"></u-button>
 				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading"></u-button> -->
 				<u-button class="btn" text="修改装车信息"  @click="confirmLoading" v-if="dataObj.orderStatus=='货主驳回装车信息'||dataObj.orderStatus=='平台驳回装车信息'"></u-button>

pages/riders/index.vue

@@ -81,7 +81,7 @@
 					<view class="fleet_item">
 						<view class="flex">
 							<u-avatar :src="item.coverUrl" size="45"></u-avatar>
-							<view class="fleet_name">
+							<view class="fleet_name" @click="lookfleet(item)">
 								{{item.fleetName}}
 								<view class="fleet_member flex">
 									<u-avatar-group :urls="item.fleetMemberUrl.split(',')" size="24" gap="0.4">
@@ -207,6 +207,9 @@
 		},
 		onLoad() {},
 		methods: {
+			lookfleet(item){
+				uni.$u.route("/pages/riders/fleetSee?fleetId="+item.id)
+			},
 			checking() {
 				this.statusVal = uni.getStorageSync("firstAuthentication").authenticationStatus
 				if (uni.getStorageSync("firstAuthentication")) {