Merge branch 'master' into houxq

src/layout/app/components/Appheader/index.vue

@@ -4,21 +4,21 @@
 
         <div class="right-menu">
           <div class="mr20 d-in-block v-mid message-info hand" @click="toMessage"></div>
-            <el-dropdown class="avatar-container v-mid" trigger="click" placement="bottom-end">
+            <!-- <el-dropdown class="avatar-container v-mid" trigger="click" placement="bottom-end"> -->
                 <div class="avatar-wrapper">
                     <img :src="avatar" class="user-avatar" />
                     <span  class="user-name">{{ username }}</span>
-                    <i class="el-icon-caret-bottom" />
+                    <!-- <i class="el-icon-caret-bottom" /> -->
                 </div>
-                <el-dropdown-menu slot="dropdown" class="user-dropdown">
+                <!-- <el-dropdown-menu slot="dropdown" class="user-dropdown">
                     <router-link style="text-decoration: none;" to="/">
                         <el-dropdown-item>电脑端首页</el-dropdown-item>
                     </router-link>
                   <el-dropdown-item divided @click.native="toMobile">
                     <div>切换移动端</div>
                   </el-dropdown-item>
-                </el-dropdown-menu>
-            </el-dropdown>
+                </el-dropdown-menu> -->
+            <!-- </el-dropdown> -->
         </div>
     </div>
 </template>
@@ -74,6 +74,7 @@ export default defineComponent({
     }
 
     .right-menu {
+        display: flex;
       .message-info{
         width: 20px;
         height: 24px;
@@ -94,7 +95,7 @@ export default defineComponent({
                     margin-right: 6px;
                 }
                 // .user-name{
-                    
+
                 // }
             }
         }

src/router/index.js

@@ -8,11 +8,11 @@ Vue.use(Router);
 
 const originalPush = Router.prototype.push;
 Router.prototype.push = function (location) {
-    originalPush.call(this, location).catch((err) => err);
+  originalPush.call(this, location).catch((err) => err);
 };
 const originalReplace = Router.prototype.replace;
 Router.prototype.replace = function (location) {
-    originalReplace.call(this, location).catch((err) => err);
+  originalReplace.call(this, location).catch((err) => err);
 };
 
 /* AppLayout */
@@ -417,7 +417,7 @@ export const allRoutes = [
                     name: "xsczda_xslb_bjlb_xslbxq",
                     component: () =>
                       import("@/views/xsczda/xslb/bjlb/xslbxq/index.vue"),
-                    meta: { title: "学生列表详情" , back: true },
+                    meta: { title: "学生列表详情", back: true },
                     props: true,
                   },
 
@@ -426,7 +426,7 @@ export const allRoutes = [
                     name: "xsczda_xslb_bjlb_xslbxq_czda",
                     component: () =>
                       import("@/views/xsczda/xslb/bjlb/xslbxq/czda/index.vue"),
-                    meta: { title: "成长档案",  back: true },
+                    meta: { title: "成长档案", back: true },
                     props: true,
                   },
                 ],
@@ -677,7 +677,7 @@ async function handleFilterRoutes(routes) {
       // '#/dddx/ddrwfk' => '/dddx'
       const first = '/' + hash.split('/')[1]
       console.log('getAppRoutes :>> ', first, routes.filter(route => route.path === first));
-      return routes.filter(route => route.path === first || whiteList.includes(route.path))
+      return routes.filter(route => route.path === first || whiteList.includes(route.path) || ("/xsxjk" === first && route.path === '/jcxxgl'))
     }
   }
   // await new Promise((resolve) => {
@@ -714,8 +714,8 @@ const router = createRouter();
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-    const newRouter = createRouter();
-    router.matcher = newRouter.matcher; // reset router
+  const newRouter = createRouter();
+  router.matcher = newRouter.matcher; // reset router
 }
 
 export default router;
@@ -728,12 +728,12 @@ export default router;
 import getPageTitle from "@/utils/get-page-title";
 
 router.beforeEach(async (to, from, next) => {
-    document.title = getPageTitle(to.meta.title);
-    console.groupCollapsed(
-        `router ${from.meta.title || "新进入"} => ${to.meta.title}`
-    );
-    console.log("from :>> ", from);
-    console.log("to :>> ", to);
-    console.groupEnd();
-    next();
+  document.title = getPageTitle(to.meta.title);
+  console.groupCollapsed(
+    `router ${from.meta.title || "新进入"} => ${to.meta.title}`
+  );
+  console.log("from :>> ", from);
+  console.log("to :>> ", to);
+  console.groupEnd();
+  next();
 });