diff --git a/package.json b/package.json index 76951d6..cd460d1 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "vue": "^2.6.10", "vue-audio-player": "0.0.2", "vue-axios": "^2.1.2", + "vue-bus": "^1.2.1", "vue-clipboard2": "^0.3.0", "vue-cron": "^1.0.9", "vue-echarts": "^4.0.1", diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 7f6cde6..0d0ead5 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -306,7 +306,11 @@ export function findHouseByUser(query) { return request({ url: '/autoSR/zkhouse/findHouseByUser', method:'get', - params:query + params:{ + agentId:localStorage.getItem('agentId'), + orgCode:localStorage.getItem('orgCode'), + ...query + } }) } // 楼盘绑定 diff --git a/src/main.js b/src/main.js index 6c9e086..47833fd 100644 --- a/src/main.js +++ b/src/main.js @@ -44,7 +44,6 @@ Vue.use(AVUE, { size: 'small', menuType: 'text' }) - // 注册全局容器 Vue.component('basicContainer', basicContainer) diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 501f628..8a41f11 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -355,9 +355,11 @@ export default { localStorage.setItem("houseId", item.id); } this.$router.push({ path: "/wel" }); + localStorage.setItem('allClose',true) }, goback() { this.$router.back(); + localStorage.setItem('allClose',false) }, handleSizeChange(val) { console.log(`每页 ${val} 条`); diff --git a/src/page/check/index.vue b/src/page/check/index.vue index b64025c..5e90277 100644 --- a/src/page/check/index.vue +++ b/src/page/check/index.vue @@ -87,6 +87,7 @@ export default { // 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面 if (this.backFlag) { this.$router.back(); + localStorage.setItem('allClose',false) } else { this.$confirm("是否退出系统, 是否继续?", "提示", { confirmButtonText: "确定", @@ -240,7 +241,7 @@ export default { // 楼盘后台 // this.$router.push({ path: "/chose", query: { flag: 3 } }); } - + localStorage.setItem('allClose',true) // this.$router.push({ path: "/chose" }); }, }, diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index 99ce409..de4fdf4 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -69,12 +69,15 @@ }, contextmenuFlag() { window.addEventListener('mousedown', this.watchContextmenu) - } + }, }, created() { }, mounted() { this.setActive() + if(localStorage.getItem('allClose')){ + this.closeAllTags() + } }, computed: { ...mapGetters(['tagWel', 'tagList', 'tag', 'website']), diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index d31d809..03bed4b 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -119,6 +119,7 @@ export default { this.$store.dispatch("LoginByUsername", this.loginForm).then(() => { // this.$router.push({ path: this.tagWel.value }); this.info = getStore({ name: "userInfo" }); + localStorage.setItem('allClose',false) that.$api.api.getTab().then((res) => { // console.log(res) // 循环数组,给定各种标志 diff --git a/vue.config.js b/vue.config.js index 87daeff..1108632 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,11 +3,11 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 +// const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -// const url = 'http://jrcd6b.natappfree.cc' //王笑 +const url = 'http://jrcd6b.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']