前端

App.vue

@@ -85,7 +85,8 @@
 						radius:10,
 					    // cancelText: '否',
 						showCancel:false,
-						okButtonColor:'#2772FB'
+						okColor:'#2772FB',
+						okButtonColor:'#fff'
 					};
 					const native = uni.requireNativePlugin('AJ-Alert');
 					native.showAction(options, result => {
@@ -152,9 +153,57 @@
 				}
 			})
 			uni.onTabBarMidButtonTap(() => {
-				uni.navigateTo({
-					url: '/pages/release/release'
-				});
+				if(uni.getStorageSync('userInfo')){
+					this.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
+						phone: uni.getStorageSync('userInfo').phone
+					}).then(res => {
+						if(res.data.authenticationStatus!='已认证'){
+							if(res.data.authenticationStatus=='审核中'){
+								uni.showToast({
+									icon:'none',
+									title: '身份信息审核中'
+								})
+							}else if(res.data.authenticationStatus=='已过期'||res.data.authenticationStatus=='未认证'){
+								var content='',confirmtext=''
+								if(res.data.authenticationStatus=='已过期'){
+									content='身份信息已过期！'
+									confirmtext='立即修改'
+								}else{
+									content='身份信息未认证，去认证?'
+									confirmtext='确认'
+								}
+								let options = {
+								    title: '提示', 
+									info:content,
+								    okText: confirmtext, 
+									infoAlignment:'center',
+									radius:10,
+								    // cancelText: '否',
+									showCancel:false,
+									okColor:'#2772FB',
+									okButtonColor:'#ffffff'
+								};
+								const native = uni.requireNativePlugin('AJ-Alert');
+								native.showAction(options, result => {
+									uni.switchTab({
+										url: '/pages/mine/index'
+									})
+								    // 点击是的回调, result暂时没有返回内容
+								}, cancel => {
+								    // 点击否的回调
+								});
+							}
+						}else{
+							uni.navigateTo({
+								url: '/pages/release/release'
+							});
+						}
+						
+					})
+				}else{
+					uni.$u.route('/pages/public/login');
+				}
+				
 			})
 			// #ifdef APP-PLUS
 			let type = uni.getSystemInfoSync().platform

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	// baseUrlNew: 'https://apitest.eliangeyun.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	baseUrlNew: 'https://apitest.eliangeyun.com',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/mine/cargoowner/cargoowner.vue

@@ -268,8 +268,8 @@
 		width: 100%;
 		margin: 0 auto;
 		text-align: center;
-		height: 46px;
-		line-height: 46px;
+		height: 48px;
+		line-height: 48px;
 		color: #fff;
 		background: url(../../../static/mine/huozhurenzheng/Mask@3x.png) no-repeat;
 		background-size: 100%;

pages/mine/index.vue

@@ -17,7 +17,7 @@
 						<view class='flex items-center'>
 							<view class='username'>{{userName}} {{cargoCall}}</view>
 							<view v-if='status' class='currectstatus'>已认证</view>
-							<view v-if='!status' class='currectstatus1'>未认证</view>
+							<view v-if='!status' class='currectstatus1'>{{CargoOwner.authenticationStatus}}</view>
 						</view>
 						<view class='phone'>{{starUserphone}}</view>
 					</view>
@@ -142,6 +142,7 @@
 		data() {
 			return {
 				confirmText: '',
+				CargoOwner:{},
 				showCancelButton: true,
 				isShowAlert: false,
 				alertTitle: '',
@@ -163,7 +164,8 @@
 					}).then(res => {
 						uni.hideLoading()
 						if (res.data) {
-							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回') {
+							this.CargoOwner=res.data
+							if (res.data.authenticationStatus == '审核中' || res.data.authenticationStatus == '已驳回'||res.data.authenticationStatus == '未认证') {
 								this.status = false
 							} else {
 								this.status = true

pages/order/index.vue

@@ -495,16 +495,17 @@
 				this.isShowAlert = true
 			},
 			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
+				var that =this
+				// // #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
 				that.isShowAlert = false
 				if (this.type == 1 || this.type == 2) {
 					let _title = ''

pages/public/login.vue

@@ -25,10 +25,12 @@
 					
 					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
 					<input class='password' v-model='password' v-else type="text" placeholder="请输入密码">
-					<u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
+					<!-- <u-icon name="eye-fill" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(1)"
 							v-if="isShowPassword=='password'"></u-icon>
 					<u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
-						</u-icon>
+						</u-icon> -->
+						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/xianshi.png" mode=""></image>
+						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(2)" v-else src="../../static/yioncang.png" mode=""></image>
 				</view>
 				<!-- <u-input v-if="isShowPassword=='password'" class='password' border="none" v-model='password' placeholder="请输入密码，6-16位字符"
 					type="password" :clearable='true'>
@@ -153,6 +155,21 @@
 			},
 			passlogin(e) {
 				var that = this
+				if(this.phone==''){
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "请输入手机号！"
+					})
+					return
+				}
+				if(this.password==''){
+					that.$refs.uToast.show({
+						type: 'error',
+						message: "请输入密码！"
+					})
+					return
+				}
+				
 				
 				that.$request.baseRequest('get', '/cargoOwnerInfo/firstAuthentication', {
 					phone: this.phone,
@@ -168,7 +185,6 @@
 							title: '登录中',
 							mask: true
 						})
-						
 						that.$request.baseRequest('get', '/commonUser/login', {
 								phone: that.phone,
 								password: that.password,
@@ -226,7 +242,6 @@
 							});
 					}
 				})
-				
 			},
 			gocode() {
 				uni.navigateTo({
@@ -276,7 +291,7 @@
 		position: absolute;
 		right: 0px;
 	}
-	.u-icon{
+	.yanjingicon{
 		position:absolute;
 		right:0;
 		top:50%;

pages/release/release.vue

@@ -21,7 +21,7 @@
 		<view class="content1">
 			<view class="row" @click="selectCargoOwner">
 				<view class="left select-sf" :class='dataObj.cargoOwner?"":"select-sf1"'>{{dataObj.cargoOwner?dataObj.cargoOwner:'选择货主身份'}}</view>
-				<view class="right"><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
+				<view class="right"><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 			</view>
 			<!-- 		<view class="row" @click="selectCargoOwner" v-if="dataObj.cargoOwner">
 				<view class="left">{{dataObj.cargoOwner}}</view>
@@ -45,7 +45,7 @@
 				</view>
 				<view class="right" @click="selectAddress(0)" v-if="!dataObj.sendArea">
 					<view v-if='dataObj.sendArea' class="right"></view>
-					<view class="right" v-else><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
+					<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
 			<view class="row2">
@@ -62,7 +62,7 @@
 				</view>
 				<view class="right" @click="selectAddress(1)" v-if="!dataObj.unloadArea">
 					<view v-if='dataObj.unloadArea' class="right">{{(dataObj.unloadCity+dataObj.unloadArea)}}</view>
-					<view class="right" v-else><image src="../../static/images/myimg/gengduo1.png" style="width: 20rpx;height: 26rpx;margin-top:14rpx;"></image></view>
+					<view class="right" v-else><image src="../../static/right.png" style="width: 22rpx;height: 22rpx;margin-top:14rpx;"></image></view>
 				</view>
 			</view>
 		</view>
@@ -369,11 +369,7 @@
 				let _obj = res.data
 				if (_obj.authenticationStatus == '已认证') {
 					uni.$u.route('/pages/components/empty/index');
-				} else if (_obj.authenticationStatus == '审核中') {
-					uni.showToast({
-						title: '身份信息审核中'
-					})
-				}else if (_obj.authenticationStatus == '已过期') {
+				} else if (_obj.authenticationStatus == '已过期') {
 					this.alertTitle = '身份信息已过期！'
 					this.showCancelButton = false
 					this.confirmText='立即修改'
@@ -681,24 +677,24 @@
 				}
 			},
 			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
+				// // #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.switchTab({
-						url: '/pages/mine/index'
-					})
-					return
-				}
-				this.isShowAlert = false
+				// if (this.alertTitle == '身份信息未认证，去认证?') {
+				// 	uni.switchTab({
+				// 		url: '/pages/mine/index'
+				// 	})
+				// 	return
+				// }
+				// this.isShowAlert = false
 
 				if (this.dataObj.billingMethod == '元/吨') {
 					this.dataObj.billingMethod = 0