Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

src/api/index.ts

@@ -933,4 +933,14 @@ export async function getlivest() {
     } else {
         return false;
     }
+}
+
+export async function feedback(text: string) {
+    const res = await post<any>("feedback",{desc:text})
+    // todo 返回参数错误
+    if(res.code == 0){
+        message.success(res.msg)
+    }else{
+        message.error(res.msg)
+    }
 }

src/views/login/About.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="right">
           <div @click="navto('/')">立即登录</div>
-          <div class="signnow" @click="navto('/sing')">立即注册</div>
+          <div class="signnow" @click="navto('/sign')">立即注册</div>
           <div class="line"></div>
            <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
                 <div class="item" style="display: flex;align-items: center;" @click="e => e.preventDefault()">
@@ -146,7 +146,8 @@ export default defineComponent({
     }
     return {
       languagelist,
-      userinfo
+      userinfo,
+      navto
     };
   },
 });

src/views/login/Login.vue

@@ -79,7 +79,8 @@
         <div class="topdesc">Beelink 开启您的美好学习生活</div>
 
         <div class="lessons">
-          <div class="lessonitem" v-for="(i,j) in videolist" :key="j" @click="tovideoxq(i.videoid)">
+          <!-- @click="tovideoxq(i.videoid)" -->
+          <div class="lessonitem" v-for="(i,j) in videolist" :key="j" >
             <img :src="i.img" alt="" class="pic"/>
             <div class="lessonname">
               <div>{{i.title}}</div>

src/views/mine/Aboutus.vue

@@ -33,11 +33,11 @@
       <div class="fankui">
         <div class="label">意见反馈</div>
         <div>
-             <a-textarea v-model:value="value" placeholder="Basic usage" :rows="10" />
+             <a-textarea v-model:value="value" placeholder="请输入您的意见反馈" :rows="10" />
         </div>
       </div>
 
-      <div class="sub">提交反馈</div>
+      <div class="sub" @click="sub">提交反馈</div>
     </div>
     <NavBottom class="navbottom"></NavBottom>
   </div>
@@ -46,6 +46,7 @@
 <script lang="ts">
 import { defineComponent, ref } from "vue";
 import NavBottom from "@/components/NavBottom.vue";
+import { feedback } from '@/api';
 export default defineComponent({
   name: "Aboutus",
   components: {
@@ -53,13 +54,19 @@ export default defineComponent({
   },
   setup() {
     const tabindex=ref(1)
+    const value = ref("")
      const tabchange: (e: number) => void = (e: number) => {
       console.log(e);
       tabindex.value=e
     };
+    function sub(){
+      feedback(value.value)
+    }
     return {
       tabchange,
-      tabindex
+      tabindex,
+      sub,
+      value
     };
   },
 });
@@ -147,6 +154,7 @@ export default defineComponent({
     text-align: center;
     margin-left:40px;
     margin-bottom: 110px;
+    margin-top: 80px;
   }
   .navbottom {
     padding-top: 68px;

src/views/regime/Subscriber.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="subscriber">
     <div class="top">
-      <div class="title">我的订阅者（56）</div>
+      <div class="title">我的订阅者（{{teacherlikedlist.total}}）</div>
       <div class="sel">
         <img src="@/static/images/sousuo.png" alt="" class="icon" />
            <input type="text" placeholder="请输入想要搜索的学生姓名" v-model="condition.title" @keyup.enter="search(condition)"/>

src/views/regime/Video.vue

@@ -41,6 +41,7 @@
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
+        :videoid="i.videoid"
         :img="i.img"
         :title="i.title"
         :score="i.score"
@@ -57,6 +58,7 @@
         v-for="(i, j) in videolist.data"
         :key="j"
         :img="i.img"
+        :videoid="i.videoid"
         :title="i.title"
         :score="i.score"
         :date="i.created_at"
@@ -72,6 +74,7 @@
         v-for="(i, j) in videolist.data"
         :key="j"
         :img="i.img"
+        :videoid="i.videoid"
         :title="i.title"
         :score="i.score"
         :date="i.created_at"
@@ -228,7 +231,8 @@ export default defineComponent({
     });
     async function tabchange(e: number) {
       tabindex.value = e;
-      videolist.value = await getvideolist({title: input.value,page:page.value,status:e == 4 ? '' : 0});
+      videolist.value = {};
+      videolist.value = await getvideolist({title: input.value,page:page.value,status:e == 4 ? '' : e});
       // console.log(videolist)
     }
     async function sel(){