前端

App.vue

@@ -34,6 +34,71 @@
 		},
 	
 		onLaunch: function() {
+			// #ifdef APP-PLUS
+			console.log(uni.getStorageSync('userInfo'))
+			if(uni.getStorageSync('userInfo')){
+				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: uni.getStorageSync('userInfo').phone,
+				}).then(res => {
+					if (res.data.authenticationStatus == '已禁用') {
+						
+					// this.isShowAlert = true
+					// this.alertTitle = '账号审核中'
+					// this.confirmText = '退出APP'
+					// this.showCancelButton = false
+					let options = {
+					    title: '提示', 
+						info:'账号审核中',
+					    okText: '退出程序', 
+						infoAlignment:'center',
+						radius:10,
+					    // cancelText: '否',
+						showCancel:false,
+						okButtonColor:'#2772FB'
+					};
+					const native = uni.requireNativePlugin('AJ-Alert');
+					native.showAction(options, result => {
+						// #ifdef APP-PLUS
+						            	if (uni.getSystemInfoSync().platform == 'ios') {
+						            		plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+						            	} else if (uni.getSystemInfoSync().platform == 'android') {
+						            		plus.runtime.quit();
+						            	}
+						            // #endif
+					    // 点击是的回调, result暂时没有返回内容
+					}, cancel => {
+					    // 点击否的回调
+					});
+					// uni.showModal({
+					//     title: '提示',
+					//     content: '这是一个模态弹窗',
+					// 	showCancel:false,
+					// 	confirmText:'退出app',
+					// 	// confirmColor:'#317AFE',
+					// 	confirmColor:'#F54E40',
+					//     success: function (res) {
+					//         if (res.confirm) {
+					//             // #ifdef APP-PLUS
+					//             	if (uni.getSystemInfoSync().platform == 'ios') {
+					//             		plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+					//             	} else if (uni.getSystemInfoSync().platform == 'android') {
+					//             		plus.runtime.quit();
+					//             	}
+					//             // #endif
+					//         } else if (res.cancel) {
+					//             console.log('用户点击取消');
+					//         }
+					//     }
+					// });
+			
+					} else {
+						console.log(1231233212332312312213)
+					}
+				})
+			}
+			
+			
+			// #endif
 			 uni.setStorageSync("region", region);
 			uni.getSystemInfo({
 			        success:function(e){

components/bert-suggest/suggest.vue

@@ -6,7 +6,7 @@
 				<view style='position:absolute;right:22px;bottom:16px;font-size:13px;'>{{data.content.length}}/150个字</view>
 			</uni-card>
 			<uni-card class="box contact" :isFull="true" title="联系方式" >
-				<input v-model="data.contact" placeholder="手机 QQ或e-mail,方便我们联系您" />
+				<input v-model="data.contact" placeholder="请输入您的手机号,方便我们联系您" />
 			</uni-card>
 		</view>
 		
@@ -97,7 +97,7 @@
 		}
 	}
 	.submit-btn {
-		background-color: #22C572;
+		background-color: #2772FB;
 		color:#fff;
 		border-radius:30px;
 		margin: 20rpx;

pages.json

@@ -529,7 +529,16 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/mine/fankui",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "意见反馈",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/goodSource/index.vue

@@ -238,25 +238,25 @@
 			// this.mescroll.resetUpScroll()
 
 		},
-		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
-
-		},
+		// 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
 			// console.log("页面滚动了", res.scrollTop)

pages/mine/manageBankCards/addBankCard.vue

@@ -351,6 +351,7 @@
 	.content {
 		padding: 20rpx;
 		padding-bottom: 50rpx;
+		height:100vh;
 	}
 
 	.content3 {
@@ -438,7 +439,7 @@
 		background: #2772FB;
 		color: white;
 		text-align: center;
-		margin-left: 5%;
+		margin: 2%;
 		padding: 30rpx 0;
 		border-radius: 50rpx;
 	}

pages/mine/often/addRoute.vue

@@ -109,7 +109,13 @@
 					// this.title1 = address.province  + address.city
 					this.routeData.sendArea = ""
 				}else{
-					this.title1 = address.province  + address.city + address.area;
+					if(address.province=='北京'||address.province=='天津'||address.province=='上海'||address.province=='重庆'||address.province=='台湾'){
+						this.title1 = address.province+ address.area;
+						this.routeData.sendCity =  ''
+					}else{
+						this.title1 = address.province  + address.city + address.area;
+					}
+					
 				}
 				
 			},
@@ -134,7 +140,13 @@
 					if(address.province == '全国'){
 						this.title2 = address.province
 					}else{
-						this.title2 = address.province  + address.city + address.area;
+						if(address.province=='北京'||address.province=='天津'||address.province=='上海'||address.province=='重庆'||address.province=='台湾'){
+							this.title2 = address.province+ address.area;
+							this.routeData.unloadCity = ""
+						}else{
+							this.title2 = address.province  + address.city + address.area;
+						}
+						
 					}
 					
 				}
@@ -195,16 +207,27 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.routeData = res.data
-							if(this.routeData.sendProvince=='北京'||this.routeData.sendProvince=='天津'||this.routeData.sendProvince=='上海'||this.routeData.sendProvince=='重庆'||this.routeData.sendProvince=='台湾'){
+							if(this.routeData.sendProvince=='北京'&&this.routeData.sendArea==''
+							||this.routeData.sendProvince=='天津'&&this.routeData.sendArea==''
+							||this.routeData.sendProvince=='上海'&&this.routeData.sendArea==''
+							||this.routeData.sendProvince=='重庆'&&this.routeData.sendArea==''
+							||this.routeData.sendProvince=='台湾'&&this.routeData.sendArea==''){
 								this.title1 = this.routeData.sendProvince 
-								this.title2 = this.routeData.unloadProvince
+
 							}else{
 								this.title1 = this.routeData.sendProvince + this.routeData.sendCity + this.routeData
 								.sendArea
+							}
+							if(this.routeData.unloadProvince=='北京'&&this.routeData.unloadArea==''
+							||this.routeData.unloadProvince=='天津'&&this.routeData.unloadArea==''
+							||this.routeData.unloadProvince=='上海'&&this.routeData.unloadArea==''
+							||this.routeData.unloadProvince=='重庆'&&this.routeData.unloadArea==''
+							||this.routeData.unloadProvince=='台湾'&&this.routeData.unloadArea==''){
+								this.title2 = this.routeData.unloadProvince
+							}else{
 								this.title2 = this.routeData.unloadProvince + this.routeData.unloadCity + this.routeData
 								.unloadArea
 							}
-							
 						}
 					})
 					.catch(res => {
@@ -291,6 +314,7 @@
 		// width: 100%;
 		padding: 30rpx;
 		background: #F2F4F7;
+		height:100vh;
 	}
 	.route_site{
 		background: #FFFFFF;

pages/mine/set.vue

@@ -172,7 +172,7 @@
 			},
 			fankui() {
 				uni.navigateTo({
-					url: `/pages/mine/settings/feedback`
+					url: `/pages/mine/fankui`
 				})
 			},
 			logout() {

pages/news/index.vue

@@ -76,25 +76,25 @@
 				mescroll: null
 			}
 		},
-		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
+		// 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() {
 			this.newsNumber()
 			this.upCallback({

pages/order/index.vue

@@ -315,25 +315,25 @@
 			// this.getLngLat();
 			//#endif
 		},
-		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
-
-		},
+		// 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', {
 				reCommonId: this.userInfo.id,

pages/public/login.vue

@@ -136,7 +136,6 @@
 				this.isShowAlert = false
 			},
 			confirmClick(){
-				
 				if (uni.getSystemInfoSync().platform == 'ios'){
 				    plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
 				} else if (uni.getSystemInfoSync().platform == 'android'){
@@ -145,14 +144,24 @@
 			},
 			passlogin(e) {
 				var that = this
+				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+					phone: this.phone,
+				}).then(res => {
+					if (res.data.authenticationStatus == '已禁用') {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: "账号审核中！"
+						})
+						
+					} else {
 				uni.showLoading({
 					title: '登录中',
 					mask: true
 				})
 				console.log("clinetId", this.clientId)
 				that.$request.baseRequest('get', '/commonUser/login', {
-						phone: this.phone,
-						password: this.password,
+						phone: that.phone,
+						password: that.password,
 						loginFlag: 2,
 						identification: 1
 					}).then(res => {
@@ -160,7 +169,7 @@
 							console.log("userInfo", res.data)
 							uni.setStorageSync('userInfo', res.data)
 							that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
-								reCommonId: this.userInfo.id,
+								reCommonId: that.userInfo.id,
 							}).then(res3 => {
 								if (res3.data) {
 									let name = 'myTip';
@@ -201,19 +210,19 @@
 												city: res.city,
 												area: res.district
 											}
-											this.$helper.gjList.push(_data)
-											uni.setStorageSync('mapGJ', this.$helper.gjList);
+											that.$helper.gjList.push(_data)
+											uni.setStorageSync('mapGJ', that.$helper.gjList);
 											// console.log('this.$helper.gjList')
 											// console.log(this.$helper.gjList)
 											// console.log("条数", uni.getStorageSync('mapGJ').length)
 											if (uni.getStorageSync('mapGJ').length > 100) {
 												console.log(JSON.stringify(uni.getStorageSync('mapGJ')) )
-												this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo',  {
+												that.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo',  {
 															orderId:"cdae6ec34c2349768c490a9fefa03fb3",
 															longitudeLatitude:JSON.stringify(uni.getStorageSync('mapGJ'))   
 													}).then(res => {
 														uni.removeStorageSync('mapGJ');
-														this.$helper.gjList = []
+														that.$helper.gjList = []
 													})
 													.catch(res => {
 														uni.$u.toast(res.message);
@@ -270,6 +279,8 @@
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
+					}
+			})
 			},
 			gocode() {
 				uni.navigateTo({

pages/public/loginOther.vue

@@ -112,9 +112,21 @@
 				})
 			},
 			gocode() {
+				var that = this
 				if (this.phone.length == 11 && /^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
-					uni.navigateTo({
-						url: '/pages/public/code?phone=' + this.phone
+					that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: this.phone,
+					}).then(res => {
+						if (res.data.authenticationStatus == '已禁用') {
+							that.$refs.uToast.show({
+								type: 'error',
+								message: "账号审核中！"
+							})
+						} else {
+							uni.navigateTo({
+								url: '/pages/public/code?phone=' + this.phone
+							})
+						}
 					})
 				} else if (this.phone.length == 0) {
 					uni.showToast({

pages/public/register.vue

@@ -37,7 +37,7 @@
 				class='verificationCode'>注册</button>
 			<view
 				style='color:#6A6A6A;margin-top:10px;font-size:30rpx;display:flex;justify-content:center;align-items: center;'>
-				<u--image @click='consent'
+				<u--image style='margin-right:3px;position:relative;top:1rpx;' @click='consent'
 					:src="consentStatus==true?'../../static/images/mine/duihao@2x.png':'../../static/images/mine/wxz.png'"
 					width="17px" height="17px"></u--image>
 				已阅读并同意