From fe7101383858dd11dee6642a720c5b0078e1b172 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 17 Mar 2022 17:45:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 932df895..6ec6c657 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -402,8 +402,21 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       eval(s2)
     ); // URL支持{{ window.xxx }}占位符变量
     if (isURL(URL)) {
-      route["path"] = route["name"] = `i-${menuList[i].id}`;
-      route["meta"]["iframeURL"] = URL;
+      if (menuList[i].children && menuList[i].children.length >= 1) {
+        let item = menuList[i].children.find(
+          (subMenu) => subMenu.url == menuList[i].url
+        );
+        if (item) {
+          route["path"] = route["name"] = `i-${menuList[i].id}`;
+          route["redirect"] = `i-${item.id}`;
+        } else {
+          route["path"] = route["name"] = `i-${menuList[i].id}`;
+          route["meta"]["iframeURL"] = URL;
+        }
+      } else {
+        route["path"] = route["name"] = `i-${menuList[i].id}`;
+        route["meta"]["iframeURL"] = URL;
+      }
     } else {
       URL = URL.replace(/^\//, "").replace(/_/g, "-");
       if (URL.startsWith("unopen")) {

From fe1ed8022da150eba59e4072ad5467d2794c7e0e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 16:14:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8D=B7=E5=85=8B?=
 =?UTF-8?q?=E9=9A=BD=E9=9A=BE=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index edfe119d..74ed24d8 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -139,12 +139,12 @@
                    src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
               <div class="rel-text"
                    :class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
-                <div class="rel-call">岳父母或公婆</div>
-                <div class="rel-name">吉克隽逸</div>
-                <!-- <span class="rel-call">{{
+                <!-- <div class="rel-call">岳父母或公婆</div>
+                <div class="rel-name">吉克隽逸</div> -->
+                <span class="rel-call">{{
                   houseInfo.userList[0].relation
                 }}</span>
-                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span> -->
+                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span>
               </div>
             </div>