jwyu 2 tahun lalu
induk
melakukan
a2f35d0346

+ 13 - 1
src/api/ppt.js

@@ -119,7 +119,7 @@ export function apiPPTPublish(params){
 }
 }
 
 
 /**
 /**
- * ppt列表
+ * 我的ppt列表
  * @param GroupId 分类id
  * @param GroupId 分类id
  */
  */
 export function apiPPTList(params) {
 export function apiPPTList(params) {
@@ -130,6 +130,18 @@ export function apiPPTList(params) {
     }
     }
 }
 }
 
 
+/**
+ * 公共ppt列表
+ * @param AdminId
+ */
+export function apiPPTPubList(params){
+    if(window.location.pathname.startsWith('/ppten')){
+        return get('/ppt_english/share/ppt/list',params)
+    }else{
+        return get('/pptv2/share/ppt/list',params)
+    }
+}
+
 /**
 /**
  * ppt搜索
  * ppt搜索
  * @param Keyword
  * @param Keyword

+ 1 - 1
src/assets/styles/common.scss

@@ -4,7 +4,7 @@
 }
 }
 
 
 html,body{
 html,body{
-    font-size: 28px;
+    font-size: 30px;
     color: #333;
     color: #333;
 }
 }
 
 

+ 1 - 1
src/layouts/Index.vue

@@ -133,7 +133,7 @@ function handleLoginOut(){
                 background-size: cover;
                 background-size: cover;
                 margin-right: 5px;
                 margin-right: 5px;
                 position: relative;
                 position: relative;
-                top: -4px;
+                top: -2px;
             }
             }
         }
         }
     }
     }

+ 5 - 2
src/views/ppt/components/MobileClassifyWrap.vue

@@ -245,13 +245,15 @@ function goMobileSearch(){
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
         position: relative;
         position: relative;
+        font-size: 30px;
         img{
         img{
-            width: 32px;
+            width: 36px;
             margin-right: 20px;
             margin-right: 20px;
         }
         }
         span{
         span{
             display: block;
             display: block;
             width: 80%;
             width: 80%;
+            font-size: 30px;
         }
         }
         .menu-icon{
         .menu-icon{
             width: 4px;
             width: 4px;
@@ -271,6 +273,7 @@ function goMobileSearch(){
         .text{
         .text{
             width: 90%;
             width: 90%;
             display: block;
             display: block;
+            font-size: 30px;
         }
         }
         .menu-icon{
         .menu-icon{
             width: 4px;
             width: 4px;
@@ -286,7 +289,7 @@ function goMobileSearch(){
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
         img{
         img{
-            width: 32px;
+            width: 36px;
             margin-right: 20px;
             margin-right: 20px;
         }
         }
     }
     }

+ 20 - 4
src/views/ppt/components/PadPPTIndexWrap.vue

@@ -3,7 +3,7 @@ import {ref} from 'vue'
 import {useClassify} from '../hooks/useClassify'
 import {useClassify} from '../hooks/useClassify'
 import openShareIcon from '@/assets/imgs/ppt/ppt_icon_user1.png'
 import openShareIcon from '@/assets/imgs/ppt/ppt_icon_user1.png'
 import closeShareIcon from '@/assets/imgs/ppt/ppt_icon_user2.png'
 import closeShareIcon from '@/assets/imgs/ppt/ppt_icon_user2.png'
-import {apiPPTList} from '@/api/ppt'
+import {apiPPTList,apiPPTPubList} from '@/api/ppt'
 import { useRouter } from 'vue-router'
 import { useRouter } from 'vue-router'
 
 
 const router=useRouter()
 const router=useRouter()
@@ -35,13 +35,24 @@ const activeType=ref('myPPT')
 let activeGroupId=ref('')
 let activeGroupId=ref('')
 let pptList=ref([])
 let pptList=ref([])
 async function getPPTList(){
 async function getPPTList(){
-    const res=await apiPPTList({GroupId:activeGroupId.value})
+    let res 
+    if(activeType.value=='myPPT'){
+        res=await apiPPTList({GroupId:activeGroupId.value})
+    }else{
+        res=await apiPPTPubList({AdminId:activeGroupId.value})
+    }
+     
     if(res.Ret===200){
     if(res.Ret===200){
         pptList.value=res.Data.List||[]
         pptList.value=res.Data.List||[]
     }
     }
 }
 }
 getPPTList()
 getPPTList()
 
 
+function handleClickCatalogue(item){
+    activeGroupId.value=item.GroupId
+    getPPTList()
+}
+
 // 跳转搜索
 // 跳转搜索
 function goMobileSearch(){
 function goMobileSearch(){
     router.push('/ppt/search')
     router.push('/ppt/search')
@@ -73,7 +84,7 @@ function goMobileSearch(){
                         :is-link="false"
                         :is-link="false"
                     >
                     >
                         <template #title>
                         <template #title>
-                            <div class="title-second" @click="activeGroupId=item.GroupId">
+                            <div class="title-second" @click="handleClickCatalogue(item)">
                                 <img src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
                                 <img src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
                                 <span class="van-ellipsis">{{item.GroupName}}</span>
                                 <span class="van-ellipsis">{{item.GroupName}}</span>
                                 <div @click.stop="handleShowFileOpt(item)">
                                 <div @click.stop="handleShowFileOpt(item)">
@@ -154,7 +165,7 @@ function goMobileSearch(){
                         :is-link="false"
                         :is-link="false"
                     >
                     >
                         <template #title>
                         <template #title>
-                            <div class="title-second">
+                            <div class="title-second" @click="handleClickCatalogue(item)">
                                 <img src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
                                 <img src="@/assets/imgs/ppt/ppt_icon_file.png" alt="">
                                 <span class="van-ellipsis">{{item.GroupName}}</span>
                                 <span class="van-ellipsis">{{item.GroupName}}</span>
                             </div>
                             </div>
@@ -392,7 +403,12 @@ function goMobileSearch(){
                     }
                     }
                 }
                 }
                 .empty-item{
                 .empty-item{
+                    display: block;
+                    box-sizing: border-box;
                     width: 260px;
                     width: 260px;
+                    padding: 10px 14px;
+                    margin-left: 10px;
+                    margin-right: 10px;
                 }
                 }
             }
             }
         }
         }