From 604fa91fe50911f70cf9fe7c00d26594a99db14e Mon Sep 17 00:00:00 2001
From: HoraceHyy <horacehuang17@gmail.com>
Date: Sat, 6 Jan 2024 01:55:37 +0800
Subject: [PATCH] fix: type related errors

---
 electron/main/index.ts                        | 357 +++++++++---------
 src/components/CustomUIDInput.vue             |   6 +-
 src/components/TemplateDialog.vue             |  15 +-
 .../Components/GenshinInfoCard.vue            | 106 +++---
 src/pages/GenshinPage/GenshinPage.vue         |   4 +-
 src/pages/Honkai3Page.vue                     |  26 +-
 .../Components/StarRailInfoCard.vue           |  32 +-
 src/pages/StarRailPage/StarRailPage.vue       |  19 +-
 src/pages/tmpPage.vue                         |   2 +-
 src/types/starrail/srPlayerInfo.ts            |   9 +-
 10 files changed, 295 insertions(+), 281 deletions(-)

diff --git a/electron/main/index.ts b/electron/main/index.ts
index ee6ab31e..0d9c9658 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -1,16 +1,17 @@
-import { app, BrowserWindow, shell, ipcMain, nativeTheme, Tray, Menu } from 'electron'
+import {app, BrowserWindow, ipcMain, Menu, nativeTheme, shell, Tray} from 'electron'
 import axios from 'axios'
-import { release } from 'node:os'
+import {release} from 'node:os'
+
 const fs = require('fs').promises
 var path = require('path')
 
 const Store = require('electron-store');
 const store = new Store();
 const child = require('child_process')
-const { dialog } = require('electron');
-const { Wrapper } = require('enkanetwork.js')
-const { genshin } = new Wrapper({
-  language: 'zh-CN'
+const {dialog} = require('electron');
+const {Wrapper} = require('enkanetwork.js')
+const {genshin} = new Wrapper({
+    language: 'zh-CN'
 })
 
 // The built directory structure
@@ -26,8 +27,8 @@ const { genshin } = new Wrapper({
 process.env.DIST_ELECTRON = path.join(__dirname, '..')
 process.env.DIST = path.join(process.env.DIST_ELECTRON, '../dist')
 process.env.PUBLIC = process.env.VITE_DEV_SERVER_URL
-  ? path.join(process.env.DIST_ELECTRON, '../public')
-  : process.env.DIST
+    ? path.join(process.env.DIST_ELECTRON, '../public')
+    : process.env.DIST
 
 // Disable GPU Acceleration for Windows 7
 if (release().startsWith('6.1')) app.disableHardwareAcceleration()
@@ -36,8 +37,8 @@ if (release().startsWith('6.1')) app.disableHardwareAcceleration()
 if (process.platform === 'win32') app.setAppUserModelId(app.getName())
 
 if (!app.requestSingleInstanceLock()) {
-  app.quit()
-  process.exit(0)
+    app.quit()
+    process.exit(0)
 }
 
 // Remove electron security warnings
@@ -61,189 +62,193 @@ var iconPath = path.join(process.env.PUBLIC, 'favicon.ico')
 var assetsPath = process.env.VITE_DEV_SERVER_URL ? '../../src/assets' : path.join(__dirname, '../../../src/assets')
 
 async function createWindow() {
-  win = new BrowserWindow({
-    title: 'Main window',
-    icon: iconPath,
-    width: 1200,
-    height: 700,
-    resizable: false,
-    maximizable: false,
-    // transparent: true,
-    frame: false,
-    webPreferences: {
-      preload,
-      // Warning: Enable nodeIntegration and disable contextIsolation is not secure in production
-      // Consider using contextBridge.exposeInMainWorld
-      // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
-      nodeIntegration: false,
-      contextIsolation: true,
-    },
-  })
-
-  // ---------- Window actions ----------
-  ipcMain.on('win:close', () => {
-    win.close()
-  })
-  ipcMain.on('win:min', () => {
-    win.minimize()
-  })
-  ipcMain.on("win:tray", () => {
-    win.hide()
-    win.setSkipTaskbar(true)
-  })
-
-  // ---------- custom IPCs ----------
-
-  ipcMain.handle('store:get', (_event, key) => {
-    return store.get(key)
-  })
-  ipcMain.on('store:set', (_event, key, value, json) => {
-    store.set(key, json ? JSON.parse(value) : value)
-  })
-  ipcMain.on('store:delete', (_event, key) => {
-    store.delete(key)
-  })
-  ipcMain.on('store:clear', () => {
-    store.clear()
-  })
-
-  ipcMain.on('child:exec', (_event, path) => {
-    child.execFile(path, function (err, data) {
-      if (err) {
-        console.error(err)
-        return
-      }
-      console.log(data.toString())
-    })
-  })
-
-  ipcMain.handle('dialog:show', async (_event, options) => {
-    const result = await dialog.showOpenDialog(win, options);
-    if (!result.canceled) {
-      return result.filePaths;
-    } else {
-      return [];
-    }
-  });
+    win = new BrowserWindow({
+        title: 'Main window',
+        icon: iconPath,
+        width: 1200,
+        height: 700,
+        resizable: false,
+        maximizable: false,
+        // transparent: true,
+        frame: false,
+        webPreferences: {
+            preload,
+            // Warning: Enable nodeIntegration and disable contextIsolation is not secure in production
+            // Consider using contextBridge.exposeInMainWorld
+            // Read more on https://www.electronjs.org/docs/latest/tutorial/context-isolation
+            nodeIntegration: false,
+            contextIsolation: true,
+        },
+    })
+
+    // ---------- Window actions ----------
+    ipcMain.on('win:close', () => {
+        win.close()
+    })
+    ipcMain.on('win:min', () => {
+        win.minimize()
+    })
+    ipcMain.on("win:tray", () => {
+        win.hide()
+        win.setSkipTaskbar(true)
+    })
 
-  ipcMain.handle('dialog:showAndCopy', async (_event, options) => {
-    try {
-      const result = await dialog.showOpenDialog(win, options)
-      if (!result.canceled && result.filePaths.length > 0) {
+    // ---------- custom IPCs ----------
+
+    ipcMain.handle('store:get', (_event, key) => {
+        return store.get(key)
+    })
+    ipcMain.on('store:set', (_event, key, value, json) => {
+        store.set(key, json ? JSON.parse(value) : value)
+    })
+    ipcMain.on('store:delete', (_event, key) => {
+        store.delete(key)
+    })
+    ipcMain.on('store:clear', () => {
+        store.clear()
+    })
+
+    ipcMain.on('child:exec', (_event, path) => {
+        child.execFile(path, function (err, data) {
+            if (err) {
+                console.error(err)
+                return
+            }
+            console.log(data.toString())
+        })
+    })
+
+    ipcMain.handle('dialog:show', async (_event, options) => {
+        const result = await dialog.showOpenDialog(win, options);
+        if (!result.canceled) {
+            return result.filePaths;
+        } else {
+            return [];
+        }
+    });
+
+    ipcMain.handle('dialog:showAndCopy', async (_event, options) => {
         try {
-          await fs.access(imageFolder)
-        } catch {
-          await fs.mkdir(imageFolder)
+            const result = await dialog.showOpenDialog(win, options)
+            if (!result.canceled && result.filePaths.length > 0) {
+                try {
+                    await fs.access(imageFolder)
+                } catch {
+                    await fs.mkdir(imageFolder)
+                }
+
+                const sourcePath = result.filePaths[0];
+
+                const dataURL = await fs.readFile(sourcePath, 'base64')
+                    .then(data => `data:image/png;base64,${data}`)
+
+                return dataURL
+            } else {
+                return ''
+            }
+        } catch (err) {
+            console.error('Error copying image:', err);
+            throw err;
         }
+    });
 
-        const sourcePath = result.filePaths[0];
+    ipcMain.handle("enka:getGenshinPlayer", async (_event, uid, lang) => {
+        console.log("genshin enka ipcMain" + uid)
+        genshin.language = lang
+        const result = await genshin.getPlayer(uid)
+        return result
+    })
 
-        const dataURL = await fs.readFile(sourcePath, 'base64')
-          .then(data => `data:image/png;base64,${data}`)
+    ipcMain.handle("path:joinDirnameAsset", (_event, arg) => {
+        return path.join(assetsPath, arg)
+    })
+
+    ipcMain.handle("axios:post", async (_event, url) => {
+        const result = await axios.post(url)
+        return result.data
+    })
+    ipcMain.handle("axios:get", async (_event, url) => {
+        const result = await axios.get(url)
+        return result.data
+    })
+
+    ipcMain.on("elec:openExtLink", (_event, url) => {
+        shell.openExternal(url)
+    })
+
+    const {Octokit} = require("@octokit/core")
+    const octokit = new Octokit({
+        auth: "<YOUR TOKEN HERE>"
+    })
+    ipcMain.handle("github:getLatestRelease", async (_event) => {
+        const result = await octokit.request("GET /repos/horacehuang-ui/mihoyo-mixed-launcher/releases/latest", {
+            owner: "HoraceHuang-ui",
+            repo: "MiHOYO-MiXED-Launcher"
+        })
+        return result
+    })
 
-        return dataURL
-      } else {
-        return ''
-      }
-    } catch (err) {
-      console.error('Error copying image:', err);
-      throw err;
+    // --------- Window configs ------------
+    // win.setWindowButtonVisibility(true)
+    nativeTheme.themeSource = "light"
+    if (process.env.VITE_DEV_SERVER_URL) { // electron-vite-vue#298
+        win.loadURL(url)
+        //win.loadFile('./dist/index.html')
+        // Open devTool if the app is not packaged
+        win.webContents.openDevTools()
+    } else {
+        win.loadFile(indexHtml)
     }
-  });
-
-  ipcMain.handle("enka:getGenshinPlayer", async (_event, uid, lang) => {
-    console.log("genshin enka ipcMain" + uid)
-    genshin.language = lang
-    const result = await genshin.getPlayer(uid)
-    return result
-  })
-
-  ipcMain.handle("path:joinDirnameAsset", (_event, arg) => {
-    return path.join(assetsPath, arg)
-  })
-
-  ipcMain.handle("axios:post", async (_event, url) => {
-    const result = await axios.post(url)
-    return result.data
-  })
-  ipcMain.handle("axios:get", async (_event, url) => {
-    const result = await axios.get(url)
-    return result.data
-  })
-
-  ipcMain.on("elec:openExtLink", (_event, url) => {
-    shell.openExternal(url)
-  })
-
-  const { Octokit } = require("@octokit/core")
-  const octokit = new Octokit({
-    auth: "<YOUR TOKEN HERE>"
-  })
-  ipcMain.handle("github:getLatestRelease", async (_event) => {
-    const result = await octokit.request("GET /repos/horacehuang-ui/mihoyo-mixed-launcher/releases/latest", {
-      owner: "HoraceHuang-ui",
-      repo: "MiHOYO-MiXED-Launcher"
-    })
-    return result
-  })
-
-  // --------- Window configs ------------
-  // win.setWindowButtonVisibility(true)
-  nativeTheme.themeSource = "light"
-  if (process.env.VITE_DEV_SERVER_URL) { // electron-vite-vue#298
-    win.loadURL(url)
-    //win.loadFile('./dist/index.html')
-    // Open devTool if the app is not packaged
-    win.webContents.openDevTools()
-  } else {
-    win.loadFile(indexHtml)
-  }
-
-  const contextMenu = Menu.buildFromTemplate([
-    { label: '退出', click: () => { win.destroy() } },
-  ])
-  tray = new Tray(path.join(process.env.PUBLIC, 'favicon.ico'))
-  tray.setToolTip('miXeD')
-  tray.setContextMenu(contextMenu)
-  tray.on('click', () => {
-    win.isVisible() ? win.hide() : win.show()
-    win.isVisible() ? win.setSkipTaskbar(false) : win.setSkipTaskbar(true)
-  })
-
-  // Test actively push message to the Electron-Renderer
-  // win.webContents.on('did-finish-load', () => {
-  //   win?.webContents.send('main-process-message', new Date().toLocaleString())
-  // })
-
-  // Make all links open with the browser, not with the application
-  win.webContents.setWindowOpenHandler(({ url }) => {
-    if (url.startsWith('https:')) shell.openExternal(url)
-    return { action: 'deny' }
-  })
-  // win.webContents.on('will-navigate', (event, url) => { }) #344
+
+    const contextMenu = Menu.buildFromTemplate([
+        {
+            label: '退出', click: () => {
+                win.destroy()
+            }
+        },
+    ])
+    tray = new Tray(path.join(process.env.PUBLIC, 'favicon.ico'))
+    tray.setToolTip('miXeD')
+    tray.setContextMenu(contextMenu)
+    tray.on('click', () => {
+        win.isVisible() ? win.hide() : win.show()
+        win.isVisible() ? win.setSkipTaskbar(false) : win.setSkipTaskbar(true)
+    })
+
+    // Test actively push message to the Electron-Renderer
+    // win.webContents.on('did-finish-load', () => {
+    //   win?.webContents.send('main-process-message', new Date().toLocaleString())
+    // })
+
+    // Make all links open with the browser, not with the application
+    win.webContents.setWindowOpenHandler(({url}) => {
+        if (url.startsWith('https:')) shell.openExternal(url)
+        return {action: 'deny'}
+    })
+    // win.webContents.on('will-navigate', (event, url) => { }) #344
 }
 
 app.whenReady().then(createWindow)
 
 app.on('window-all-closed', () => {
-  win = null
-  if (process.platform !== 'darwin') app.quit()
+    win = null
+    if (process.platform !== 'darwin') app.quit()
 })
 
 app.on('second-instance', () => {
-  if (win) {
-    // Focus on the main window if the user tried to open another
-    if (win.isMinimized()) win.restore()
-    win.focus()
-  }
+    if (win) {
+        // Focus on the main window if the user tried to open another
+        if (win.isMinimized()) win.restore()
+        win.focus()
+    }
 })
 
 app.on('activate', () => {
-  const allWindows = BrowserWindow.getAllWindows()
-  if (allWindows.length) {
-    allWindows[0].focus()
-  } else {
-    createWindow()
-  }
+    const allWindows = BrowserWindow.getAllWindows()
+    if (allWindows.length) {
+        allWindows[0].focus()
+    } else {
+        createWindow()
+    }
 })
 
diff --git a/src/components/CustomUIDInput.vue b/src/components/CustomUIDInput.vue
index 1c54a323..3dbf0584 100644
--- a/src/components/CustomUIDInput.vue
+++ b/src/components/CustomUIDInput.vue
@@ -1,12 +1,16 @@
 <script setup lang="ts">
 defineProps(['modelValue'])
 defineEmits(['submit', 'update:modelValue'])
+
+const handleInputChange = (event: Event) => {
+    (event.target as HTMLInputElement).value
+}
 </script>
 
 <template>
     <div class="flex flex-row rounded-full border border-gray-400 h-10">
         <input class="px-2 rounded-full" :placeholder="$t('uidInput_placeholder')" style="width: 16vw; margin: 1px;"
-               :value="modelValue" @input="$emit('update:modelValue', $event.target.value)"
+               :value="modelValue" @input="$emit('update:modelValue', handleInputChange($event))"
                @keyup.native.enter="$emit('submit')"/>
         <button
             class="rounded-full bg-gray-100 px-3 hover:bg-gray-300 active:bg-gray-500 active:scale-90 transition-all"
diff --git a/src/components/TemplateDialog.vue b/src/components/TemplateDialog.vue
index 03385429..91c1200a 100644
--- a/src/components/TemplateDialog.vue
+++ b/src/components/TemplateDialog.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {inject, ref} from 'vue'
 
-defineProps({
+const props = defineProps({
     width: {
         type: String,
         default: '50%'
@@ -25,19 +25,20 @@ const cShow = ref(show)
 const closeDialog = (timeout: number) => {
     cShow.value = false
     setTimeout(unmount, timeout)
-    props.onClose()
 }
 
 const cancelClick = () => {
-    emit('onCancel')
     closeDialog(500)
-    props.onCancel()
+    if (props.onCancel) {
+        props.onCancel()
+    }
 }
 
 const okClick = () => {
-    emit('onOk')
     closeDialog(500)
-    props.onOk()
+    if (props.onOk) {
+        props.onOk()
+    }
 }
 
 defineExpose({
@@ -50,7 +51,7 @@ defineExpose({
         <div v-if="cShow">
             <div
                 class="outer absolute top-0 bottom-0 left-0 right-0 z-50 backdrop-blur-2xl"
-                @click="closeDialog(500)"
+                @click="cancelClick"
             />
             <div class="bg-black bg-opacity-20 outer absolute top-0 bottom-0 left-0 right-0 z-40"/>
             <div
diff --git a/src/pages/GenshinPage/Components/GenshinInfoCard.vue b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
index a7512543..ab463ff8 100644
--- a/src/pages/GenshinPage/Components/GenshinInfoCard.vue
+++ b/src/pages/GenshinPage/Components/GenshinInfoCard.vue
@@ -4,10 +4,10 @@ import {useRouter} from 'vue-router'
 import {ArrowLeftBold, ArrowRightBold} from '@element-plus/icons-vue'
 import {translate} from '../../../i18n'
 import StatIcon from '../../../components/StatIcon.vue'
-import {PlayerData, Stats} from "enkanetwork.js"
+import {Artifact, Stats} from "enkanetwork.js"
 import {parseInt} from "lodash-es"
 
-const playerInfo = ref<PlayerData>({})
+const playerInfo = ref<any>()
 
 const uidInput = ref('')
 let uid = '';
@@ -25,7 +25,7 @@ const constelsAdditions = computed(() => {
         return {}
     }
     let res: Record<number, number> = {}
-    playerInfo.value.characters.forEach((character) => {
+    playerInfo.value.characters.forEach((character: any) => {
         if (character.skillsExtraLevel) {
             Object.keys(character.skillsExtraLevel).forEach((level) => {
                 // check
@@ -77,7 +77,7 @@ const ascLevelMap = [20, 40, 50, 60, 70, 80, 90]
 const charDialogShow = ref(false)
 const charDialogId = ref(0)
 
-const mergeToPlayerinfo = (newArr) => {
+const mergeToPlayerinfo = (newArr: any[]) => {
     console.log("Updated characters length: ")
     for (let i = newArr.length - 1; i >= 0; i--) {
         let newChar = newArr[i]
@@ -140,7 +140,7 @@ const requestInfo = () => {
             } else {
                 playerInfo.value = resp
             }
-            playerInfo.value.characters.sort(function (a, b) {
+            playerInfo.value.characters.sort(function (a: any, b: any) {
                 // 等级
                 if (a.properties.level.val < b.properties.level.val) {
                     return 1
@@ -171,7 +171,7 @@ const requestInfo = () => {
             fetch('https://gitlab.com/api/v4/projects/41287973/repository/files/ExcelBinOutput%2FAvatarSkillExcelConfigData.json/raw?ref=master')
                 .then(response => response.json())
                 .then(resp => {
-                    resp = resp.filter(a => 'proudSkillGroupId' in a)
+                    resp = resp.filter((a: any) => 'proudSkillGroupId' in a)
                     window.store.set('genshinConstels', JSON.stringify(resp), true)
 
                     router.push({
@@ -193,38 +193,38 @@ const requestInfo = () => {
 
 const getCharElementAssets = (id: number) => {
     const charStats = playerInfo.value.characters[id].stats
-    if (charStats.pyroEnergyCost.value && charStats.pyroEnergyCost.value > 0) {
+    if (charStats.pyroEnergyCost.value && charStats.pyroEnergyCost.value as number > 0) {
         return elementAssets.pyro
-    } else if (charStats.cryoEnergyCost.value && charStats.cryoEnergyCost.value > 0) {
+    } else if (charStats.cryoEnergyCost.value && charStats.cryoEnergyCost.value as number > 0) {
         return elementAssets.cryo
-    } else if (charStats.hydroEnergyCost.value && charStats.hydroEnergyCost.value > 0) {
+    } else if (charStats.hydroEnergyCost.value && charStats.hydroEnergyCost.value as number > 0) {
         return elementAssets.hydro
-    } else if (charStats.electroEnergyCost.value && charStats.electroEnergyCost.value > 0) {
+    } else if (charStats.electroEnergyCost.value && charStats.electroEnergyCost.value as number > 0) {
         return elementAssets.electro
-    } else if (charStats.geoEnergyCost.value && charStats.geoEnergyCost.value > 0) {
+    } else if (charStats.geoEnergyCost.value && charStats.geoEnergyCost.value as number > 0) {
         return elementAssets.geo
-    } else if (charStats.anemoEnergyCost.value && charStats.anemoEnergyCost.value > 0) {
+    } else if (charStats.anemoEnergyCost.value && charStats.anemoEnergyCost.value as number > 0) {
         return elementAssets.anemo
-    } else if (charStats.dendroEnergyCost.value && charStats.dendroEnergyCost.value > 0) {
+    } else if (charStats.dendroEnergyCost.value && charStats.dendroEnergyCost.value as number > 0) {
         return elementAssets.dendro
     }
 }
 
 const getCharElementEnergy = (id: number) => {
     const charStats = playerInfo.value.characters[id].stats
-    if (charStats.pyroEnergyCost.value && charStats.pyroEnergyCost.value > 0) {
+    if (charStats.pyroEnergyCost.value && charStats.pyroEnergyCost.value as number > 0) {
         return charStats.pyroEnergyCost.value
-    } else if (charStats.cryoEnergyCost.value && charStats.cryoEnergyCost.value > 0) {
+    } else if (charStats.cryoEnergyCost.value && charStats.cryoEnergyCost.value as number > 0) {
         return charStats.cryoEnergyCost.value
-    } else if (charStats.hydroEnergyCost.value && charStats.hydroEnergyCost.value > 0) {
+    } else if (charStats.hydroEnergyCost.value && charStats.hydroEnergyCost.value as number > 0) {
         return charStats.hydroEnergyCost.value
-    } else if (charStats.electroEnergyCost.value && charStats.electroEnergyCost.value > 0) {
+    } else if (charStats.electroEnergyCost.value && charStats.electroEnergyCost.value as number > 0) {
         return charStats.electroEnergyCost.value
-    } else if (charStats.geoEnergyCost.value && charStats.geoEnergyCost.value > 0) {
+    } else if (charStats.geoEnergyCost.value && charStats.geoEnergyCost.value as number > 0) {
         return charStats.geoEnergyCost.value
-    } else if (charStats.anemoEnergyCost.value && charStats.anemoEnergyCost.value > 0) {
+    } else if (charStats.anemoEnergyCost.value && charStats.anemoEnergyCost.value as number > 0) {
         return charStats.anemoEnergyCost.value
-    } else if (charStats.dendroEnergyCost.value && charStats.dendroEnergyCost.value > 0) {
+    } else if (charStats.dendroEnergyCost.value && charStats.dendroEnergyCost.value as number > 0) {
         return charStats.dendroEnergyCost.value
     }
 }
@@ -236,14 +236,14 @@ const showPercentage = (prop: string) => {
 const calcCritScoreTotal = (index: number) => {
     let score = 0.0
     const artifacts = playerInfo.value.characters[index].equipment.artifacts
-    artifacts.forEach(artifact => {
+    artifacts.forEach((artifact: any) => {
         if (artifact.mainstat.stat == "FIGHT_PROP_CRITICAL_HURT") {
             score += artifact.mainstat.statValue
         } else if (artifact.mainstat.stat == "FIGHT_PROP_CRITICAL") {
             score += artifact.mainstat.statValue * 2
         }
         const substats = artifact.substats
-        substats.forEach(substat => {
+        substats.forEach((substat: any) => {
             if (substat.stat == "FIGHT_PROP_CRITICAL_HURT") {
                 score += substat.statValue
             } else if (substat.stat == "FIGHT_PROP_CRITICAL") {
@@ -258,10 +258,10 @@ const getArtifactSetInfo = (index: number) => {
     const tokens: string[] = []
     const artifacts = playerInfo.value.characters[index].equipment.artifacts
     const sets = new Map<string, number>()
-    artifacts.forEach(artifact => {
+    artifacts.forEach((artifact: Artifact) => {
         const setName = artifact.setName
         if (sets.get(setName)) {
-            sets.set(setName, sets.get(setName) + 1)
+            sets.set(setName, sets.get(setName)!! + 1)
         } else {
             sets.set(setName, 1)
         }
@@ -331,7 +331,7 @@ const trimStats = (stats: Stats) => {
             }
         }
         if (flag) {
-            delete res[stat]
+            delete (res as any)[stat]
         }
     }
 
@@ -361,12 +361,12 @@ const findSkillIdByProud = (proudId: number): number => {
                         <StatIcon game="gs" stat="FIGHT_PROP_HP" fill="#666" class="w-4 h-4" style="margin-top: 2px;"/>
                     </template>
                     <div class="font-gs">
-                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseHp.value) }}</span>
+                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseHp.value as string) }}</span>
                         <span
                             v-if="playerInfo.characters[charDialogId].stats.maxHp.value != playerInfo.characters[charDialogId].stats.baseHp.value"
                             class="ml-1 text-blue-500">+{{
-                                parseInt(playerInfo.characters[charDialogId].stats.maxHp.value)
-                                - parseInt(playerInfo.characters[charDialogId].stats.baseHp.value)
+                                parseInt(playerInfo.characters[charDialogId].stats.maxHp.value as string)
+                                - parseInt(playerInfo.characters[charDialogId].stats.baseHp.value as string)
                             }}</span>
                     </div>
                 </DialogListItem>
@@ -376,12 +376,12 @@ const findSkillIdByProud = (proudId: number): number => {
                                   style="margin-top: 2px;"/>
                     </template>
                     <div class="font-gs">
-                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value) }}</span>
+                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value as string) }}</span>
                         <span
-                            v-if="parseInt(playerInfo.characters[charDialogId].stats.atk.value) != parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value)"
+                            v-if="parseInt(playerInfo.characters[charDialogId].stats.atk.value as string) != parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value as string)"
                             class="ml-1 text-blue-500">+{{
-                                parseInt(playerInfo.characters[charDialogId].stats.atk.value) -
-                                parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value)
+                                parseInt(playerInfo.characters[charDialogId].stats.atk.value as string) -
+                                parseInt(playerInfo.characters[charDialogId].stats.baseAtk.value as string)
                             }}</span>
                     </div>
                 </DialogListItem>
@@ -391,17 +391,17 @@ const findSkillIdByProud = (proudId: number): number => {
                                   style="margin-top: 2px;"/>
                     </template>
                     <div class="font-gs">
-                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseDef.value) }}</span>
+                        <span>{{ parseInt(playerInfo.characters[charDialogId].stats.baseDef.value as string) }}</span>
                         <span
-                            v-if="parseInt(playerInfo.characters[charDialogId].stats.def.value) != parseInt(playerInfo.characters[charDialogId].stats.baseDef.value)"
+                            v-if="parseInt(playerInfo.characters[charDialogId].stats.def.value as string) != parseInt(playerInfo.characters[charDialogId].stats.baseDef.value as string)"
                             class="ml-1 text-blue-500">+{{
-                                parseInt(playerInfo.characters[charDialogId].stats.def.value) -
-                                parseInt(playerInfo.characters[charDialogId].stats.baseDef.value)
+                                parseInt(playerInfo.characters[charDialogId].stats.def.value as string) -
+                                parseInt(playerInfo.characters[charDialogId].stats.baseDef.value as string)
                             }}</span>
                     </div>
                 </DialogListItem>
                 <DialogListItem class="font-gs" :name="$t('gs_FIGHT_PROP_ELEMENT_MASTERY')"
-                                :val="playerInfo.characters[charDialogId].stats.elementalMastery.value ? parseInt(playerInfo.characters[charDialogId].stats.elementalMastery.value).toString() : '0'">
+                                :val="playerInfo.characters[charDialogId].stats.elementalMastery.value ? parseInt(playerInfo.characters[charDialogId].stats.elementalMastery.value as string).toString() : '0'">
                     <template #icon>
                         <StatIcon game="gs" stat="FIGHT_PROP_ELEMENT_MASTERY" fill="#666" class="w-4 h-4"
                                   style="margin-top: 2px;"/>
@@ -409,7 +409,7 @@ const findSkillIdByProud = (proudId: number): number => {
                 </DialogListItem>
                 <DialogListItem v-for="(stat, key) in trimStats(playerInfo.characters[charDialogId].stats)"
                                 class="font-gs" :name="$t(`gs_${key}`)"
-                                :val="(stat.value * 100).toFixed(1).toString() + '%'">
+                                :val="(stat.value as number * 100).toFixed(1).toString() + '%'">
                     <template #icon>
                         <StatIcon game="gs" :stat="key" fill="#666" class="w-4 h-4" style="margin-top: 2px;"/>
                     </template>
@@ -508,9 +508,9 @@ const findSkillIdByProud = (proudId: number): number => {
                       'opacity-0 -translate-x-40 pointer-events-none': showcaseIdx > index }"
                      style="transition-duration: 300ms;">
                     <!-- absolute： 卡片元素背景、元素图标 -->
-                    <img class="relative z-0" :src="getCharElementAssets(index).bg"
+                    <img class="relative z-0" :src="getCharElementAssets(index)!!.bg"
                          style="border-radius: 4.5vh; height: 40vw;"/>
-                    <img class="h-1/4 absolute opacity-50" :src="getCharElementAssets(index).ico"
+                    <img class="h-1/4 absolute opacity-50" :src="getCharElementAssets(index)!!.ico"
                          style="top: -7px; right: -18px;"/>
                     <!-- 卡片前景 -->
                     <div class="flex flex-row h-full absolute top-0 left-0 right-0 bottom-0 z-10">
@@ -602,21 +602,21 @@ const findSkillIdByProud = (proudId: number): number => {
                                     <StatIcon game="gs" stat="FIGHT_PROP_HP" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            parseInt(character.stats.maxHp.value)
+                                            parseInt(character.stats.maxHp.value as string)
                                         }}</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 2; grid-row: 1;">
                                     <StatIcon game="gs" stat="FIGHT_PROP_ATTACK" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            parseInt(character.stats.atk.value)
+                                            parseInt(character.stats.atk.value as string)
                                         }}</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 3; grid-row: 1;">
                                     <StatIcon game="gs" stat="FIGHT_PROP_DEFENSE" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            parseInt(character.stats.def.value)
+                                            parseInt(character.stats.def.value as string)
                                         }}</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 1; grid-row: 2;">
@@ -624,15 +624,15 @@ const findSkillIdByProud = (proudId: number): number => {
                                               class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            (character.stats.energyRecharge.value * 100).toFixed(1)
+                                            (character.stats.energyRecharge.value as number * 100).toFixed(1)
                                         }}%</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 2; grid-row: 2;">
                                     <StatIcon game="gs" stat="FIGHT_PROP_ELEMENT_MASTERY" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            parseInt(!character.stats.elementalMastery.value ? 0 :
-                                                character.stats.elementalMastery.value)
+                                            parseInt(!character.stats.elementalMastery.value ? '0' :
+                                                character.stats.elementalMastery.value as string)
                                         }}</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 3; grid-row: 2;">
@@ -647,14 +647,14 @@ const findSkillIdByProud = (proudId: number): number => {
                                     <StatIcon game="gs" stat="FIGHT_PROP_CRITICAL" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            (character.stats.critRate.value * 100).toFixed(1)
+                                            (character.stats.critRate.value as number * 100).toFixed(1)
                                         }}%</span>
                                 </div>
                                 <div class="w-full flex flex-row" style="grid-column: 2; grid-row: 3;">
                                     <StatIcon game="gs" stat="FIGHT_PROP_CRITICAL_HURT" fill="#d1d5db" class="w-5 h-5"
                                               style="margin-top: 1px;"/>
                                     <span class="text-gray-200 text-right font-gs ml-3">{{
-                                            (character.stats.critDamage.value * 100).toFixed(1)
+                                            (character.stats.critDamage.value as number * 100).toFixed(1)
                                         }}%</span>
                                 </div>
                                 <div
@@ -679,14 +679,14 @@ const findSkillIdByProud = (proudId: number): number => {
                                             <span class="font-gs">{{ character.equipment.weapon.level }} / </span>
                                             <span class="text-gray-300 font-serif">{{
                                                     ascLevelMap[character.equipment.weapon.ascensionLevel ?
-                                                        character.equipment.weapon.ascensionLevel : 0]
+                                                        character.equipment.weapon.ascensionLevel as number : 0]
                                                 }}</span>
                                         </div>
                                         <div class="text-gray-400 mr-2 text-sm absolute right-0 top-0">{{
                                                 $t('gs_refinement')
                                             }}
                                             <span class="text-gray-200 font-gs text-base">{{
-                                                    character.equipment.weapon.refinement.level + 1
+                                                    character.equipment.weapon.refinement.level as number + 1
                                                 }}</span>
                                         </div>
                                     </div>
@@ -816,15 +816,15 @@ const findSkillIdByProud = (proudId: number): number => {
 }
 
 .gacha-mask {
-    -webkit-mask: linear-gradient(transparent, white 15%, white 85%, transparent)
+    -webkit-mask: -webkit-linear-gradient(transparent, white 15%, white 85%, transparent)
 }
 
 .left-gacha {
-    -webkit-mask: linear-gradient(270deg, transparent, white 20%)
+    -webkit-mask: -webkit-linear-gradient(270deg, transparent, white 20%)
 }
 
 .artifact-mask {
-    -webkit-mask: linear-gradient(270deg, transparent, white 60%)
+    -webkit-mask: -webkit-linear-gradient(270deg, transparent, white 60%)
 }
 
 .disabled {
diff --git a/src/pages/GenshinPage/GenshinPage.vue b/src/pages/GenshinPage/GenshinPage.vue
index 9df7180f..1f15399a 100644
--- a/src/pages/GenshinPage/GenshinPage.vue
+++ b/src/pages/GenshinPage/GenshinPage.vue
@@ -65,7 +65,7 @@ onMounted(async () => {
                 if (timeDelta.value > 40) {
                     ElMessageBox.confirm(translate('general_gameUpdBoxText1', {
                             game: gameName,
-                            beDays: translate('general_beDays', undefined, 42 - timeDelta.value)
+                            beDays: translate('general_beDays', 42 - timeDelta.value)
                         }),
                         translate('general_gameUpdBoxTitle'),
                         {
@@ -80,7 +80,7 @@ onMounted(async () => {
                 } else if (timeDelta.value > 0 && timeDelta.value < 3) {
                     ElMessageBox.confirm(translate('general_gameUpdBoxText2', {
                             game: gameName,
-                            days: translate('general_days', undefined, timeDelta.value)
+                            days: translate('general_days', timeDelta.value)
                         }),
                         translate('general_gameUpdBoxTitle'),
                         {
diff --git a/src/pages/Honkai3Page.vue b/src/pages/Honkai3Page.vue
index 4f1e5ccd..b598ba9e 100644
--- a/src/pages/Honkai3Page.vue
+++ b/src/pages/Honkai3Page.vue
@@ -2,6 +2,7 @@
 import {computed, onMounted, ref} from 'vue'
 import {useRouter} from 'vue-router'
 import {translate} from '../i18n'
+import {LauncherInfo, PostInfo} from "../types/launcher/launcherInfo";
 
 const gameName = translate('general_hi3')
 
@@ -14,7 +15,7 @@ const timeNow = Date.now()
 const timeDelta = computed(() =>
     Math.ceil((timeNow - timeUpd6_8) / 1000 / 3600 / 24 - 0.5) % 42
 )
-const launcherInfo = ref({})
+const launcherInfo = ref<LauncherInfo>({banner: [], icon: [], post: [], qq: []})
 const launcherInfoReady = ref(false)
 const launcherInfoFailed = ref(false)
 const errMsg = ref('')
@@ -30,7 +31,7 @@ onMounted(async () => {
     window.axios.post(translate('hi3_launcherContentsUrl'))
         .then((value) => {
             launcherInfo.value = value.data
-            launcherInfo.value.post.forEach(post => {
+            launcherInfo.value.post.forEach((post: PostInfo) => {
                 let tmp = postTypeMap.get(post.type)
                 if (tmp) {
                     tmp.push(post)
@@ -53,7 +54,7 @@ onMounted(async () => {
                 if (timeDelta.value > 40) {
                     ElMessageBox.confirm(translate('general_gameUpdBoxText1', {
                             game: gameName,
-                            beDays: translate('general_beDays', undefined, 42 - timeDelta.value)
+                            beDays: translate('general_beDays', 42 - timeDelta.value)
                         }),
                         translate('general_gameUpdBoxTitle'),
                         {
@@ -68,7 +69,7 @@ onMounted(async () => {
                 } else if (timeDelta.value > 0 && timeDelta.value < 3) {
                     ElMessageBox.confirm(translate('general_gameUpdBoxText2', {
                             game: gameName,
-                            days: translate('general_days', undefined, timeDelta.value)
+                            days: translate('general_days', timeDelta.value)
                         }),
                         translate('general_gameUpdBoxTitle'),
                         {
@@ -145,7 +146,7 @@ const hiLaunch = async () => {
     }
 }
 
-const handleCommand = (command) => {
+const handleCommand = (command: string) => {
     switch (command) {
         case 'openLauncher':
             window.child.exec(hiLauncherPath.value)
@@ -169,16 +170,8 @@ const handleCommand = (command) => {
     }
 }
 
-const handleScroll = ({scrollTop}) => {
-    if (scrollTop > 0) {
-        hideElements.value = true
-        if (displayConfirm.value) {
-            displayConfirm.value = false
-            path.value = ''
-        }
-    } else {
-        hideElements.value = false
-    }
+const handleScroll = ({scrollTop}: Record<string, number>) => {
+    hideElements.value = scrollTop > 0;
 }
 
 const router = useRouter()
@@ -257,7 +250,8 @@ const onImportDialogClose = () => {
              :class="{ 'scale-95': hideElements }">
             <img class=" top-0 rounded-3xl transition-all"
                  :class="hideElements ? 'blur-md scale-125 brightness-75' : ''"
-                 style="transition-duration: 500ms;" :src="launcherInfoReady ? launcherInfo.adv.background : ''"
+                 style="transition-duration: 500ms;"
+                 :src="launcherInfo.adv && launcherInfoReady ? launcherInfo.adv.background : ''"
                  @touchmove.prevent @mousewheel.prevent/>
         </div>
         <LauncherBanner class="absolute left-16 top-48 z-50 rounded-xl transition-all"
diff --git a/src/pages/StarRailPage/Components/StarRailInfoCard.vue b/src/pages/StarRailPage/Components/StarRailInfoCard.vue
index 6a2fcbe1..503abd07 100644
--- a/src/pages/StarRailPage/Components/StarRailInfoCard.vue
+++ b/src/pages/StarRailPage/Components/StarRailInfoCard.vue
@@ -13,7 +13,17 @@ import SRCharDetailsDialog from "./SRCharDetailsDialog.vue";
 
 const apiUrl = 'https://raw.githubusercontent.com/Mar-7th/StarRailRes/master/'
 
-const playerInfo = ref<FormattedApiInfo>({characters: [], player: undefined})
+const playerInfo = ref<FormattedApiInfo>({
+    characters: [], player: {
+        uid: '',
+        nickname: '',
+        level: 0,
+        world_level: 0,
+        friend_count: 0,
+        signature: '',
+        is_display: false
+    }
+})
 const playerInfoReady = ref(false)
 const playerInfoLoading = ref(false)
 const playerInfoFailed = ref(false)
@@ -311,9 +321,9 @@ const showCharDetails = (index: number) => {
         </div>
         <!-- 角色详情卡片 -->
         <div v-for="(character, index) in playerInfo.characters" class="z-0 relative w-full">
-            <div class="mt-4 w-full absolute top-0 left-0 right-0 transition-all" :class="{ 'opacity-0 translate-x-40 pointer-events-none': showcaseIdx < index },
-                { 'opacity-100 pointer-events-auto': showcaseIdx == index },
-                { 'opacity-0 -translate-x-40 pointer-events-none': showcaseIdx > index }"
+            <div class="mt-4 w-full absolute top-0 left-0 right-0 transition-all" :class="{ 'opacity-0 translate-x-40 pointer-events-none': showcaseIdx < index,
+                'opacity-100 pointer-events-auto': showcaseIdx == index,
+                'opacity-0 -translate-x-40 pointer-events-none': showcaseIdx > index }"
                  style="transition-duration: 300ms;">
                 <!-- absolute： 卡片元素背景、元素图标 -->
                 <img class="relative z-0 w-full" src="../../../assets/srBg.jpg" style="border-radius: 4.5vh;"/>
@@ -553,10 +563,10 @@ const showCharDetails = (index: number) => {
                                 <div class=" w-full h-full relative">
                                     <div class="text-gray-400 absolute right-0 top-1 flex flex-row">
                                         {{ relic.name }}
-                                        <div :class="{ 'border-orange-400 bg-orange-900 text-orange-300': relic.rarity == 5 },
-                                            { 'border-purple-400 bg-purple-900 text-purple-300': relic.rarity == 4 },
-                                            { 'border-blue-400 bg-blue-900 text-blue-300': relic.rarity == 3 },
-                                            { 'border-green-400 bg-green-900 text-green-300': relic.rarity == 2 }"
+                                        <div :class="{ 'border-orange-400 bg-orange-900 text-orange-300': relic.rarity == 5,
+                                                'border-purple-400 bg-purple-900 text-purple-300': relic.rarity == 4,
+                                                'border-blue-400 bg-blue-900 text-blue-300': relic.rarity == 3 ,
+                                                'border-green-400 bg-green-900 text-green-300': relic.rarity == 2 }"
                                              class="h-full justify-end ml-2 font-sr-sans rounded-full border px-2">
                                             +{{ relic.level }}
                                         </div>
@@ -568,13 +578,13 @@ const showCharDetails = (index: number) => {
                                                       class="h-5 w-5 mr-2" style="margin-top: 6px;"/>
                                             <el-text class="text-gray-200 text-lg" truncated style="max-width: 220px;">
                                                 {{
-                                                    relic.main_affix['name']
+                                                    relic.main_affix.name
                                                 }}
                                             </el-text>
                                         </div>
                                         <div>
                                             <span class="text-gray-200 text-3xl ml-2 font-sr-sans">{{
-                                                    relic.main_affix['display']
+                                                    relic.main_affix.display
                                                 }}</span>
                                         </div>
                                     </div>
@@ -587,7 +597,7 @@ const showCharDetails = (index: number) => {
                                                           class="h-5 w-5 mr-2"
                                                           style="margin-top: 4px;"/>
                                                 <span class="text-gray-200 font-sr-sans text-xl ml-2">{{
-                                                        substat['display']
+                                                        substat.display
                                                     }}</span>
                                             </div>
                                             <div class="flex flex-row mr-5">
diff --git a/src/pages/StarRailPage/StarRailPage.vue b/src/pages/StarRailPage/StarRailPage.vue
index a090d9d6..b67062fa 100644
--- a/src/pages/StarRailPage/StarRailPage.vue
+++ b/src/pages/StarRailPage/StarRailPage.vue
@@ -6,6 +6,7 @@ import StarRailInfoCard from "./Components/StarRailInfoCard.vue";
 import {useDialog} from "../../utils/template-dialog";
 import StarRailDialog from "./Components/StarRailDialog.vue";
 import SRImportDialog from "./Components/SRImportDialog.vue";
+import {LauncherInfo, PostInfo} from "../../types/launcher/launcherInfo";
 
 const gameName = translate('general_sr')
 
@@ -19,7 +20,7 @@ const timeNow = Date.now()
 const timeDelta = computed(() =>
     Math.ceil((timeNow - timeUpd1_4) / 1000 / 3600 / 24 - 0.5) % 42
 )
-const launcherInfo = ref({})
+const launcherInfo = ref<LauncherInfo>({banner: [], icon: [], post: [], qq: []})
 const launcherInfoReady = ref(false)
 const launcherInfoFailed = ref(false)
 const errMsg = ref('')
@@ -32,7 +33,7 @@ onMounted(async () => {
     window.axios.post(translate('sr_launcherContentsUrl'))
         .then((value) => {
             launcherInfo.value = value.data
-            launcherInfo.value.post.forEach(post => {
+            launcherInfo.value.post.forEach((post: PostInfo) => {
                 let tmp = postTypeMap.get(post.type)
                 if (tmp) {
                     tmp.push(post)
@@ -116,7 +117,7 @@ const srLaunch = async () => {
     }
 }
 
-const handleCommand = (command) => {
+const handleCommand = (command: string) => {
     switch (command) {
         case 'openLauncher':
             window.child.exec(srLauncherPath.value)
@@ -135,16 +136,8 @@ const handleCommand = (command) => {
     }
 }
 
-const handleScroll = ({scrollTop}) => {
-    if (scrollTop > 0) {
-        hideElements.value = true
-        if (displayConfirm.value) {
-            displayConfirm.value = false
-            path.value = ''
-        }
-    } else {
-        hideElements.value = false
-    }
+const handleScroll = ({scrollTop}: Record<string, number>) => {
+    hideElements.value = scrollTop > 0;
 }
 
 const router = useRouter()
diff --git a/src/pages/tmpPage.vue b/src/pages/tmpPage.vue
index a33046ab..dee27e87 100644
--- a/src/pages/tmpPage.vue
+++ b/src/pages/tmpPage.vue
@@ -5,7 +5,7 @@ import {useRoute, useRouter} from 'vue-router'
 const router = useRouter()
 const route = useRoute()
 onMounted(() => {
-    router.push(route.query.from)
+    router.push(route.query.from as string)
 })
 </script>
 
diff --git a/src/types/starrail/srPlayerInfo.ts b/src/types/starrail/srPlayerInfo.ts
index e2808825..51a2392e 100644
--- a/src/types/starrail/srPlayerInfo.ts
+++ b/src/types/starrail/srPlayerInfo.ts
@@ -66,6 +66,13 @@ export interface PropertyInfo {
 }
 
 export interface SubAffixInfo {
+    type: string
+    field: string
+    name: string
+    icon: string
+    value: number
+    display: string
+    percent: boolean
     count: number
     step: number
 }
@@ -78,7 +85,7 @@ export interface RelicInfo {
     rarity: number
     level: number
     icon: string
-    main_affix: PropertyInfo[]
+    main_affix: PropertyInfo
     sub_affix: SubAffixInfo[]
 }