前端

pages/goodSource/index.vue

@@ -42,7 +42,8 @@
 				<view v-if="good.peripheralInfo==1&&isFirstIndex==index" class="other-goods">周边货源</view>
 				<view class="good-list">
 					<view style="padding: 0 35rpx 20rpx 35rpx;position: relative;">
-						<image src="@/static/images/goodSource/xf.png" mode="widthFix" class="xf-iamge" v-if="good.freightAdvance==1"></image>
+						<image src="@/static/images/goodSource/xf.png" mode="widthFix" class="xf-iamge"
+							v-if="good.freightAdvance==1"></image>
 						<view class="flex align-center">
 							<view class="item1">
 								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
@@ -114,8 +115,9 @@
 			</view>
 		</mescroll-body>
 		<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="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>
@@ -131,6 +133,8 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
+					confirmText: '确定',
+				showCancelButton: true,
 				isFirstIndex: null,
 				ObjSelect: {},
 				isShowAlert: false,
@@ -225,8 +229,24 @@
 			// this.mescroll.resetUpScroll()
 
 		},
-		onLoad() {
+		async onLoad() {
 			that = this
+			// #ifdef APP-PLUS
+			let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+				driverPhone: this.userInfo.phone,
+			}).then(res => {
+				return res.data.authenticationStatus
+			})
+			if (_status == '已禁用') {
+				this.isShowAlert = true
+				this.alertTitle == '账号审核中'
+				this.confirmText = '退出APP'
+				this.showCancelButton = false
+			} else {
+				console.log(1231233212332312312213)
+			}
+			// #endif
+
 		},
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop
@@ -253,6 +273,16 @@
 				this.mescroll = mescroll;
 			},
 			confirmClick() {
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
 				let item = this.ObjSelect
 				let _obj = {
 					driverCommonId: this.firstAuthentication.commonId,
@@ -286,10 +316,10 @@
 									})
 								}
 							})
-						}else{
+						} else {
 							this.$refs.uToast.show({
 								type: 'error',
-								message:res.message,
+								message: res.message,
 							})
 						}
 					})
@@ -574,9 +604,10 @@
 </script>
 
 <style scoped lang="scss">
-	.content{
+	.content {
 		background: #F2F4F7;
 	}
+
 	.banner {
 		width: 100%;
 		position: relative;
@@ -640,11 +671,11 @@
 	}
 
 	.good-list {
-		    background-color: white;
-		    margin: 10px 10px 15px 10px;
-		    padding: 10px 0px 0px 0;
-		    border-radius: 30rpx;
-		    box-shadow: 0px 5rpx 20rpx #E3E3E3;
+		background-color: white;
+		margin: 10px 10px 15px 10px;
+		padding: 10px 0px 0px 0;
+		border-radius: 30rpx;
+		box-shadow: 0px 5rpx 20rpx #E3E3E3;
 
 		.item1,
 		.item3 {
@@ -685,6 +716,7 @@
 		background: #F0F5FF;
 		padding: 0 30rpx;
 		border-radius: 0 0 30rpx 30rpx;
+
 		.name {
 			font-size: 26rpx;
 			font-weight: 700;
@@ -752,7 +784,8 @@
 			top: -30rpx;
 		}
 	}
-	.xf-iamge{
+
+	.xf-iamge {
 		width: 74rpx;
 		height: 43rpx;
 		position: absolute;

pages/mine/driverCertificationNext.vue

@@ -35,7 +35,7 @@
 					</view>
 					<image class="" :src="dataDetails.driverLicenseBackPage" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">驾驶证有效截止日期</view>
 					<view class="" @click="selectValidityPeriod(0)">
 						{{dataDetails.driverLicenseValidityDate?dataDetails.driverLicenseValidityDate:'选择有效截止日期>'}}
@@ -68,13 +68,13 @@
 					</view>
 					<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">行驶证档案编号</view>
-					<u--input placeholder="输入行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.drivingLicenseNumber">
+					<u--input placeholder="输入行驶证档案编号" inputAlign='right' border="none" v-model="dataDetails.drivingLicenseNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">行驶证有效期</view>
 					<view class="" @click="selectValidityPeriod(1)">
 						{{dataDetails.drivingLicenseValidityDate?dataDetails.drivingLicenseValidityDate:'选择有效截止日期>'}}
@@ -83,7 +83,7 @@
 
 
 				<view class="" v-if="isGCar">
-					<view class="title row flex">挂车行驶证主页</view>
+					<view class="title">挂车行驶证主页</view>
 					<view @click="uploadImg(5)" class="picture picture5" v-if="!dataDetails.trailerLicenseHomePage">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证主页</view>
@@ -98,7 +98,7 @@
 					</view>
 				</view>
 				<view v-if="isGCar">
-					<view class="title row flex">挂车行驶证副页</view>
+					<view class="title">挂车行驶证副页</view>
 					<view @click="uploadImg(6)" class="picture picture6" v-if="!dataDetails.trailerLicenseBackPage">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 						<view class="text">上传挂车行驶证副页</view>
@@ -114,11 +114,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">挂车行驶证档案编号</view>
-					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='left' border="none" v-model="dataDetails.trailerLicenseNumber">
+					<u--input placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none" v-model="dataDetails.trailerLicenseNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row" v-if="isGCar">
+				<view class="flex row flex-space-between" v-if="isGCar">
 					<view class="left-text">挂车行驶证有效期</view>
 					<view class="" @click="selectValidityPeriod(2)">
 						{{dataDetails.trailerLicenseValidityDate?dataDetails.trailerLicenseValidityDate:'选择有效截止日期>'}}
@@ -138,7 +138,7 @@
 					</view>
 					<image class="" :src="dataDetails.qualificationCertificate" mode="aspectFit"></image>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">从业资格证有效期</view>
 					<view></view>
 					<view class="" @click="selectValidityPeriod(3)">
@@ -161,10 +161,10 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">道路运输证号</view>
-					<u--input placeholder="输入道路运输证号" inputAlign='left' border="none" v-model="dataDetails.operationCertificateNumber">
+					<u--input placeholder="输入道路运输证号" inputAlign='right' border="none" v-model="dataDetails.operationCertificateNumber">
 					</u--input>
 				</view>
-				<view class="flex row">
+				<view class="flex row flex-space-between">
 					<view class="left-text">道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(4)">
 						{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期>'}}
@@ -172,7 +172,7 @@
 				</view>
 
 				<view v-if="isGCar">
-					<view class="title row flex">挂车道路运输证</view>
+					<view class="title">挂车道路运输证</view>
 					<view @click="uploadImg(9)" class="picture picture9"
 						v-if="!dataDetails.trailerOperationCertificate">
 						<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
@@ -189,11 +189,11 @@
 				</view>
 				<view class="flex row">
 					<view class="left-text">挂车道路运输证号</view>
-					<u--input placeholder="输入挂车道路运输证号" inputAlign='left' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
+					<u--input placeholder="输入挂车道路运输证号" inputAlign='right' border="none" v-model="dataDetails.trailerOperationCertificateNumber">
 					</u--input>
 				</view>
 
-				<view class="flex row" v-if="isGCar">
+				<view class="flex row flex-space-between" v-if="isGCar">
 					<view class="left-text">挂车道路运输证有效期</view>
 					<view class="" @click="selectValidityPeriod(5)">
 						{{dataDetails.trailerOperationCertificateValidityDate?dataDetails.trailerOperationCertificateValidityDate:'选择有效期>'}}

pages/mine/index.vue

@@ -50,7 +50,9 @@
 					</image>
 					<view>管理银行卡</view>
 				</view>
-				<view> <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image> </view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
 			</view>
 			<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/manageVehicles/index',3)">
 				<view class="flex align-center">
@@ -58,7 +60,9 @@
 					</image>
 					<view>管理车辆</view>
 				</view>
-				<view><image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image></view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
 			</view>
 			<view class="flex flex-space-between" @click="$helper.contactCustomerService">
 				<view class="flex align-center">
@@ -66,7 +70,9 @@
 					</image>
 					<view>联系客服</view>
 				</view>
-				<view> <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image></view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
 			</view>
 			<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/helpDescription')">
 				<view class="flex align-center">
@@ -74,7 +80,9 @@
 					</image>
 					<view>帮助说明</view>
 				</view>
-				<view> <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image></view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
 			</view>
 			<view class="flex flex-space-between" @click="goDetailPage('/pages/mine/set')">
 				<view class="flex align-center">
@@ -82,11 +90,13 @@
 					</image>
 					<view>设置</view>
 				</view>
-				<view> <image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image></view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
 			</view>
 		</view>
-		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -100,12 +110,14 @@
 	export default {
 		data() {
 			return {
+				confirmText: '确定',
+				showCancelButton: true,
 				userName: '',
 				phone: '',
 				headUrl: "../../static/images/myimg/YongHu@3x.png",
 				isShowAlert: false,
-				alertTitle: '提示',
-				alertContent: '您尚未登录，是否立即登录？',
+				alertTitle: '您尚未登录，是否立即登录？',
+				// alertContent: '您尚未登录，是否立即登录？',
 				statusVal: '',
 				isFirstRZ: null,
 				driverCall: '',
@@ -147,8 +159,23 @@
 				}
 			})
 		},
-		onLoad() {
+		async onLoad() {
 			that = this
+			// #ifdef APP-PLUS
+			let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+				driverPhone: this.userInfo.phone,
+			}).then(res => {
+				return res.data.authenticationStatus
+			})
+			if (_status == '已禁用') {
+				this.isShowAlert = true
+				this.alertTitle == '账号审核中'
+				this.confirmText = '退出APP'
+				this.showCancelButton = false
+			} else {
+				console.log(1231233212332312312213)
+			}
+			// #endif
 
 		},
 		computed: {
@@ -182,10 +209,9 @@
 								this.statusVal = '身份认证审核中'
 							} else if (this.firstAuthentication.authenticationStatus == '未通过') {
 								this.statusVal = '身份认证未通过'
-							}
-							 else if (this.firstAuthentication.authenticationStatus == '已过期') {
-							 	this.statusVal = '证件已过期'
-							 }else {
+							} else if (this.firstAuthentication.authenticationStatus == '已过期') {
+								this.statusVal = '证件已过期'
+							} else {
 								this.statusVal = '已认证'
 							}
 						} else {
@@ -212,6 +238,16 @@
 					});
 			},
 			confirmClick() {
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
 				this.isShowAlert = false
 				uni.$u.route('/pages/public/login');
 			},
@@ -222,7 +258,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {
-					if (type == 1 && this.statusVal == '已认证') {
+					if (type == 1 && this.statusVal == '已认证'||this.statusVal == '证件已过期') {
 						src = '/pages/mine/editDriverCertification'
 					}
 					console.log('this.isFirstSH', this.isFirstSH)
@@ -266,13 +302,14 @@
 		height: var(--status-bar-height);
 	}
 
-.arrow {
+	.arrow {
 		margin-left: 15px;
 		width: 8px;
 		height: 12px;
 		// justify-content: flex-end
 
 	}
+
 	.head {
 		.row1 {
 			display: flex;

pages/mine/manageBankCards/addBankCard.vue

@@ -195,7 +195,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功
 									console.log('图片地址', result)
@@ -204,9 +204,6 @@
 												bankImg: result,
 											}).then(res => {
 											console.log(res)
-
-
-
 											_this.dataDetails.payeeAddressUrl = result
 											if (res.data.bankNo) {
 												_this.dataDetails.bankCard = res.data.bankNo

pages/mine/manageBankCards/index.vue

@@ -16,7 +16,7 @@
 			<view class="card-list-item" :style='{"background-image":"url("+item.cardColor+")"}'>
 				<view class="flex flex-end number carNumber">{{item.bankCard}}</view>
 				<view class="flex align-center">
-					<!-- @/static/images/mine/bank/gflogo@2x.png -->
+					<!-- @/static/images/mine/bank/gflogo.png -->
 					<image class="img left" :src="item.imgLogo" mode='widthFix'>
 					</image>
 					<view class="right">
@@ -129,54 +129,56 @@
 					}).then(res => {
 						if (res.code == '200') {
 							// debugger
+							console.log('``````````````````````````````')
+							console.log(res.data)
 							this.bankList = res.data
 							for (let i = 0; i < this.bankList.length; i++) {
 								let _obj = this.bankList[i]
 								_obj.bankCard = this.number(_obj.bankCard)
 								switch (_obj.bankDeposit) {
 									case "建设银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									case "招商银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhaoshang@2x(1).png"
+											"../../../static/images/mine/bank/zhaoshang.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "中国银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/zhongyin.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "邮政银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/youzhenglogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+											"../../../static/images/mine/bank/youzhenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "交通银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/jiaotognlogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+											"../../../static/images/mine/bank/jiaotognlogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									case "工商银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gslogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "农业银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/nongyelogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "民生银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/minshenglogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh@2x.png"
+											"../../../static/images/mine/bank/minshenglogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/nh.png"
 										break
 									case "中信银行":
 										this.bankList[i].imgLogo =
-											"../../../static/images/mine/bank/zhongxinlogo@2x.png"
+											"../../../static/images/mine/bank/zhongxinlogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "广发银行":
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/gflogo.png"
 										this.bankList[i].cardColor = "../../../static/images/mine/bank/zsbg.png"
 										break
 									case "华夏银行":
@@ -185,14 +187,15 @@
 										break
 									case "兴业银行":
 										this.bankList[i].imgLogo = "../../../static/images/mine/bank/xingye.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh@2x.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/jh.png"
 										break
 									default:
-										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo@2x.png"
-										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt@2x.png"
+										this.bankList[i].imgLogo = "../../../static/images/mine/bank/qitalogo.png"
+										this.bankList[i].cardColor = "../../../static/images/mine/bank/qt.png"
 										break
 								}
 							}
+							this.$forceUpdate()
 						} else {
 							uni.$u.toast(res.message);
 						}

pages/news/index.vue

@@ -26,7 +26,7 @@
 					<view class="row2 flex flex-space-between align-center">
 						<view class="text point1">
 							{{item.newsContent}}
-						</view>
+						</view>{{item.newsFlag}}
 						<view class="red-point" v-if="item.newsFlag==0"></view>
 					</view>
 				</view>
@@ -42,7 +42,9 @@
 				<view class="flex flex-space-between">
 					您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。
 				</view> -->
-
+				<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true'
+					:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick"
+					@close="cancelClick" @cancel="cancelClick"></u-modal>
 			</view>
 		</view>
 	</mescroll-body>
@@ -58,6 +60,10 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
+					confirmText: '确定',
+				showCancelButton: true,
+				isShowAlert: false,
+				alertTitle: '',
 				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
 				bgColor: '#317AFE',
 				value: 100,
@@ -66,8 +72,24 @@
 				mescroll: null
 			}
 		},
-		onLoad() {
+		async onLoad() {
 			that = this
+			// #ifdef APP-PLUS
+			let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+				driverPhone: this.userInfo.phone,
+			}).then(res => {
+				return res.data.authenticationStatus
+			})
+			if (_status == '已禁用') {
+				this.isShowAlert = true
+				this.alertTitle == '账号审核中'
+				this.confirmText = '退出APP'
+				this.showCancelButton = false
+			} else {
+				console.log(1231233212332312312213)
+			}
+			// #endif
+
 		},
 		onShow() {
 			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
@@ -93,12 +115,24 @@
 					}
 				}
 			})
-				// this.mescroll.resetUpScroll()
+			// this.mescroll.resetUpScroll()
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			confirmClick() {
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
+			},
 			rightClick() {
 				uni.showLoading({
 					title: '加载中',
@@ -134,12 +168,12 @@
 						uni.$u.toast(res.message);
 					});
 			},
-			look(){
+			look() {
 				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) {
@@ -170,10 +204,12 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
+				console.log(page)
 				// 此处可以继续请求其他接口
-				// if(page.num == 1){
-				// 	// 请求其他接口...
-				// }
+				if(page.num == 1){
+					this.news=[]
+					// 请求其他接口...
+				}
 
 				// 如果希望先请求其他接口,再触发upCallback,可参考以下写法
 				// if(!this.isInitxx){
@@ -192,7 +228,7 @@
 						pageSize: page.size,
 						currentPage: page.num,
 					}).then(res => {
-						this.news = this.news.concat(res.data.records)
+						this.news = this.news.concat(res.data.records); //追加新数据
 						this.mescroll.endBySize(res.data.records.length, res.data.total);
 					})
 					.catch(res => {

pages/order/index.vue

@@ -84,7 +84,7 @@
 							<!-- 货主装车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
-								{{good.freight?good.freight:0}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"
@@ -105,13 +105,13 @@
 						<view class="row5 flex flex-end">
 							<view class="stop active" @click.stop="stop(good)"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'">终止</view>
-					<!-- 		<view class="start normal" @click.stop="confirmLoading(good)"
+							<!-- 		<view class="start normal" @click.stop="confirmLoading(good)"
 								v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
 								确认装车</view> -->
-										<view class="start normal" @click.stop="toDetail(good.id)"
-											v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
-											确认装车</view>
-								
+							<view class="start normal" @click.stop="toDetail(good.id)"
+								v-if="good.orderStatus=='未装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='平台驳回装车信息'">
+								确认装车</view>
+
 							<view class="start normal" v-if="good.orderStatus!='未装车'&&good.orderStatus!='待货主确认'"
 								@click.stop="$helper.contactCustomerService">联系客服
 							</view>
@@ -147,9 +147,9 @@
 
 			</view>
 		</view>
-		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
-			:closeOnClickOverlay='true' :showCancelButton='true' @confirm="confirmClick" @close="cancelClick"
-			@cancel="cancelClick" class="modal">
+		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
+			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			@cancel="cancelClick">
 			<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"
 					:label="item.name" :name="item.name" @change="radioChange">
@@ -177,6 +177,8 @@
 		mixins: [MescrollMixin], // 使用mixin
 		data() {
 			return {
+					confirmText: '确定',
+				showCancelButton: true,
 				showMenu: false,
 				searchStyle: {
 					background: "#317AFE",
@@ -264,10 +266,23 @@
 			// this.getLngLat();
 			//#endif
 		},
-		onLoad() {
+		async onLoad() {
 			that = this
-			// let _isHave = this.$utils.getRoles('aaa')
-			// console.log(_isHave)
+			// #ifdef APP-PLUS
+			let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+				driverPhone: this.userInfo.phone,
+			}).then(res => {
+				return res.data.authenticationStatus
+			})
+			if (_status == '已禁用') {
+				this.isShowAlert = true
+				this.alertTitle == '账号审核中'
+				this.confirmText = '退出APP'
+				this.showCancelButton = false
+			} else {
+				console.log(1231233212332312312213)
+			}
+			// #endif
 
 		},
 		onShow() {
@@ -381,6 +396,16 @@
 				this.confirmText = '确定'
 			},
 			confirmClick() {
+				// #ifdef APP-PLUS
+				if (this.alertTitle == '账号审核中') {
+					if (uni.getSystemInfoSync().platform == 'ios') {
+						plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					} else if (uni.getSystemInfoSync().platform == 'android') {
+						plus.runtime.quit();
+					}
+					return
+				}
+				// #endif
 				if (this.alertTitle == '确定删除全部历史记录?') {
 					uni.removeStorageSync('useSearchList');
 					this.useSearchList = [];
@@ -441,10 +466,10 @@
 				// = uni.getStorageSync('useSearchList')
 
 				this.useSearchList.unshift(e)
-				this.useSearchList=[...new Set(this.useSearchList)]
+				this.useSearchList = [...new Set(this.useSearchList)]
 				uni.setStorageSync("useSearchList", this.useSearchList)
-				if(this.useSearchList.length>9){
-					this.carList.splice(this.useSearchList.length,1)
+				if (this.useSearchList.length > 9) {
+					this.carList.splice(this.useSearchList.length, 1)
 				}
 				console.log("点击搜索", e)
 				this.upCallback({

pages/public/code.vue

@@ -123,80 +123,61 @@
 							loginFlag: 2
 						}).then(res => {
 							if (res.code == 200) {
-								that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-									mobilePhone: this.phone,
-									veriCode: "123456",
-									loginFlag: 2
-								}).then(res1 => {
-									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 + ""
-												})
-											}
+								uni.setStorageSync('userInfo', res.data)
+								that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+									reCommonId: res.data.id,
+								}).then(res3 => {
+									if (res3.data) {
+										let name = 'myTip';
+										let value = res3.data
+										if (value == 0) {
+											uni.removeTabBarBadge({
+												index: 2
+											})
 										}
-									})
-									if (res1.code == 200) {
-										uni.setStorageSync('pcuserInfo', res1.data)
-										helper.getListByUserId()
-									} else {
-										that.$api.doRequest('post', '/commonUser/api/loginQuickly', {
-											mobilePhone: '14444444444',
-											veriCode: "123456",
-											loginFlag: 2
-										}).then(res2 => {
-											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 + ""
-														})
-													}
-												}
+										that.$store.commit('$uStore', {
+											name,
+											value
+										});
+										if (value != 0 && value) {
+											uni.setTabBarBadge({
+												index: 2,
+												text: value + ""
 											})
-											uni.setStorageSync('pcuserInfo', res2.data)
-											helper.getListByUserId()
-										})
+										}
 									}
 								})
-								uni.setStorageSync('userInfo', res.data)
-								helper.getListByUserId()
-								that.$store.commit('login', res.data)
-								// that.liangxinLogin()
-								uni.switchTab({
-									url: '/pages/goodSource/index'
-								});
-								uni.hideLoading()
+								that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+									driverPhone: this.phone,
+								}).then(res2 => {
+									if (res.data.statusFlag == '已禁用') {
+										this.isShowAlert = true
+										uni.hideLoading()
+										return
+									}
+									uni.setStorageSync('pcuserInfo', res.data)
+									uni.setStorageSync('userInfo', res.data)
+									uni.setStorageSync('firstAuthentication', res2.data)
+									helper.getListByUserId()
+									that.$store.commit('login', res.data)
+									var name = 'userInfo';
+									var value = res.data;
+									that.$store.commit('$uStore', {
+										name,
+										value
+									});
+
+									uni.switchTab({
+										url: '/pages/goodSource/index'
+									});
+									uni.hideLoading()
+									// that.liangxinLogin()
+									uni.switchTab({
+										url: '/pages/goodSource/index'
+									});
+									uni.hideLoading()
+								})
+
 							} else {
 								uni.hideLoading()
 								uni.showToast({

pages/public/login.vue

@@ -169,12 +169,6 @@
 						if (res.code == 200) {
 							console.log("userInfo", res.data)
 							uni.setStorageSync('userInfo', res.data)
-							// if(res.data.statusFlag=='已禁用'){
-							// 	this.isShowAlert = true
-							// 	uni.hideLoading()
-							// 	return
-							// }
-							
 							that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
 								reCommonId: this.userInfo.id,
 							}).then(res3 => {
@@ -223,81 +217,13 @@
 									url: '/pages/goodSource/index'
 								});
 								uni.hideLoading()
-								// that.liangxinLogin()
 								uni.switchTab({
 									url: '/pages/goodSource/index'
 								});
 								uni.hideLoading()
-								// 
-								// 
-							})
-							// that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-							// 	mobilePhone: this.phone,
-							// 	veriCode: "123456",
-							// 	loginFlag: 2
-							// }).then(res1 => {
-							// 	console.log("loginQuickly", res)
-							// 	if (res1.code == 200) {
-							// 		uni.setStorageSync('pcuserInfo', res1.data)
-							// 		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 + ""
-							// 					})
-							// 				}
-							// 			}
-							// 		})
-							// 		helper.getListByUserId()
-							// 	} else {
-							// 		that.$request.baseRequest('post', '/commonUser/api/loginQuickly', {
-							// 			mobilePhone: '14444444444',
-							// 			veriCode: "123456",
-							// 			loginFlag: 2
-							// 		}).then(res2 => {
-							// 			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 + ""
-							// 						})
-							// 					}
-							// 				}
-							// 			})
-							// 			uni.setStorageSync('pcuserInfo', res2.data)
-							// 			helper.getListByUserId()
-							// 		})
-							// 	}
 
-							// })
+							})
+				
 				
 						} else {
 							uni.hideLoading()