diff --git a/src/common/action.js b/src/common/action.js index b041b7da..22f03dbc 100644 --- a/src/common/action.js +++ b/src/common/action.js @@ -2,7 +2,7 @@ const getVuex = () => { return JSON.parse(uni.getStorageSync('vuex') || {}) } const setVuex = vuex => { - uni.setStorageSync("vuex", vuex) + uni.setStorageSync("vuex", JSON.stringify(vuex)) } export default { instance: null, @@ -14,8 +14,8 @@ export default { let vuex = getVuex() this.instance?.post("/app/appgirdmemberinfo/checkLogOnUser").then(res => { if (res?.data) { - let {girdId, girdMemberId, girdName, checkType: girdCheckType} = res.data - vuex.user = {...vuex.user, girdId, girdMemberId, girdName, girdCheckType} + let {girdId, girdMemberId, girdName, checkType: girdCheckType, appGirdInfo: gridInfo} = res.data + vuex.user = {...vuex.user, girdId, girdMemberId, girdName, girdCheckType, gridInfo} setVuex(vuex) } }) diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue index 754c0c0b..b57fc371 100644 --- a/src/saas/AppGridManagement/AppGridManagement.vue +++ b/src/saas/AppGridManagement/AppGridManagement.vue @@ -11,7 +11,7 @@ 网格配置 - +
@@ -101,6 +101,7 @@ export default { } }, onLoad() { + this.handleSelectGird(this.user.gridInfo) uni.$on('hideTab', () => { this.isTab = false }) diff --git a/src/saas/AppGridManagement/Statistics.vue b/src/saas/AppGridManagement/Statistics.vue index 7c1fbaa7..60a5a0fc 100644 --- a/src/saas/AppGridManagement/Statistics.vue +++ b/src/saas/AppGridManagement/Statistics.vue @@ -30,9 +30,7 @@
网格名称 - {{ gridInfo.girdName || '' }} -
@@ -56,14 +54,12 @@ export default { }, data() { return { - girdUser: [], peopleList: {}, gridInfo: {}, checkType: '', } }, created() { - this.isGirdUser() this.gridInfo = this.params this.getList() uni.$on('goback', (res) => { @@ -72,17 +68,9 @@ export default { }) }, methods: { - isGirdUser() { - this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => { - if (res.code == 0) { - this.girdUser = res.data - } - }) - }, - getList() { this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.gridInfo.id}`).then((res) => { - if (res.code == 0) { + if (res?.data) { this.peopleList = res.data } }) diff --git a/src/store/index.js b/src/store/index.js index fba76bc7..c2f05f0d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -3,6 +3,7 @@ import Vuex from 'vuex' import perState from 'vuex-persistedstate' import http from '../common/axios' import CryptoJS from '../utils/crypto-js' +import action from "../common/action"; Vue.use(Vuex) let agentSignURL = "", apiList = [] @@ -210,7 +211,7 @@ const store = new Vuex.Store({ return http.post("/admin/user/detail-phone").then(res => { if (res?.code == 0) { state.commit('setUser', res.data) - this.$action.getGridInfo() + action.getGridInfo() } }) },