From dcbda98765ffa9e8066330502379fafbf2a750b7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 14 Dec 2021 16:21:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/router/page/index.js |  343 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 177 insertions(+), 166 deletions(-)

diff --git a/src/router/page/index.js b/src/router/page/index.js
index 5e6c479..ae24e98 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -1,8 +1,8 @@
 /*
  * @Author: Morpheus
  * @Date: 2021-04-30 14:12:09
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-13 16:48:01
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-12-13 14:53:06
  */
 
 import Vue from 'vue'
@@ -26,177 +26,188 @@
                 title: '系统首页'
             },
             children: [{
-                    path: 'mapnav',
-                    component: resolve => require(['../../pcviews/mapnav/index.vue'], resolve),
-                    meta: {
-                        title: '地图导览'
-                    }
-                },
-                {
-                    path: 'orgnav',
-                    component: resolve => require(['../../pcviews/orgnav/index.vue'], resolve),
-                    meta: {
-                        title: '校内机构导览'
-                    },
-                    children: [{
-                            path: 'masses',
-                            component: resolve => require(['../../pcviews/orgnav/masses.vue'], resolve),
-                            meta: {
-                                title: '党群机构'
-                            }
-                        },
-                        {
-                            path: 'ofc',
-                            component: resolve => require(['../../pcviews/orgnav/ofc.vue'], resolve),
-                            meta: {
-                                title: '职能部处'
-                            }
-                        }, {
-                            path: 'directly',
-                            component: resolve => require(['../../pcviews/orgnav/directly.vue'], resolve),
-                            meta: {
-                                title: '直属及附属单位'
-                            }
-                        },
-                        {
-                            path: 'teaching',
-                            component: resolve => require(['../../pcviews/orgnav/teaching.vue'], resolve),
-                            meta: {
-                                title: '教学与科研机构'
-                            }
-                        }, {
-                            path: 'rest',
-                            component: resolve => require(['../../pcviews/orgnav/rest.vue'], resolve),
-                            meta: {
-                                title: '其他机构'
-                            }
-                        }
-                    ]
-                },
-                {
-                    path: 'arc',
-                    component: resolve => require(['../../pcviews/arc/index.vue'], resolve),
-                    meta: {
-                        title: '校内建筑'
-                    },
-                    children: [{
-                            path: 'edifact',
-                            component: resolve => require(['../../pcviews/arc/edifact.vue'], resolve),
-                            meta: {
-                                title: '行政办公'
-                            }
-                        },
-                        {
-                            path: 'teaching',
-                            component: resolve => require(['../../pcviews/arc/teaching.vue'], resolve),
-                            meta: {
-                                title: '教学科研'
-                            }
-                        }, {
-                            path: 'venue',
-                            component: resolve => require(['../../pcviews/arc/venue.vue'], resolve),
-                            meta: {
-                                title: '校内场馆'
-                            }
-                        },
-                        {
-                            path: 'dorm',
-                            component: resolve => require(['../../pcviews/arc/dorm.vue'], resolve),
-                            meta: {
-                                title: '学生宿舍'
-                            }
-                        }, {
-                            path: 'culture',
-                            component: resolve => require(['../../pcviews/arc/culture.vue'], resolve),
-                            meta: {
-                                title: '文化风景'
-                            }
-                        },
-                        {
-                            path: 'family',
-                            component: resolve => require(['../../pcviews/arc/family.vue'], resolve),
-                            meta: {
-                                title: '家属住宅'
-                            }
-                        }, {
-                            path: 'rest',
-                            component: resolve => require(['../../pcviews/arc/rest.vue'], resolve),
-                            meta: {
-                                title: '其他楼宇'
-                            }
-                        }
-                    ]
-                },
-                {
-                    path: 'service',
-                    component: resolve => require(['../../pcviews/service/index.vue'], resolve),
-                    meta: {
-                        title: '生活服务设施'
-                    }
-                },
-                {
-                    path: 'allquery',
-                    component: resolve => require(['../../pcviews/allquery/index.vue'], resolve),
-                    meta: {
-                        title: '综合查询'
-                    }
-                },
-                {
-                    path: 'campusnav',
-                    component: resolve => require(['../../pcviews/campusnav/index.vue'], resolve),
-                    meta: {
-                        title: '校园导览'
-                    }
-                },
-                {
-                    path: 'campusnavi',
-                    component: resolve => require(['../../pcviews/campusnavi/index.vue'], resolve),
-                    meta: {
-                        title: '校园导航'
-                    }
-                },
-                {
-                    path: 'specialmap',
-                    component: resolve => require(['../../pcviews/specialmap/index.vue'], resolve),
-                    meta: {
-                        title: '专题地图'
-                    }
-                },
-                {
-                    path: 'tool',
-                    component: resolve => require(['../../pcviews/tool/index.vue'], resolve),
-                    meta: {
-                        title: '工具'
-                    },
-                    children: [{
-                            path: 'download',
-                            component: resolve => require(['../../pcviews/tool/download.vue'], resolve),
-                            meta: {
-                                title: '地图下载'
-                            }
-                        }, {
-                            path: 'sign',
-                            component: resolve => require(['../../pcviews/tool/sign.vue'], resolve),
-                            meta: {
-                                title: '地图标记'
-                            }
-                        },
-                        {
-                            path: 'ranging',
-                            component: resolve => require(['../../pcviews/tool/ranging.vue'], resolve),
-                            meta: {
-                                title: '地图测距'
-                            }
-                        }
-                    ]
+                path: 'mapnav',
+                component: resolve => require(['../../pcviews/mapnav/index.vue'], resolve),
+                meta: {
+                    title: '地图导览'
                 }
+            },
+            {
+                path: 'orgnav',
+                component: resolve => require(['../../pcviews/orgnav/index.vue'], resolve),
+                meta: {
+                    title: '校内机构导览'
+                },
+                children: [{
+                    path: 'masses',
+                    component: resolve => require(['../../pcviews/orgnav/masses.vue'], resolve),
+                    meta: {
+                        title: '党群机构'
+                    }
+                },
+                {
+                    path: 'ofc',
+                    component: resolve => require(['../../pcviews/orgnav/ofc.vue'], resolve),
+                    meta: {
+                        title: '职能部处'
+                    }
+                }, {
+                    path: 'directly',
+                    component: resolve => require(['../../pcviews/orgnav/directly.vue'], resolve),
+                    meta: {
+                        title: '直属及附属单位'
+                    }
+                },
+                {
+                    path: 'teaching',
+                    component: resolve => require(['../../pcviews/orgnav/teaching.vue'], resolve),
+                    meta: {
+                        title: '教学与科研机构'
+                    }
+                }, {
+                    path: 'rest',
+                    component: resolve => require(['../../pcviews/orgnav/rest.vue'], resolve),
+                    meta: {
+                        title: '其他机构'
+                    }
+                }
+                ]
+            },
+            {
+                path: 'arc',
+                component: resolve => require(['../../pcviews/arc/index.vue'], resolve),
+                meta: {
+                    title: '校内建筑'
+                },
+                children: [{
+                    path: 'edifact',
+                    component: resolve => require(['../../pcviews/arc/edifact.vue'], resolve),
+                    meta: {
+                        title: '行政办公'
+                    }
+                },
+                {
+                    path: 'teaching',
+                    component: resolve => require(['../../pcviews/arc/teaching.vue'], resolve),
+                    meta: {
+                        title: '教学科研'
+                    }
+                }, {
+                    path: 'venue',
+                    component: resolve => require(['../../pcviews/arc/venue.vue'], resolve),
+                    meta: {
+                        title: '校内场馆'
+                    }
+                },
+                {
+                    path: 'dorm',
+                    component: resolve => require(['../../pcviews/arc/dorm.vue'], resolve),
+                    meta: {
+                        title: '学生宿舍'
+                    }
+                }, {
+                    path: 'culture',
+                    component: resolve => require(['../../pcviews/arc/culture.vue'], resolve),
+                    meta: {
+                        title: '文化风景'
+                    }
+                },
+                {
+                    path: 'family',
+                    component: resolve => require(['../../pcviews/arc/family.vue'], resolve),
+                    meta: {
+                        title: '家属住宅'
+                    }
+                }, {
+                    path: 'rest',
+                    component: resolve => require(['../../pcviews/arc/rest.vue'], resolve),
+                    meta: {
+                        title: '其他楼宇'
+                    }
+                }
+                ]
+            },
+            {
+                path: 'service',
+                component: resolve => require(['../../pcviews/service/index.vue'], resolve),
+                meta: {
+                    title: '生活服务设施'
+                }
+            },
+            {
+                path: 'allquery',
+                component: resolve => require(['../../pcviews/allquery/index.vue'], resolve),
+                meta: {
+                    title: '综合查询'
+                }
+            },
+            {
+                path: 'campusnav',
+                component: resolve => require(['../../pcviews/campusnav/index.vue'], resolve),
+                meta: {
+                    title: '校园导览'
+                }
+            },
+            {
+                path: 'campusnavi',
+                component: resolve => require(['../../pcviews/campusnavi/index.vue'], resolve),
+                meta: {
+                    title: '校园导航'
+                }
+            },
+            {
+                path: 'specialmap',
+                component: resolve => require(['../../pcviews/specialmap/index.vue'], resolve),
+                meta: {
+                    title: '专题地图'
+                }
+            },
+            {
+                path: 'tool',
+                component: resolve => require(['../../pcviews/tool/index.vue'], resolve),
+                meta: {
+                    title: '工具'
+                },
+                children: [{
+                    path: 'download',
+                    component: resolve => require(['../../pcviews/tool/download.vue'], resolve),
+                    meta: {
+                        title: '地图下载'
+                    }
+                }, {
+                    path: 'sign',
+                    component: resolve => require(['../../pcviews/tool/sign.vue'], resolve),
+                    meta: {
+                        title: '地图标记'
+                    }
+                },
+                {
+                    path: 'ranging',
+                    component: resolve => require(['../../pcviews/tool/ranging.vue'], resolve),
+                    meta: {
+                        title: '地图测距'
+                    }
+                }
+                ]
+            }
             ]
         }]
     },
     // 手机端
     {
         path: '/mobileLayout',
-        component: resolve => require(['../../mobileLayout/index.vue'], resolve)
+        redirect: '/mobileLayout/default',
+        meta: {
+            title: '导航菜单'
+        },
+        component: resolve => require(['../../mobileLayout/index.vue'], resolve),
+        children: [{
+            path: 'default',
+            component: resolve => require(['../../mobileviews/home/index.vue'], resolve),
+            meta: {
+                title: '系统首页'
+            }
+        }]
     },
     {
         path: '/403',

--
Gitblit v1.9.3