Add ads space

xkloveme · Aug 25, 2023 · 51adfa5 · 51adfa5
1 parent 930211f
commit 51adfa5
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 33 deletions.
diff --git a/public/images/WechatIMG89.png b/public/images/WechatIMG89.png
diff --git a/src/aliapi/server.tsx b/src/aliapi/server.tsx
@@ -86,7 +86,7 @@ export default class ServerHttp {
     )
   }
 
-  static configUrl = b64decode('aHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9yZXBvcy9nYW96aGFuZ21pbi9zdGF0aWNSZXNvdXJjZS9jb250ZW50cy9pbWFnZXMvc2hhcmVfY29uZmlnLmpzb24=')
+  static configUrl = b64decode('aHR0cHM6Ly9naXRlZS5jb20vemhhbm5hby9yZXNvdXJjZS9yYXcvbWFzdGVyL2ltYWdlcy9zaGFyZV9jb25maWcuanNvbg==')
   static updateUrl = b64decode('aHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9yZXBvcy9nYW96aGFuZ21pbi9hbGl5dW5wYW4vcmVsZWFzZXMvbGF0ZXN0')
 
   static async CheckConfigUpgrade(): Promise<void> {

diff --git a/src/pan/PanRight.vue b/src/pan/PanRight.vue
@@ -1,13 +1,14 @@
 <!-- eslint-disable no-irregular-whitespace -->
 <script setup lang='ts'>
 import { IAliGetFileModel } from '../aliapi/alimodels'
-import { KeyboardState, MouseState,
+import {
+  KeyboardState, MouseState,
   useAppStore,
   useFootStore,
   useKeyboardStore,
   useMouseStore,
   usePanFileStore,
-  useSettingStore
+  useSettingStore, useUserStore
 } from '../store'
 import useWinStore from '../store/winstore'
 import {
@@ -48,6 +49,11 @@ import { menuOpenFile } from '../utils/openfile'
 import { throttle } from '../utils/debounce'
 import { TestButton } from '../utils/mosehelper'
 import usePanTreeStore from './pantreestore'
+import { shell } from 'electron'
+import axios, { AxiosResponse } from 'axios'
+import ServerHttp from '../aliapi/server'
+import AliHttp from '../aliapi/alihttp'
+import UserDAL from '../user/userdal'
 
 const viewlist = ref()
 const inputsearch = ref()
@@ -58,6 +64,10 @@ const winStore = useWinStore()
 const panfileStore = usePanFileStore()
 
 let dirID = ''
+let adsImage = ''
+let adsUrl = ''
+let vip = ref(false)
+
 panfileStore.$subscribe((_m: any, state: PanFileState) => {
   if (state.DirID != dirID) {
     dirID = state.DirID
@@ -240,6 +250,26 @@ const onGridResize = throttle(() => {
 }, 100)
 
 onMounted(() => {
+  axios
+    .get(ServerHttp.configUrl, {
+      withCredentials: false,
+      responseType: 'json',
+      timeout: 3000
+    })
+    .then(async (response: AxiosResponse) => {
+      const config = response.data
+      if (config.adsUrl && config.addUrl != '') {
+        adsUrl = config.adsUrl
+        adsImage = config.adsImgUrl
+      }
+    }).catch((error: any) => {
+      console.log(error)
+    })
+  setTimeout(() => {
+    AliHttp.isVip(useUserStore().GetUserToken.phone).then((res: any) => {
+      vip.value = res
+    })
+  }, 5000)
   resizeObserver.observe(document.getElementById('panfilelist')!)
 })
 
@@ -461,10 +491,17 @@ const onPanDragEnd = (ev: any) => {
     showDragUpload.value = false
   }
 }
+const openExternalLink = (targetUrl: string) => {
+  shell.openExternal(targetUrl);
+}
 </script>
 
 <template>
-  <div style='height: 7px'></div>
+  <div >
+    <a v-if='!vip && adsUrl != ""' id='imageLink' @click="openExternalLink(adsUrl)">
+      <img :src=adsImage alt="" width='1125' height='100' style='margin-bottom: 10px'>
+    </a>
+  </div>
   <div class='toppanbtns' style='height: 26px'>
     <DirTopPath />
     <div style='flex-grow: 1'></div>
@@ -647,7 +684,7 @@ const onPanDragEnd = (ev: any) => {
     id='panfilelist'
     :class="'toppanlist' + (showDragUpload ? ' pandraging' : '') + (dragingRowItem ? ' draging' : '') + (rangIsSelecting ? ' ranging' : '')"
     tabindex='-1'
-    :style='{ height: winStore.GetListHeight }'
+    :style="{ height: adsUrl === '' || vip ? winStore.GetListHeight : winStore.GetListHeightWithAds }"
     @keydown.space.prevent='() => true'
     @drop='onPanDrop'
     @dragenter='onPanDragEnter'>
@@ -659,9 +696,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 50,
         threshold: 1,
@@ -778,9 +815,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 200,
         threshold: 1,
@@ -899,9 +936,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 260,
         threshold: 1,

diff --git a/src/resPan/ResPanRight.vue b/src/resPan/ResPanRight.vue
@@ -8,7 +8,7 @@ import {
   useKeyboardStore,
   useMouseStore,
   useResPanFileStore,
-  useSettingStore
+  useSettingStore, useUserStore
 } from '../store'
 import useWinStore from '../store/winstore'
 import {
@@ -50,6 +50,10 @@ import { throttle } from '../utils/debounce'
 import { TestButton } from '../utils/mosehelper'
 import useResPanTreeStore from './pantreestore'
 import { shell } from 'electron'
+import axios, { AxiosResponse } from 'axios'
+import ServerHttp from '../aliapi/server'
+import AliHttp from '../aliapi/alihttp'
+import UserDAL from '../user/userdal'
 
 const viewlist = ref()
 const inputsearch = ref()
@@ -59,7 +63,11 @@ const settingStore = useSettingStore()
 const winStore = useWinStore()
 const panfileStore = useResPanFileStore()
 
+let adsImage = ''
+let adsUrl = ''
 let dirID = ''
+let vip = ref(false)
+
 panfileStore.$subscribe((_m: any, state: PanFileState) => {
   if (state.DirID != dirID) {
     dirID = state.DirID
@@ -245,6 +253,27 @@ const onGridResize = throttle(() => {
 }, 100)
 
 onMounted(() => {
+  axios
+    .get(ServerHttp.configUrl, {
+      withCredentials: false,
+      responseType: 'json',
+      timeout: 10000
+    })
+    .then(async (response: AxiosResponse) => {
+      const config = response.data
+      if (config.adsUrl && config.addUrl != '') {
+        adsUrl = config.adsUrl
+        adsImage = config.adsImgUrl
+      }
+    }).catch((error: any) => {
+      console.log(error)
+    })
+  setTimeout(() => {
+    AliHttp.isVip(useUserStore().GetUserToken.phone).then((res: any) => {
+      vip.value = res
+    })
+  }, 5000)
+
   resizeObserver.observe(document.getElementById('panfilelist')!)
 })
 
@@ -466,17 +495,18 @@ const onPanDragEnd = (ev: any) => {
     showDragUpload.value = false
   }
 }
+const openExternalLink = (targetUrl: string) => {
+  shell.openExternal(targetUrl);
+}
 
 </script>
 
 <template>
-  <div style='height: 7px'></div>
-<!--    <div class='toppanbtns' style='height: 26px'>-->
-<!--        <a id='imageLink' href='https://kdocs.cn/l/cvpwcQWAA22Q'>-->
-<!--            <img src='/images/ads.jpg' width='1100' height='100'>-->
-<!--        </a>-->
-<!--    </div>-->
-<!--    <div style='height: 50px'></div>-->
+  <div >
+    <a v-if='!vip && adsUrl != ""' id='imageLink' @click="openExternalLink(adsUrl)">
+      <img :src=adsImage alt="" width='1125' height='100' style='margin-bottom: 10px'>
+    </a>
+  </div>
   <div class='toppanbtns' style='height: 26px'>
     <ResDirTopPath />
     <div style='flex-grow: 1'></div>
@@ -659,7 +689,7 @@ const onPanDragEnd = (ev: any) => {
     id='panfilelist'
     :class="'toppanlist' + (showDragUpload ? ' pandraging' : '') + (dragingRowItem ? ' draging' : '') + (rangIsSelecting ? ' ranging' : '')"
     tabindex='-1'
-    :style='{ height: winStore.GetListHeight }'
+    :style="{ height: adsUrl === '' || vip ? winStore.GetListHeight : winStore.GetListHeightWithAds }"
     @keydown.space.prevent='() => true'
     @drop='onPanDrop'
     @dragenter='onPanDragEnter'>
@@ -671,9 +701,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 50,
         threshold: 1,
@@ -790,9 +820,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 200,
         threshold: 1,
@@ -911,9 +941,9 @@ const onPanDragEnd = (ev: any) => {
       ref='viewlist'
       :bordered='false'
       :split='false'
-      :max-height='winStore.GetListHeightNumber'
+      :max-height='adsUrl === "" || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds'
       :virtual-list-props="{
-        height: winStore.GetListHeightNumber,
+        height: adsUrl == '' || vip ? winStore.GetListHeightNumber : winStore.GetListHeightNumberWithAds,
         fixedSize: true,
         estimatedSize: 260,
         threshold: 1,

diff --git a/src/resource/vipInfo.vue b/src/resource/vipInfo.vue
@@ -21,9 +21,6 @@ export default defineComponent({
   <div class="container1">
       <div class="content-text3">
         <div class="image-container2">
-<!--          <a id='imageLink' @click="openExternalLink('https://kdocs.cn/l/cvpwcQWAA22Q')">-->
-<!--            <img src="/images/ads.jpg" alt="公众号" width='1025' height='200' style='margin-bottom: 10px'>-->
-<!--          </a>-->
           <img src="/images/sales.png"  alt="公众号">
         </div>
       </div>

diff --git a/src/share/index.vue b/src/share/index.vue
@@ -14,15 +14,18 @@ import FollowingDAL from './following/FollowingDAL'
 import AliHttp from '../aliapi/alihttp'
 import UserDAL from '../user/userdal'
 import VipInformPage from '../resource/vipInfo.vue'
+import { ref } from 'vue'
 
 const appStore = useAppStore()
 const userStore = useUserStore()
-let vipIdentity = true
+let vipIdentity = ref(true)
 appStore.$subscribe(async (mutation) => {
   const appPage = appStore.GetAppTabMenu
   if (appPage == 'ShareSiteRight') {
     if (userStore.userLogined) {
-      vipIdentity = await AliHttp.isVip(UserDAL.GetUserToken(useUserStore().user_id).phone);
+      AliHttp.isVip(useUserStore().GetUserToken.phone).then((res: any) => {
+        vipIdentity.value = res
+      })
     }
   }
   if (appPage == 'MyShareRight') ShareDAL.aReloadMyShare(useUserStore().user_id, false)

diff --git a/src/store/appstore.ts b/src/store/appstore.ts
@@ -149,7 +149,7 @@ const useAppStore = defineStore('app', {
         if (tab == 'setting') DebugLog.aLoadFromDB()
         if (tab == 'movie') {
           if (useUserStore().userLogined) {
-            this.isVip = await AliHttp.isVip(UserDAL.GetUserToken(useUserStore().user_id).phone);
+            this.isVip = await AliHttp.isVip(useUserStore().GetUserToken.phone);
           }
         }
         onHideRightMenu()

diff --git a/src/store/winstore.ts b/src/store/winstore.ts
@@ -12,14 +12,19 @@ const useWinStore = defineStore('win', {
   }),
 
   getters: {
+    GetListHeightWithAds(state: WinState): string {
+      return (state.height - 302).toString() + 'px'
+    },
     GetListHeight(state: WinState): string {
       return (state.height - 192).toString() + 'px'
     },
     GetListHeightNumber(state: WinState): number {
       return state.height - 192
+    },
+    GetListHeightNumberWithAds(state: WinState): number {
+      return state.height - 302
     }
   },
-
   actions: {
     updateStore(partial: Partial<WinState>) {
       this.$patch(partial)