Merge branch 'master' into shibei_master

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")) {

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>