~fyy/unattended-app.git

			@@ -4,6 +4,7 @@
			<!--用户名密码登录-->
			<user-password :btnText="0" />
			<!-- 微信openid登录 -->
			<!-- #ifdef MP-WEIXIN -->
			<view class="loginBtn">
			<u-button class="button"
			@click.stop="beforeLoginEvent"
			@@ -12,17 +13,18 @@
			type="primary"
			text="微信一键登录"></u-button>
			</view>
			<!-- <view class="loginBtn">
			<u-button @click.stop="jumpBindBack"
			type="primary"
			text="一键绑定测试"></u-button>
			</view> -->
			<view class="register"
			@click="PrivacyAgreementHandle"><text>注册</text></view>
			<!-- #endif -->
			<view class="utils-block">
			<view @click="forgetPassword"><text>忘记密码?</text></view>
			<view @click="PrivacyAgreementHandle"><text>新用户注册</text></view>
			</view>

			<view class="login-bottom-box">
			<view class="copyright">冀中能源无人值守微信小程序</view>
			<view class="copyright">小程序仅供已拥有系统账号特定内部人员使用</view>
			</view>

			<!-- #ifdef MP-WEIXIN -->
			<!-- 微信授权前的弹框 -->
			<view class="loginPopup">
			<u-popup :show="loginPopupShow"
			@@ -57,6 +59,7 @@
			@confirm="bindWxConfirm"
			@cancel="bindWxCancel"></u-modal>
			</view>
			<!-- #endif -->
			</view>
			</template>

			@@ -141,6 +144,7 @@
			this.setUserTabbar(res.data.type);
			uni.setStorageSync('roleType', res.data.type);
			uni.setStorageSync("userId", res.data.userId)
			uni.setStorageSync("carNo", res.data.carNo)
			setCustomerId(res.data.customerid);
			uni.hideLoading();
			//跳转页面
			@@ -172,6 +176,11 @@
			openPopup() {
			console.log('打开了');
			},
			forgetPassword() {
			uni.navigateTo({
			url: '/pages/login/forgetPassword/forgetPassword'
			})
			},
			PrivacyAgreementHandle() {
			uni.navigateTo({
			url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
			@@ -189,32 +198,21 @@
			}

			.login {
			// height: 100vh;
			// display: flex;
			// align-items: center;

			// .loginBtn {
			// margin: 0 auto;
			// width: 80%;

			// .u-button {
			// .u-icon {
			// .u-icon__icon {
			// font-size: vww(20) !important;
			// }
			// }
			// }

			// .u-button--success {
			// border-style: none;
			// }
			// }
			.loginBtn {
			margin-top: vww(20);

			.u-button {
			width: 80%;
			}
			}

			.utils-block {
			width: 80%;
			margin: vww(20) auto;
			display: flex;
			justify-content: space-between;
			color: #497bff;
			font-size: vww(17);
			}

			.logo {
			@@ -318,4 +316,4 @@
			}
			}
			}
			</style>
			</style>