reghao пре 1 година
родитељ
комит
081e488776

+ 19 - 19
src/components/layout/NavBar.vue

@@ -68,11 +68,6 @@
                 class="size"
                 @click.native="goToDisk"
               >我的网盘</el-dropdown-item>
-              <el-dropdown-item
-                icon="el-icon-s-home"
-                class="size"
-                @click.native="goToHome"
-              >我的主页</el-dropdown-item>
               <el-dropdown-item
                 icon="el-icon-s-data"
                 class="size"
@@ -80,17 +75,22 @@
               >我的稿件
               </el-dropdown-item>
               <el-dropdown-item
-                icon="el-icon-star-on"
+                icon="el-icon-video-camera"
                 class="size"
-                @click.native="goToFavlist"
-              >收藏夹
+                @click.native="goToCam"
+              >我的监控
               </el-dropdown-item>
               <el-dropdown-item
-                icon="el-icon-video-camera-solid"
+                icon="el-icon-s-shop"
                 class="size"
-                @click.native="goToHistory"
-              >历史记录
+                @click.native="goToMall"
+              >我的商城
               </el-dropdown-item>
+              <el-dropdown-item
+                icon="el-icon-s-home"
+                class="size"
+                @click.native="goToHome"
+              >我的主页</el-dropdown-item>
               <el-dropdown-item
                 icon="el-icon-error"
                 class="size"
@@ -313,25 +313,25 @@ export default {
       this.$router.push(path)
     },
     goToPost() {
-      if (this.$route.path === '/post/list/video') {
+      if (this.$route.path === '/post') {
         this.$router.go(0)
         return
       }
-      this.$router.push('/post/list/video')
+      this.$router.push('/post')
     },
-    goToFavlist() {
-      if (this.$route.path === '/my/favlist/video') {
+    goToCam() {
+      if (this.$route.path === '/cam') {
         this.$router.go(0)
         return
       }
-      this.$router.push('/my/favlist/video')
+      this.$router.push('/cam')
     },
-    goToHistory() {
-      if (this.$route.path === '/my/visit') {
+    goToMall() {
+      if (this.$route.path === '/mall') {
         this.$router.go(0)
         return
       }
-      this.$router.push('/my/visit')
+      this.$router.push('/mall')
     },
     goToMessage() {
       if (this.$route.path === '/my/message') {

+ 1 - 1
src/router/index.js

@@ -15,7 +15,7 @@ const Login = () => import('views/Login')
 const Register = () => import('views/Register')
 const Forgot = () => import('views/Forgot')
 
-const Home = () => import('views/home/Index')
+const Home = () => import('views/home/Home')
 const TimelineIndex = () => import('views/home/Timeline')
 const VideoIndex = () => import('views/home/Video')
 const ShortVideoIndex = () => import('views/home/ShortVideo')

+ 4 - 12
src/views/cam/Cam.vue

@@ -40,18 +40,10 @@
           class="el-menu-vertical-demo"
           :unique-opened="true"
         >
-          <el-submenu index="/cam">
-            <template slot="title">
-              <i class="el-icon-camera" />
-              <span slot="title">我的监控</span>
-            </template>
-            <el-menu-item-group>
-              <el-menu-item index="/cam/list">
-                <i class="el-icon-camera" />
-                <span slot="title">摄像头列表</span>
-              </el-menu-item>
-            </el-menu-item-group>
-          </el-submenu>
+          <el-menu-item index="/cam/list">
+            <i class="el-icon-camera" />
+            <span slot="title">摄像头列表</span>
+          </el-menu-item>
         </el-menu>
       </el-aside>
       <el-main>

+ 0 - 0
src/views/home/Index.vue → src/views/home/Home.vue


+ 16 - 24
src/views/my/My.vue

@@ -40,30 +40,22 @@
           class="el-menu-vertical-demo"
           :unique-opened="true"
         >
-          <el-submenu index="/my/account">
-            <template slot="title">
-              <i class="el-icon-user" />
-              <span slot="title">帐号管理</span>
-            </template>
-            <el-menu-item-group>
-              <el-menu-item index="/my/account/contact">
-                <i class="el-icon-film" />
-                <span slot="title">联系人</span>
-              </el-menu-item>
-              <el-menu-item index="/my/account/realname">
-                <i class="el-icon-film" />
-                <span slot="title">实名认证</span>
-              </el-menu-item>
-              <el-menu-item index="/my/account/vip">
-                <i class="el-icon-film" />
-                <span slot="title">小会员</span>
-              </el-menu-item>
-              <el-menu-item index="/my/account/wallet">
-                <i class="el-icon-wallet" />
-                <span slot="title">钱包</span>
-              </el-menu-item>
-            </el-menu-item-group>
-          </el-submenu>
+          <el-menu-item index="/my/account/contact">
+            <i class="el-icon-user" />
+            <span slot="title">联系人</span>
+          </el-menu-item>
+          <el-menu-item index="/my/account/realname">
+            <i class="el-icon-film" />
+            <span slot="title">实名认证</span>
+          </el-menu-item>
+          <el-menu-item index="/my/account/vip">
+            <i class="el-icon-film" />
+            <span slot="title">小会员</span>
+          </el-menu-item>
+          <el-menu-item index="/my/account/wallet">
+            <i class="el-icon-wallet" />
+            <span slot="title">钱包</span>
+          </el-menu-item>
           <el-menu-item index="/my/message">
             <i class="el-icon-message" />
             <span slot="title">我的消息</span>

+ 0 - 8
src/views/my/MyContact.vue

@@ -3,14 +3,6 @@
     <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
       <el-col :md="12">
         <el-form :inline="true" :model="searchForm">
-          <el-form-item>
-            <el-badge class="item">
-              <el-button size="mini" type="danger" @click="showAddContactDialog">添加联系人</el-button>
-            </el-badge>
-            <el-badge class="item" :value="msgCount" :max="99">
-              <el-button size="mini" type="info" @click="showNewContactDialog">新联系人</el-button>
-            </el-badge>
-          </el-form-item>
           <el-form-item>
             <el-badge class="item">
               <el-input v-model="searchForm.title" placeholder="用户名" />