bug

pages.json

@@ -56,15 +56,19 @@
 				"navigationStyle": "custom"
 			}
 
-		}
-
-		, {
+		}, {
 			"path": "pages/news/index",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "white"
 			}
 
+		},{
+			"path": "pages/news/newsSee",
+			"style": {
+				"navigationBarTitleText": "系统消息",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
 			"path": "pages/mine/index",

pages/goodSource/index.vue

@@ -79,7 +79,7 @@
 									<view v-if="carWeight(good)">{{carWeight(good)}}</view>
 								</view>
 								<view class="flex row">
-									<view class="row-tips">{{good.taskDescription}}</view>
+									<view class="row-tips" v-if="good.taskDescription">{{good.taskDescription}}</view>
 								</view>
 							</view>
 							<view class="right flex h-color">
@@ -275,7 +275,6 @@
 		methods: {
 			cargoOwner(_obj){
 				// uni.$u.route('/pages/order/evaluateList');
-				console.log("查看---------------",_obj)
 				uni.$u.route('/pages/goodSource/cargoOwnerSee',_obj)
 			},
 			mescrollInit(mescroll) {
@@ -451,12 +450,15 @@
 												var main = plus.android.runtimeMainActivity();
 												main.startActivity(intent); // 打开系统设置GPS服务页面
 											}
+											uni.hideLoading()
+										}else{
+											uni.hideLoading()
 										}
 									}
+									
 								});
 							}
 							uni.hideLoading()
-							
 						}
 					}
 				});

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() {
@@ -681,13 +680,13 @@
 			uploadImg(type, index) {
 				this.uploadType = type
 				// this.isShowimgType = true
+				// this.imgTypeSelect()
 				this.index = index
 				this.imgTypeSelect()
 			},
 			// 上传图片
 			imgTypeSelect() {
 				// console.log(val)
-				console.log(this.uploadType)
 					uni.chooseImage({
 						count: 1,
 						// sourceType: this.$helper.chooseImage.sourceType,
@@ -705,12 +704,12 @@
 											_this.$request.baseRequest('get',
 													'/driverInfo/personShibie', {
 														personImg: result,
+														flag:1
 													}).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++
 															) { //收款人需与司机本人一致
@@ -727,6 +726,20 @@
 											// 身份反面
 										case 2:
 											_this.dataDetails.cardBackAddressUrl = result
+											// 识别
+											_this.$request.baseRequest('get',
+													'/driverInfo/personShibie', {
+														personImg: result,
+														flag:2
+													}).then(res => {
+													if(res.data.idCardValidity){
+														let date = res.data.idCardValidity.split("-")[1]
+													    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
+													}
+												})
+												.catch(res => {
+													uni.$u.toast(res.message);
+												});
 											break
 											// 银行卡
 										case 3:
@@ -759,15 +772,15 @@
 												.catch(res => {
 													uni.$u.toast(res.message);
 												});
-
 											break;
 									}
 								}
 							)
 						}
 					});
-
 				// } else {
+				// } 
+				// else {
 				// 	switch (this.uploadType) {
 				// 		// case 0:
 				// 		// 	console.log('人车合影')
@@ -885,18 +898,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/driverCertificationNext.vue

@@ -639,11 +639,11 @@
 			submit() {
 				// 校验
 				if (this.validate()) return
-				if(this.dataDetails.driverSex=='男'){
-					this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
-				}else{
-					this.dataDetails.driverCall = this.dataDetails.driverCall+'女士'
-				}
+				// if(this.dataDetails.driverSex=='男'){
+				// 	this.dataDetails.driverCall = this.dataDetails.driverCall+'先生'
+				// }else{
+				// 	this.dataDetails.driverCall = this.dataDetails.driverCall+'女士'
+				// }
 				if(!this.consentStatus){
 					this.$refs.uToast.show({
 						type: 'error',

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>
 
@@ -335,6 +335,7 @@
 											_this.$request.baseRequest('get',
 													'/driverInfo/personShibie', {
 														personImg: result,
+														flag:1
 													}).then(res => {
 													_this.dataDetails.numberCard = res.data.recPersonNo
 												})
@@ -345,6 +346,20 @@
 											// 身份反面
 										case 2:
 											_this.dataDetails.cardBackAddressUrl = result
+											// 识别
+											_this.$request.baseRequest('get',
+													'/driverInfo/personShibie', {
+														personImg: result,
+														flag:2
+													}).then(res => {
+													if(res.data.idCardValidity){
+														let date = res.data.idCardValidity.split("-")[1]
+													    _this.dataDetails.cardValidityDate = date.replace('.', '-').replace('.', '-')
+													}
+												})
+												.catch(res => {
+													uni.$u.toast(res.message);
+												});
 											break
 										case 3:
 											break;
@@ -374,7 +389,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

@@ -13,12 +13,11 @@
 				<view class="right-text">
 					<view @click="toLogin" class="name">{{hasLogin? userName : '立即登录' }} 
 					<!-- {{hasLogin?driverSex:""}} -->
+					<!-- <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">
@@ -106,7 +105,7 @@
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
-		<!-- 	<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/evaluate')">
+			<!-- 	<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/evaluate')">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/set.png" mode='widthFix'>
 					</image>
@@ -144,7 +143,7 @@
 				isFirstRZ: null,
 				driverCall: '',
 				isFirstSH: false,
-				driverSex:"先生"
+				driverSex: ""
 
 			};
 		},
@@ -184,7 +183,7 @@
 		},
 		async onLoad() {
 			that = this
-		
+
 			// let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
 			// 	driverPhone: this.userInfo.phone,
 			// }).then(res => {
@@ -198,7 +197,7 @@
 			// } else {
 			// 	console.log(1231233212332312312213)
 			// }
-		
+
 
 		},
 		computed: {
@@ -216,16 +215,21 @@
 				await this.$request.baseRequest('', '/driverInfo/firstAuthentication', {
 						driverPhone: this.userInfo.phone,
 					}).then(res => {
+						if(res.data){
+							uni.setStorageSync("firstAuthentication", res.data) //更新缓存数据（解决pc端审核后未及时更新缓存  用于车友判断）
+						}
 						this.firstAuthentication = res.data
-						uni.setStorageSync("firstAuthentication",res.data)//更新缓存数据（解决pc端审核后未及时更新缓存  用于车友判断）
 						if (this.firstAuthentication) {
 							this.isFirstSH = false
 							if (this.firstAuthentication.driverSex == '女') {
 								this.driverSex = "女士"
 								this.userName = this.firstAuthentication.driverCall
-							} else {
+							} else if (this.firstAuthentication.driverSex == '男') {
 								this.userName = this.firstAuthentication.driverCall
 								this.driverSex = "先生"
+							} else {
+								this.userName = this.firstAuthentication.driverCall
+								this.driverSex = ""
 							}
 
 							if (this.firstAuthentication.authenticationStatus == '审核中') {
@@ -281,7 +285,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期'||this.statusVal == '身份认证未通过') {
+					if (type == 1 && this.statusVal == '已认证' || this.statusVal == '证件已过期' || this.statusVal == '身份认证未通过') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					if ((type == 2 || type == 3) && this.isFirstSH) {
@@ -289,13 +293,13 @@
 							type: 'error',
 							message: "请先完成司机身份认证",
 						})
-					} else if(type == 1&&this.statusVal=='身份认证审核中') {
+					} else if (type == 1 && this.statusVal == '身份认证审核中') {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "正在审核中，请耐心等待！",
 						})
 						return
-					}else{
+					} else {
 						uni.$u.route(src);
 					}
 				}
@@ -414,7 +418,7 @@
 		}
 
 		.flex-space-between {
-			margin:10rpx 0 50rpx 0;
+			margin: 10rpx 0 50rpx 0;
 		}
 	}
 </style>

pages/mine/manageBankCards/addBankCard.vue

@@ -292,6 +292,7 @@
 					}).then(
 						res => {
 							if(res.data.distinguishNum == "01"){
+								this.dataDetails.commonId = this.userInfo.id
 								this.$request.baseRequest('post', '/driverPayeeInfo/api/addInfo', this.dataDetails).then(
 										res => {
 											if (res.code == '200') {
@@ -317,10 +318,6 @@
 							}
 						})
 				}
-				
-
-				
-
 			},
 		},
 	};

pages/mine/manageBankCards/index.vue

@@ -137,6 +137,8 @@
 			init() {
 				this.$request.baseRequest('post', '/driverPayeeInfo/selectDriverPayee', {
 						driverId: this.userInfo.driverId?this.userInfo.driverId:uni.getStorageSync("firstAuthentication").id,
+						// driverId: this.userInfo.driverId,
+						commonId: this.userInfo.id,
 					}).then(res => {
 						if (res.code == '200') {
 							this.bankList = res.data

pages/mine/manageVehicles/addVehicle.vue

@@ -427,7 +427,7 @@
 		},
 		onLoad(options) {
 			_this = this;
-			this.dataDetails.driverId = this.userInfo.driverId
+			this.dataDetails.commonId = this.userInfo.id
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 		},
 		methods: {

pages/mine/manageVehicles/index.vue

@@ -96,7 +96,7 @@
 			},
 			init() {
 				this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
-						driverId: this.firstAuthentication.id,
+						commonId: this.userInfo.id,
 						// driverId:this.firstAuthentication.id
 					}).then(res => {
 						if (res.code == '200') {

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 => {
@@ -153,6 +165,9 @@
 					});
 			},
 			read(val) {
+				if(val.newsType == '系统消息'){
+					uni.$u.route("/pages/news/newsSee?_obj="+JSON.stringify(val))
+				}
 				uni.showLoading({
 					title: '加载中',
 					mask: true
@@ -163,6 +178,7 @@
 						this.mescroll.resetUpScroll()
 						this.look()
 						uni.hideLoading()
+						this.newsNumber()//查询消息气泡
 					})
 					.catch(res => {
 						uni.$u.toast(res.message);
@@ -178,7 +194,7 @@
 						let value = res3.data
 						if (value == 0) {
 							uni.removeTabBarBadge({
-								index: 2
+								index: 3
 							})
 						}
 						that.$store.commit('$uStore', {
@@ -187,7 +203,7 @@
 						});
 						if (value != 0 && value) {
 							uni.setTabBarBadge({
-								index: 2,
+								index: 3,
 								text: value + ""
 							})
 						}

pages/news/newsSee.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="center">
+		<view class="news_info">
+			<view class="">{{dataInfo.newsTitle}}</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				dataInfo:{},
+				
+			}
+		},
+		onLoad(options) {
+			debugger
+			this.dataInfo = JSON.parse(options._obj)
+				uni.setNavigationBarTitle({
+				title: this.dataInfo.newsType
+			})
+			
+		},
+		
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.center{
+		
+	}
+</style>

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>
@@ -325,10 +325,10 @@
 					}
 				}
 			})
-			// this.upCallback({
-			// 	size: 10,
-			// 	num: 1
-			// })
+			this.upCallback({
+				size: 10,
+				num: 1
+			})
 		},
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop
@@ -790,7 +790,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/public/register.vue

@@ -39,7 +39,7 @@
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
 				<u--image @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
-					width="17px" height="17px"></u--image>
+					width="17px" height="17px" style="margin:0 10rpx"></u--image>
 				已阅读并同意
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"

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")) {