diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue
index 03ec17e8..3593214d 100644
--- a/pages/login/compatibleLogin.vue
+++ b/pages/login/compatibleLogin.vue
@@ -20,6 +20,12 @@
+
+
+ 您已阅读并同意《隐私政策》
+
忘记密码
@@ -54,7 +60,8 @@
account: '',
password: ''
},
- deptList: []
+ deptList: [],
+ isChecked: false,
};
},
methods: {
@@ -80,6 +87,9 @@
}
},
+ isCheckedFn() {
+ this.isChecked = !this.isChecked;
+ },
getDeptList(data, status = false) {
// 获取改角色的部门
let params = {
@@ -106,11 +116,11 @@
})
return;
}
-
+
this.showForm = false;
this.deptList = res.result;
- if(this.deptList.length==1){
+ if (this.deptList.length == 1) {
this.clickDept(this.deptList[0]);
}
console.log(res);
@@ -128,6 +138,10 @@
title: "请输入密码",
icon: "none"
})
+ if (!this.isChecked) return uni.showToast({
+ title: "请勾选隐私政策",
+ icon: "none"
+ })
if (valid) {
// 验证成功
let timestamp = Date.now();
@@ -148,14 +162,14 @@
let {
accountType
} = res.result;
- if(res.result.expire){
+ if (res.result.expire) {
this.userInfo = {
userId: res.result.userId,
account: res.result.account,
token: res.result.token,
};
let that = this;
-
+
uni.showModal({
title: '提示',
content: '密码有效期已超过90天,为确保您的账号安全,请重新修改密码!',
@@ -164,7 +178,7 @@
uni.navigateTo({
url: `/pages/my/changePassword/changePassword?userInfo=${JSON.stringify(that.userInfo)}`,
});
-
+
} else if (res.cancel) {
console.log('用户点击取消');
}
@@ -172,7 +186,7 @@
});
return
}
-
+
if (accountType == 5 || accountType == 6 || accountType == 10) {
if (this.type == "user") {
// 用户端
@@ -278,6 +292,19 @@
+
\ No newline at end of file
diff --git a/pages/personLocation/login/login.vue b/pages/personLocation/login/login.vue
index 26e91169..2e491e12 100644
--- a/pages/personLocation/login/login.vue
+++ b/pages/personLocation/login/login.vue
@@ -28,6 +28,12 @@
+
+
+ 您已阅读并同意《隐私政策》
+
同意协议并登录