From 5ac43c95e5bfdd9d7678760356f56e2b068a0385 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Tue, 25 Apr 2023 21:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20fix(achievement):=20=E5=87=8F?=
 =?UTF-8?q?=E4=BA=86=E4=B8=80=E4=B8=AA=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Achievements.vue | 13 +++++--------
 src/utils/TGSql.ts         |  1 -
 src/utils/TGSqlite.ts      |  8 ++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/pages/Achievements.vue b/src/pages/Achievements.vue
index f9ed683d..a6f3911a 100644
--- a/src/pages/Achievements.vue
+++ b/src/pages/Achievements.vue
@@ -28,7 +28,7 @@
   <div v-show="!loading" class="wrap">
     <!-- 左侧菜单 -->
     <div class="left-wrap">
-      <v-list v-for="(series, index) in seriesList" :key="series.id" class="card-left" @click="selectSeries(index)">
+      <v-list v-for="series in seriesList" :key="series.id" class="card-left" @click="selectSeries(series.id)">
         <div class="version-icon-series">
           v{{ series.version }}
         </div>
@@ -46,7 +46,7 @@
     <!-- 右侧内容-->
     <div class="right-wrap">
       <v-list
-        v-if="selectedIndex !== -1 && selectedSeries !== 0 && selectedSeries !== 17"
+        v-if="selectedSeries !== 0 && selectedSeries !== 17 && selectedSeries !== -1"
         :style="{
           backgroundImage: 'url(' + getCardInfo.bg || null + ')',
           backgroundPosition: 'right',
@@ -126,7 +126,6 @@ const title = ref(achievementsStore.title as string);
 const getCardInfo = ref({} as BTMuli.SQLite.NameCard);
 // series
 const seriesList = ref([] as BTMuli.SQLite.AchievementSeries[]);
-const selectedIndex = ref(-1 as number);
 const selectedSeries = ref(-1 as number);
 const selectedAchievement = ref([] as BTMuli.SQLite.Achievements[]);
 
@@ -154,15 +153,14 @@ async function loadData () {
 // 渲染选中的成就系列
 async function selectSeries (index: number) {
   // 如果选中的是已经选中的系列，则不进行操作
-  if (selectedIndex.value === index) {
+  if (selectedSeries.value === index) {
     snackbarText.value = "已经选中该系列";
     snackbar.value = true;
     return;
   }
   loading.value = true;
   loadingTitle.value = "正在获取对应的成就数据";
-  selectedIndex.value = index;
-  selectedSeries.value = seriesList.value[index].id;
+  selectedSeries.value = index;
   selectedAchievement.value = await TGSqlite.getAchievements(selectedSeries.value);
   loadingTitle.value = "正在查找对应的成就名片";
   if (selectedSeries.value !== 0 && selectedSeries.value !== 17) {
@@ -187,7 +185,7 @@ async function searchCard () {
   loadingTitle.value = "正在搜索";
   loading.value = true;
   selectedAchievement.value = await TGSqlite.searchAchievements(search.value);
-  selectedIndex.value = -1;
+  selectedSeries.value = -1;
   loading.value = false;
   if (selectedAchievement.value.length === 0) {
     snackbarColor.value = "#F5810A";
@@ -220,7 +218,6 @@ async function importJson () {
     loadingTitle.value = "正在刷新数据";
     // 刷新数据
     await loadData();
-    selectedIndex.value = -1;
   }
 }
 
diff --git a/src/utils/TGSql.ts b/src/utils/TGSql.ts
index fd32200a..7deafb84 100644
--- a/src/utils/TGSql.ts
+++ b/src/utils/TGSql.ts
@@ -246,7 +246,6 @@ export function importUIAFData (data: TGPlugin.UIAF.Achievement[]): string[] {
     const isCompleted = achievement.status === 2 || achievement.status === 3;
     if (isCompleted) {
       const completedTime = new Date(achievement.timestamp * 1000).toISOString().replace("T", " ").slice(0, 19);
-      console.log(completedTime);
       sql = `
         UPDATE Achievements
         SET isCompleted = 1, completedTime = '${completedTime}', progress = ${achievement.current}, updated = datetime('now', 'localtime')
diff --git a/src/utils/TGSqlite.ts b/src/utils/TGSqlite.ts
index c03d33c6..2c8d08d0 100644
--- a/src/utils/TGSqlite.ts
+++ b/src/utils/TGSqlite.ts
@@ -176,9 +176,9 @@ class TGSqlite {
     const db = await Database.load(this.dbPath);
     let sql;
     if (seriesId) {
-      sql = `SELECT * FROM Achievements WHERE series=${seriesId} ORDER BY isCompleted DESC, \`order\` ASC;`;
+      sql = `SELECT * FROM Achievements WHERE series=${seriesId} ORDER BY isCompleted ASC, \`order\` ASC;`;
     } else {
-      sql = "SELECT * FROM Achievements ORDER BY isCompleted DESC, `order` ASC;";
+      sql = "SELECT * FROM Achievements ORDER BY isCompleted ASC, `order` ASC;";
     }
     const res: BTMuli.SQLite.Achievements[] = await db.select(sql);
     await db.close();
@@ -211,9 +211,9 @@ class TGSqlite {
     let sql;
     if (keyword.startsWith("v")) {
       const version = keyword.replace("v", "");
-      sql = `SELECT * FROM Achievements WHERE version='${version}' ORDER BY isCompleted DESC, \`order\` ASC;`;
+      sql = `SELECT * FROM Achievements WHERE version='${version}' ORDER BY isCompleted ASC, \`order\` ASC;`;
     } else {
-      sql = `SELECT * FROM Achievements WHERE name LIKE '%${keyword}%' OR description LIKE '%${keyword}%' ORDER BY isCompleted DESC, \`order\` ASC;`;
+      sql = `SELECT * FROM Achievements WHERE name LIKE '%${keyword}%' OR description LIKE '%${keyword}%' ORDER BY isCompleted ASC, \`order\` ASC;`;
     }
     const res: BTMuli.SQLite.Achievements[] = await db.select(sql);
     await db.close();