登录用户隐私政策添加

pages.json

@@ -179,6 +179,14 @@
 		  		"navigationBarTitleText": "上报信息",
 		  		"enablePullDownRefresh": false
 		  	}
+		  },
+		  {
+		  	"path" : "shipmentReport/shipmentReport",
+		  	"style" : 
+		  	{
+		  		"navigationBarTitleText" : "",
+		  		"enablePullDownRefresh" : false
+		  	}
 		  }
             ]
 	}],

pages/login/login.vue

@@ -35,8 +35,11 @@
 			<!-- 登录按钮 -->
 			<button class="loginBtn font_bolder" @click="submitForm">{{isVerifLogin==false ? '承运商登录' : '司机登录'}}</button>
 		</view>
-		<!-- 用户隐私协议 
-		<bs-userPrivacy ref="userPrivacy" />-->
+		<!-- -- 用户隐私协议 -->
+		<bs-userPrivacy ref="myUserPrivacy" style="margin-top: -100px;margin-left: 20px;"/>
+		<view class="primary-description">
+			<view class="container-subTitle">仅供天合合作承运商及司机登录</view>
+		</view>
 	</view>
 </template>
 
@@ -57,7 +60,7 @@
 					phone: '', //电话号码
 					authCode: '' //验证码
 				},
-				isVerifLogin: true, //是否为验证码登录
+				isVerifLogin: false, //是否为验证码登录
 				tips: '获取验证码',
 				disabled: false, //是否禁用获取验证码
 			}
@@ -155,6 +158,16 @@
 
 			//确认提交
 			submitForm() {
+				const myUserPrivacy = this.$refs.myUserPrivacy;
+				const userAuth = myUserPrivacy.$data.userAuth;
+				if (!userAuth) {
+					uni.showToast({
+						title: '请先详细阅读用户协议并同意授权',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
 				const { userName, password, phone, authCode } = this.formData
 				if(!this.onSubmitBeforeRule(userName, password, phone, authCode)) return //规则校验
 				let {projectMini} = getApp().globalData;
@@ -401,7 +414,7 @@
 			    width: 400rpx;
 			    height: 300rpx;
 			    display: flex;
-			    margin: -50px 0px 0px 60px;
+			    margin: -100px 0px 0px 60px;
 		}
 		.primary-description {
 			font-size: 28rpx;
@@ -414,15 +427,19 @@
 				line-height: 84rpx;
 				margin: 158rpx 0 85rpx;
 			}
+			.container-subTitle{
+				 color: #817676; 
+				 text-align: center;
+			}
 		}
 
 		.user-info {
 			width: 100%;
 			/* #ifdef MP */
-			margin-top: 400rpx;
+			margin-top: 200rpx;
 			/* #endif */
 			/* #ifdef H5 || APP-PLUS*/
-			margin-top: 320rpx;
+			margin-top: 160rpx;
 			/* #endif */
 			flex-wrap: wrap;