diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 89e61e6..4eebf06 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -26,7 +26,10 @@
:key="item.id"
v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
{{item.name}}
- {{item.value}}
+ {{item.value}}
@@ -73,6 +76,11 @@
value: ''
},
{
+ id: 'visitorApplyStatus',
+ name: '申请状态',
+ value: ''
+ },
+ {
id: 'staffCode',
name: '申请者工号',
value: ''
@@ -186,7 +194,11 @@
this.list.forEach(item => {
for(let key in res) {
if(item.id === key) {
- item.value = res[key];
+ if(key === 'visitorApplyStatus') {
+ item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过';
+ } else {
+ item.value = res[key];
+ }
} else if(item.id === 'time') {
item.value = res.inTime + ' ~ ' + res.outTime;
}
@@ -253,6 +265,15 @@
margin-right: 60rpx;
font-weight: 600;
}
+ .green {
+ color: #2ebf00;
+ }
+ .blue {
+ color: #1076e3;
+ }
+ .red {
+ color: #f02a0a;
+ }
}
.button-area-manager {
display: flex;
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 89e61e6..4eebf06 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -26,7 +26,10 @@
:key="item.id"
v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
{{item.name}}
- {{item.value}}
+ {{item.value}}
@@ -73,6 +76,11 @@
value: ''
},
{
+ id: 'visitorApplyStatus',
+ name: '申请状态',
+ value: ''
+ },
+ {
id: 'staffCode',
name: '申请者工号',
value: ''
@@ -186,7 +194,11 @@
this.list.forEach(item => {
for(let key in res) {
if(item.id === key) {
- item.value = res[key];
+ if(key === 'visitorApplyStatus') {
+ item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过';
+ } else {
+ item.value = res[key];
+ }
} else if(item.id === 'time') {
item.value = res.inTime + ' ~ ' + res.outTime;
}
@@ -253,6 +265,15 @@
margin-right: 60rpx;
font-weight: 600;
}
+ .green {
+ color: #2ebf00;
+ }
+ .blue {
+ color: #1076e3;
+ }
+ .red {
+ color: #f02a0a;
+ }
}
.button-area-manager {
display: flex;
diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js
index 99cbf98..e9048f8 100644
--- a/store/modules/tabBar.js
+++ b/store/modules/tabBar.js
@@ -17,10 +17,18 @@
let type = temp;
const state = {
+ type: 'user_applicant',
list: tabBar[type]
}
+const mutations = {
+ changeType(state, payload) {
+ state.type = payload.type;
+ }
+}
+
export default {
namespaced: true,
- state
+ state,
+ mutations
}
\ No newline at end of file
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 89e61e6..4eebf06 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -26,7 +26,10 @@
:key="item.id"
v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
{{item.name}}
- {{item.value}}
+ {{item.value}}
@@ -73,6 +76,11 @@
value: ''
},
{
+ id: 'visitorApplyStatus',
+ name: '申请状态',
+ value: ''
+ },
+ {
id: 'staffCode',
name: '申请者工号',
value: ''
@@ -186,7 +194,11 @@
this.list.forEach(item => {
for(let key in res) {
if(item.id === key) {
- item.value = res[key];
+ if(key === 'visitorApplyStatus') {
+ item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过';
+ } else {
+ item.value = res[key];
+ }
} else if(item.id === 'time') {
item.value = res.inTime + ' ~ ' + res.outTime;
}
@@ -253,6 +265,15 @@
margin-right: 60rpx;
font-weight: 600;
}
+ .green {
+ color: #2ebf00;
+ }
+ .blue {
+ color: #1076e3;
+ }
+ .red {
+ color: #f02a0a;
+ }
}
.button-area-manager {
display: flex;
diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js
index 99cbf98..e9048f8 100644
--- a/store/modules/tabBar.js
+++ b/store/modules/tabBar.js
@@ -17,10 +17,18 @@
let type = temp;
const state = {
+ type: 'user_applicant',
list: tabBar[type]
}
+const mutations = {
+ changeType(state, payload) {
+ state.type = payload.type;
+ }
+}
+
export default {
namespaced: true,
- state
+ state,
+ mutations
}
\ No newline at end of file
diff --git a/utils/auth.js b/utils/auth.js
index 65fb6a5..2422108 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -4,6 +4,14 @@
//获取用户信息
export function getUserProfile() {
getUserInfo().then(resporse => {
+ // let temp;
+ // if (resporse.salt === "物业人员") {
+ // temp = 'user_manager';
+ // this.$store.commit('changeType', {type: temp});
+ // } else {
+ // temp = 'user_applicant';
+ // this.$store.commit('changeType', {type: temp});
+ // }
uni.setStorageSync('userInfo', JSON.stringify(resporse));
})
}
@@ -14,11 +22,10 @@
onlyAuthorize: true,
success(data) {
console.log('登录参数', data, uni.getStorageSync('sessionId'))
- login(data.code).then(res => {
- uni.setStorageSync('sessionId', res);
- resolve('登录成功');
- // getUserProfile();
- });
+ // login(data.code).then(res => {
+ // uni.setStorageSync('sessionId', res);
+ // resolve('登录成功');
+ // });
},
fail(err) {
console.log('login fail', err);
diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue
index 89e61e6..4eebf06 100644
--- a/pages/checkMessageDetail/checkMessageDetail.vue
+++ b/pages/checkMessageDetail/checkMessageDetail.vue
@@ -26,7 +26,10 @@
:key="item.id"
v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true">
{{item.name}}
- {{item.value}}
+ {{item.value}}
@@ -73,6 +76,11 @@
value: ''
},
{
+ id: 'visitorApplyStatus',
+ name: '申请状态',
+ value: ''
+ },
+ {
id: 'staffCode',
name: '申请者工号',
value: ''
@@ -186,7 +194,11 @@
this.list.forEach(item => {
for(let key in res) {
if(item.id === key) {
- item.value = res[key];
+ if(key === 'visitorApplyStatus') {
+ item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过';
+ } else {
+ item.value = res[key];
+ }
} else if(item.id === 'time') {
item.value = res.inTime + ' ~ ' + res.outTime;
}
@@ -253,6 +265,15 @@
margin-right: 60rpx;
font-weight: 600;
}
+ .green {
+ color: #2ebf00;
+ }
+ .blue {
+ color: #1076e3;
+ }
+ .red {
+ color: #f02a0a;
+ }
}
.button-area-manager {
display: flex;
diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js
index 99cbf98..e9048f8 100644
--- a/store/modules/tabBar.js
+++ b/store/modules/tabBar.js
@@ -17,10 +17,18 @@
let type = temp;
const state = {
+ type: 'user_applicant',
list: tabBar[type]
}
+const mutations = {
+ changeType(state, payload) {
+ state.type = payload.type;
+ }
+}
+
export default {
namespaced: true,
- state
+ state,
+ mutations
}
\ No newline at end of file
diff --git a/utils/auth.js b/utils/auth.js
index 65fb6a5..2422108 100644
--- a/utils/auth.js
+++ b/utils/auth.js
@@ -4,6 +4,14 @@
//获取用户信息
export function getUserProfile() {
getUserInfo().then(resporse => {
+ // let temp;
+ // if (resporse.salt === "物业人员") {
+ // temp = 'user_manager';
+ // this.$store.commit('changeType', {type: temp});
+ // } else {
+ // temp = 'user_applicant';
+ // this.$store.commit('changeType', {type: temp});
+ // }
uni.setStorageSync('userInfo', JSON.stringify(resporse));
})
}
@@ -14,11 +22,10 @@
onlyAuthorize: true,
success(data) {
console.log('登录参数', data, uni.getStorageSync('sessionId'))
- login(data.code).then(res => {
- uni.setStorageSync('sessionId', res);
- resolve('登录成功');
- // getUserProfile();
- });
+ // login(data.code).then(res => {
+ // uni.setStorageSync('sessionId', res);
+ // resolve('登录成功');
+ // });
},
fail(err) {
console.log('login fail', err);
diff --git a/utils/common.js b/utils/common.js
index 1515529..1b35a77 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -7,7 +7,7 @@
if (res.subscriptionsSetting.mainSwitch) { // 用户打开了订阅消息总开关
// 每次执到这都会拉起授权弹窗
wx.requestSubscribeMessage({ // 调起消息订阅界面
- tmplIds: ['34re6IUbmEjUvOFmFcwMZeM4hB_6F-BuKdoezTCx8JM'],
+ tmplIds: ['34re6IUbmEjUvOFmFcwMZev5gr-E6KRsRcJ-9T-tbXI', 'W5Xhyw94AuONUpkhWWpLJgGsbmr1eoO5opeW9brYEeA'],
success(res) {
console.log(res, '订阅消息 成功 ');
},