From 3755425b0e1deac6b580daa0daed262c1b08c928 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 10 Oct 2020 14:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                |  7 ++++++-
 src/components/LiveItem.vue     | 24 ++++++++++++++++++++++--
 src/components/Menu.vue         | 25 +++++++++++++++----------
 src/components/NavTop.vue       |  4 ++--
 src/layout/Regime.vue           |  2 +-
 src/views/login/Login.vue       |  5 +----
 src/views/regime/Subscriber.vue |  1 +
 7 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index a0032d0..37f2b3e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -24,6 +24,7 @@ export async function loginpass(phone: string, password: string){
         }else{
             setToken();
             store.commit("login");
+            store.dispatch("setUserInfo");
             router.push("/mine/archives")
         }
     }
@@ -34,7 +35,11 @@ export async function loginpass(phone: string, password: string){
  */
 export async function userinfo(){
     const user =  await get<UserInfo>('personalInfo');
-    console.log(user.data?.img)
+    // console.log(user.data?.img)
+    if(user.code == 1001){
+        router.push("/")
+        return '未登录';
+    }
     return {
         head: user.data?.img,
         username: user.data?.name,
diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue
index 4f3d048..dc886ea 100644
--- a/src/components/LiveItem.vue
+++ b/src/components/LiveItem.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="videoitem">
+    <div class="videoitem" @click="navto()">
         <img src="" alt="" class="cover">
         <img src="@/static/images/play.png" alt="" class="play">
         <div class="title">
@@ -133,14 +133,34 @@
 }
 </style>
 <script lang="ts">
+import router from '@/router';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-      props:{
+    props:{
         type: {
             type: Number,
             default:1
         }
     },
+    setup(props){
+        function navto(){
+            let url = '';
+            switch (props.type) {
+                case 1:
+                    url = '/regime/livedetail';
+                    break;
+                case 2:
+                    url = '/regime/livedetail';
+                    break;
+                case 3:
+                    url = '/regeime/liveing';
+            }
+            router.push(url)
+        }
+        return {
+            navto
+        }
+    }
 })
 </script>
\ No newline at end of file
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index df42b49..f179fde 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -14,7 +14,7 @@
                         <img :src="i.icon" alt="" class="icon">
                         <div class="title">{{i.name}}</div>
                     </div>
-                    <img src="" alt="" class="right">
+                    <img alt="" src="../static/images/jiantou.png" class="right">
                 </div>
             </div>
             <div style="overflow: hidden;">
@@ -22,7 +22,7 @@
             </div>
             <div class="item loginout">
                 <div class="route">
-                    <img src="" alt="" class="icon">
+                    <img src="../static/images/tuichu.png" alt="" class="icon">
                     <div class="title">
                         帐号退出
                     </div>
@@ -89,7 +89,6 @@
             .right{
                 width: 5px;
                 height: 10px;
-                background-color: #0f0;
             }
         }
         .loginout{
@@ -119,6 +118,7 @@
 import router from '@/router';
 import store from '@/store';
 import { computed, defineComponent, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
 export default defineComponent({
     setup(){
@@ -131,37 +131,37 @@ export default defineComponent({
         // 左侧的列表数组
         const list: Array<MenuItem> = [
             {  
-                icon: "../static/images/wode1.ping",
+                icon: require("../static/images/wode1.png"),
                 sleicon:"",
                 name: "我的档案",
                 route: "/mine/archives"
             },
             {  
-                icon: "../static/images/xiayig.ping",
+                icon: require("../static/images/xiayig.png"),
                 sleicon:"",
                 name: "发布直播",
                 route: "/mine/webcast"
             },
             {  
-                icon: "../static/images/shipin.png",
+                icon: require("../static/images/shipin.png"),
                 sleicon:"shipin.png",
                 name: "上传视频",
                 route: "/mine/video"
             },
             {  
-                icon: "/static/images/yinhangka.png",
+                icon: require("../static/images/yinhangka.png"),
                 sleicon:"",
                 name: "我的钱包",
                 route: "/mine/wallet"
             },
             {  
-                icon: "../static/images/tongji.png",
+                icon: require("../static/images/tongji.png"),
                 sleicon:"",
                 name: "列表统计",
                 route: "/mine/liststatistic"
             },
             {  
-                icon: "../static/images/bangzhu@2x.png",
+                icon: require("../static/images/bangzhu.png"),
                 sleicon:"",
                 name: "关于Beelink",
                 route: "/mine/aboutus"
@@ -171,7 +171,12 @@ export default defineComponent({
         const selnum = ref(0);
 
         const userinfo = computed(() => store.state.userinfo)
-        console.log(userinfo.value)
+        // 设置当前路由
+        for(const i in list){
+            if(list[i].route == useRoute().path){
+                selnum.value = parseInt(i);
+            }
+        }
         /**
          * 跳转路由与赋值对应的下标
          * @param index 选中的下标 方便赋值与跳转
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index be99523..e6bd34b 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -134,7 +134,7 @@ export default defineComponent({
         const nav: Array<Nav> = [
             {
                 name: "直播管理",
-                route: ""
+                route: "/regime/live"
             },
             {
                 name: "视频管理",
@@ -142,7 +142,7 @@ export default defineComponent({
             },
             {
                 name: "订阅者管理",
-                route: ""
+                route: "/regime/subscriber"
             },
             {
                 name: "个人中心",
diff --git a/src/layout/Regime.vue b/src/layout/Regime.vue
index 447167d..65cd1f2 100644
--- a/src/layout/Regime.vue
+++ b/src/layout/Regime.vue
@@ -11,7 +11,7 @@
     display: flex;
     flex-direction: column;
     .body{
-        display: flex;
+        // display: flex;
         width: 100%;
         height:  calc(100% - 57px);
         overflow: auto;
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 1040de9..af9261e 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -150,7 +150,6 @@ import { defineComponent, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
 import { loginpass } from '@/api';
-import store from '@/store';
 
 export default defineComponent({
   name: "Login",
@@ -198,9 +197,7 @@ export default defineComponent({
     };
     function login(): void {
         console.log(userinfo.phone,userinfo.password)
-        loginpass(userinfo.phone,userinfo.password).then(()=>{
-            store.dispatch("setUserInfo");
-        })
+        loginpass(userinfo.phone,userinfo.password)
 
     }
     return {
diff --git a/src/views/regime/Subscriber.vue b/src/views/regime/Subscriber.vue
index a26fa70..1d16ec9 100644
--- a/src/views/regime/Subscriber.vue
+++ b/src/views/regime/Subscriber.vue
@@ -271,6 +271,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  padding-bottom: 200px;
   .top {
     display: flex;
     width: 1241px;