From 926ade11ff01945328c3961ce39ab7c6ee2c20dc Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 10 Nov 2022 09:19:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main.js b/src/main.js
index 2795bc8f5..c0802cdf4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,6 +40,7 @@ if (getQueryPara("token")) {
console.log("token222222", localStorage.getItem("token"));
}
+// 山东通转接专用
(function () {
let href = location.href;
if (href.endsWith("#/") && href.includes("/login_sdt")) {
From 3cc8e9863dc55824356671cf6ad0883045f7d20f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Nov 2022 09:08:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=80=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/main-navbar.vue | 3 ++-
src/views/main-shuju/main-navbar.vue | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index b68506cd1..bdffdb65c 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -101,7 +101,7 @@
{{ $store.state.user.realName }}
-
+
{{
$t("updatePassword.title")
}}
@@ -135,6 +135,7 @@ export default {
inject: ["refresh"],
data() {
return {
+ loginType: localStorage.getItem("loginType"),
showHeader: true,
i18nMessages: messages,
updatePassowrdVisible: false,
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index b94a3efca..3abfe440a 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -117,7 +117,7 @@
{{ $store.state.user.realName }}
-
+
{{
$t("updatePassword.title")
}}
@@ -151,6 +151,7 @@ export default {
inject: ["refresh"],
data() {
return {
+ loginType: localStorage.getItem("loginType"),
showHeader: true,
i18nMessages: messages,
updatePassowrdVisible: false,
From 7d03bc205a25e3bafb07eb7145fbdba033cec98d Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Wed, 16 Nov 2022 13:31:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/community/community.vue | 6 ++++--
src/views/modules/base/community/roomTable.vue | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 4507abb30..fb38da89d 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -605,7 +605,7 @@ export default {
this.vDisabled = false
this.bDisabled = false
if (obj.level === 'building') {//点击楼栋
- this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
this.selAgencyId = ''
this.selGridId = ''
await this.getValiheList()
@@ -613,16 +613,18 @@ export default {
await this.getBuildList()
this.buildingId = this.selTreeObj.id
await this.getUniList()
+ this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
this.vDisabled = true
this.bDisabled = true
} else if (obj.level === 'neighborHood') {//点击小区
- this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
this.selAgencyId = ''
this.selGridId = ''
await this.getValiheList()
this.neighborHoodId = this.selTreeObj.id
await this.getBuildList()
+ this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
this.vDisabled = true
} else {
this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 55875f770..200139c66 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -291,6 +291,8 @@ export default {
async mounted () {
this.updateBtnAuths();
+ console.log(this.buildingId)
+
this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
elseParams: {
categoryKeys: ["house_info"],