From 3641cf4fb549e3d7936c7bed5e91f151f64dc574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Sun, 23 Oct 2022 21:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E7=99=BB=E5=BD=95bug/switch=E8=BD=AC=E4=B8=BAu-switch?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/home_.vue | 2 +-
pages/login/login_.vue | 40 ++++++++++++-------------
pages/login/userRegister.vue | 6 +++-
pages/my/myInfoChange.vue | 19 ++++++++----
pages/workSpace/visit/vpeopleSelect.vue | 6 ++--
5 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/pages/home/home_.vue b/pages/home/home_.vue
index b3857b7..564ad82 100644
--- a/pages/home/home_.vue
+++ b/pages/home/home_.vue
@@ -127,7 +127,7 @@
onShow() {
// debugger;
// console.log(this.vuex_perm)
- if(this.vuex_user.type==='visitor'){
+ if(this.vuex_user.type==='visitor'||this.vuex_user.type==='driver'){
this.limitedVisit = true;
}else{
let date = new Date();
diff --git a/pages/login/login_.vue b/pages/login/login_.vue
index 9852f39..1e18a60 100644
--- a/pages/login/login_.vue
+++ b/pages/login/login_.vue
@@ -390,34 +390,34 @@
}
console.log(perms);
that.$u.vuex('vuex_perm', perms)
- })
- that.$u.api.hrmUserInfo().then(res => {
- that.$u.vuex('vuex_employee', res)
- if (res.type === 'employee') {
- uni.reLaunch({
- url: '/pages/home/home_'
- })
- } else {
- //非正式员工
- if (res.id_number == '' || res.photo == '' || res.id_number == null || res
- .photo == null) {
- //信息不完善，进入信息完善页面
+ that.$u.api.hrmUserInfo().then(res => {
+ that.$u.vuex('vuex_employee', res)
+ if (res.type === 'employee') {
uni.reLaunch({
- url: '/pages/my/myInfoChange'
+ url: '/pages/home/home_'
})
} else {
- //信息完善
- if (res.type === 'remployee') {
+ //非正式员工
+ if (res.id_number == '' || res.photo == '' || res.id_number == null || res
+ .photo == null) {
+ //信息不完善，进入信息完善页面
uni.reLaunch({
- url: '/pages/home/home_'
+ url: '/pages/my/myInfoChange'
})
} else {
- uni.reLaunch({
- url: '/pages/workSpace/workSpace'
- })
+ //信息完善
+ if (res.type === 'remployee') {
+ uni.reLaunch({
+ url: '/pages/home/home_'
+ })
+ } else {
+ uni.reLaunch({
+ url: '/pages/workSpace/workSpace'
+ })
+ }
}
}
- }
+ })
})
// #ifdef APP-PLUS
let secret = that.ranStr(12)
diff --git a/pages/login/userRegister.vue b/pages/login/userRegister.vue
index 0ba3a64..ca3bb98 100644
--- a/pages/login/userRegister.vue
+++ b/pages/login/userRegister.vue
@@ -107,8 +107,12 @@
if (!that.checkedParams(obj)) return;
that.$u.api.visitorRegister(obj).then(res => {
uni.hideLoading();
+ uni.showToast({
+ title:"注册成功,请重新登录",
+ icon: "none"
+ })
uni.reLaunch({
- url: '/pages/login/login_'
+ url: '/pages/login/login_?autoLoading=no'
})
})
diff --git a/pages/my/myInfoChange.vue b/pages/my/myInfoChange.vue
index 684d525..f66aa02 100644
--- a/pages/my/myInfoChange.vue
+++ b/pages/my/myInfoChange.vue
@@ -10,7 +10,7 @@
手机号
-
+
@@ -112,12 +112,21 @@
if (!that.paramsCheck()) {
return;
} else {
+ uni.showLoading({
+ title: '保存中...',
+ mask: true
+ })
this.$u.api.hrmUpdateInfo(this.userInfo).then(res=>{
- debugger;
- console.log(res)
- uni.navigateTo({
- url: '/pages/my/my'
+ uni.hideLoading()
+ uni.showToast({
+ title: '保存成功',
+ icon: 'none'
})
+ uni.reLaunch({
+ url: '/pages/workSpace/workSpace'
+ })
+ }).catch(e=>{
+ uni.hideLoading()
})
}
},
diff --git a/pages/workSpace/visit/vpeopleSelect.vue b/pages/workSpace/visit/vpeopleSelect.vue
index af23925..964c6a8 100644
--- a/pages/workSpace/visit/vpeopleSelect.vue
+++ b/pages/workSpace/visit/vpeopleSelect.vue
@@ -56,13 +56,13 @@
是否报备
-
+
是否主访客
-
+
@@ -143,7 +143,7 @@
},
onShow() {
this.getHeader();
- // this.getUserRange();
+ this.getUserRange();
},
methods: {
getHeader() {