diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b600f03 Binary files /dev/null and b/dist.zip differ diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 8ca868e..ad4e661 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -63,10 +63,11 @@ export default { // 刷新token的时间 refreshTime: '', // 计时器 - timer: '' + timer: '', } }, created() { + this.loading = true // 实时检测刷新token this.refreshToken() }, diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue index 13ad9e3..2c564f8 100644 --- a/src/page/index/top/top-menu.vue +++ b/src/page/index/top/top-menu.vue @@ -35,6 +35,7 @@ export default { this.getTopMenu() // 用户权限加载 this.getUserInfo() + console.log('this.getUserInfo()') }, computed: { ...mapGetters(['menu']) diff --git a/src/page/wel.vue b/src/page/wel.vue index 5c5749f..7d6df02 100644 --- a/src/page/wel.vue +++ b/src/page/wel.vue @@ -1,6 +1,15 @@ @@ -1120,20 +1125,37 @@ export default { list: [], fraction: "", }, - info: {}, }; }, computed: { ...mapGetters(["permissions"]), + // 获取用户信息 + userInfo() { + return this.$store.state.user.userInfo + }, + // 是否楼盘后台 + isHouse() { + return this.userInfo.userRoleType == null && this.role == 3 + }, + + + // 是否系统后台 + isSystem() { + return this.role != 3 && this.userInfo.userRoleType == 1 + }, + + // 是否顾问 + isAdviser() { + return this.userInfo.userRoleType == 6 + } }, mounted() { this.role = localStorage.getItem("orgType"); - this.info = getStore({ name: "userInfo" }); + if (this.role == 3) { this.houseId = localStorage.getItem("houseId"); - this.getgicd(); // 获取维度占比 this.getindexZxllist(); @@ -1148,6 +1170,7 @@ export default { this.waitingForOperation(); } }, + methods: { // 跳转详情 toDetail(path, params2 = "", name) { diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue index 5222530..78e1a9f 100644 --- a/src/views/ReceivingRecords/index.vue +++ b/src/views/ReceivingRecords/index.vue @@ -246,7 +246,7 @@ -
+
@@ -336,6 +336,7 @@ {{ row.zfal == 0 ? "已加精" : "未加精" }} +