Merge branch 'master' of https://git.theluyuan.com/luyuan/ptSend

view/src/menu/leftMenu.vue

@@ -1,37 +1,92 @@
 <script setup>
 
-import {Check, Download, Edit, View} from "@element-plus/icons-vue";
+import {
+  Check,
+  Download,
+  Edit,
+  View,
+  CollectionTag,
+  VideoCamera,
+  VideoPlay,
+  SwitchButton
+} from "@element-plus/icons-vue";
 import {router} from "../router/index.js";
 </script>
 
 <template>
 
-    <el-scrollbar>
-      <el-menu :router="true">
-        <el-sub-menu index="1">
-          <template #title><el-icon><Check /></el-icon>功能测试</template>
-          <el-menu-item-group>
-            <template #title>测试模块</template>
-            <el-menu-item index="/medaInfoTest"><el-icon><Edit /></el-icon>MediaInfo</el-menu-item>
-            <el-menu-item index="1"><el-icon><View /></el-icon>图像截取</el-menu-item>
-            <el-menu-item index="/downloadTest" to><el-icon><Download /></el-icon>视频下载</el-menu-item>
-          </el-menu-item-group>
-        </el-sub-menu>
-        <el-sub-menu index="2">
-          <template #title><el-icon><Check /></el-icon>订阅管理</template>
-          <el-menu-item-group>
-            <template #title>测试模块</template>
-            <el-menu-item index="/addVideo"><el-icon><Edit /></el-icon>添加订阅</el-menu-item>
-            <el-menu-item index="/downloadTest" to><el-icon><Download /></el-icon>订阅列表</el-menu-item>
-          </el-menu-item-group>
-        </el-sub-menu>
-      </el-menu>
-      
-    </el-scrollbar>
+  <el-scrollbar>
+    <el-menu :router="true">
+      <el-sub-menu index="1">
+        <template #title>
+          <el-icon>
+            <CollectionTag/>
+          </el-icon>
+          订阅管理
+        </template>
+        <el-menu-item-group>
+          <el-menu-item index="/subscribe">
+            <el-icon>
+              <VideoCamera/>
+            </el-icon>
+            电视剧订阅
+          </el-menu-item>
+          <el-menu-item index="">
+            <el-icon>
+              <VideoPlay/>
+            </el-icon>
+            电影订阅
+          </el-menu-item>
+        </el-menu-item-group>
+      </el-sub-menu>
+      <el-sub-menu index="2">
+        <template #title>
+          <el-icon>
+            <Check/>
+          </el-icon>
+          功能测试
+        </template>
+        <el-menu-item-group>
+          <template #title>测试模块</template>
+          <el-menu-item index="/medaInfoTest">
+            <el-icon>
+              <Edit/>
+            </el-icon>
+            MediaInfo
+          </el-menu-item>
+          <el-menu-item index="1">
+            <el-icon>
+              <View/>
+            </el-icon>
+            图像截取
+          </el-menu-item>
+          <el-menu-item index="/downloadTest" to>
+            <el-icon>
+              <Download/>
+            </el-icon>
+            视频下载
+          </el-menu-item>
+          <el-menu-item @click="test">
+            <el-icon>
+              <SwitchButton/>
+            </el-icon>
+            功能测试
+          </el-menu-item>
+        </el-menu-item-group>
+      </el-sub-menu>
+    </el-menu>
+  </el-scrollbar>
 
 </template>
 <script>
 
+import axios from "axios";
+
+function test() {
+  axios.get('/test').then(r => {
+
+  })
+}
 
 </script>
 

view/src/page/subscribe/subscribe.vue

@@ -0,0 +1,52 @@
+<template>
+  <el-row>
+    <el-col
+        v-for="(o, index) in 1"
+        :key="o"
+        :span="8"
+        :offset="index > 0 ? 2 : 0"
+    >
+      <el-card :body-style="{ padding: '0px' }">
+        <img
+            src="https://puui.qpic.cn/vcover_vt_pic/0/ww18u675tfmhas61669188848910/260"
+            class="image"
+        />
+        <div style="padding: 14px">
+          <span>一念永恒</span>
+          <div class="bottom">
+            <time class="time">正在订阅：100/104</time>
+            <el-button text class="button">编辑</el-button>
+          </div>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style>
+.time {
+  font-size: 12px;
+  color: #999;
+}
+
+.bottom {
+  margin-top: 13px;
+  line-height: 12px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.button {
+  padding: 0;
+  min-height: auto;
+}
+
+.image {
+  width: 100%;
+  display: block;
+}
+</style>

view/src/page/test/downloadTest.vue

@@ -17,7 +17,6 @@
       <div style="display: flex;">
         <el-input v-model="form.start"/>
         <el-button style="flex-shrink: 0;margin: 0 10px;" @click="setList" type="primary">设置</el-button>
-        <el-button style="flex-shrink: 0;margin: 0 10px;" @click="test" type="primary">测试按钮</el-button>
       </div>
 
     </el-form-item>
@@ -137,14 +136,6 @@ function showMsg() {
   dialogVisible.value = true
 }
 
-function test() {
-  axios.get("/test", {
-    params: {url: form.value.name}
-  }).then((r) => {
-    console.log(r.data);
-  })
-}
-
 </script>
 
 <style lang="scss" scoped>

view/src/router/index.js

@@ -16,8 +16,9 @@ const routes = [
                 component: () => import("../page/test/getMediaInfoTest.vue")
             },
             {
-                path:"addVideo",
-                component: ()=>import("../page/addVideo.vue")
+                path: "subscribe",
+                name: "subscribe",
+                component:() => import ("../page/subscribe/subscribe.vue")
             }
         ],
         component: () => import("../page/index.vue"),