From 8aca17f0c67471bd185b3502bb80e74d263cc74a Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 28 Mar 2025 13:39:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20AliyunAuthDialog=20?=
 =?UTF-8?q?=E4=BB=A5=E4=BD=BF=E7=94=A8=E4=BA=8C=E7=BB=B4=E7=A0=81=20URL=20?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/AliyunAuthDialog.vue | 39 ++++++++++------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/components/dialog/AliyunAuthDialog.vue b/src/components/dialog/AliyunAuthDialog.vue
index aa24555b..c3c0bfd0 100644
--- a/src/components/dialog/AliyunAuthDialog.vue
+++ b/src/components/dialog/AliyunAuthDialog.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
-import QrcodeVue from 'qrcode.vue'
 import api from '@/api'
 
 // 定义输入
-const props = defineProps({
+defineProps({
   conf: {
     type: Object as PropType<{ [key: string]: any }>,
     required: true,
@@ -14,13 +13,7 @@ const props = defineProps({
 const emit = defineEmits(['done', 'close'])
 
 // 二维码内容
-const qrCodeContent = ref('')
-
-// ck参数
-const ck = ref('')
-
-// t参数
-const t = ref('')
+const qrCodeUrl = ref('')
 
 // 下方的提示信息
 const text = ref('请用阿里云盘 App 扫码')
@@ -42,9 +35,7 @@ async function getQrcode() {
   try {
     const result: { [key: string]: any } = await api.get('/storage/qrcode/alipan')
     if (result.success && result.data) {
-      qrCodeContent.value = result.data.codeContent
-      ck.value = result.data.ck
-      t.value = result.data.t
+      qrCodeUrl.value = result.data.codeUrl
       timeoutTimer = setTimeout(checkQrcode, 3000)
     } else {
       text.value = result.message
@@ -57,23 +48,21 @@ async function getQrcode() {
 // 调用/aliyun/check api验证二维码
 async function checkQrcode() {
   try {
-    const result: { [key: string]: any } = await api.get('/storage/check/alipan', {
-      params: { ck: ck.value, t: t.value },
-    })
+    const result: { [key: string]: any } = await api.get('/storage/check/alipan')
     if (result.success && result.data) {
-      const qrCodeStatus = result.data.qrCodeStatus
+      const qrCodeStatus = result.data.status
       text.value = result.data.tip
-      if (qrCodeStatus == 'CONFIRMED') {
-        // 已确认完成
+      if (qrCodeStatus == 'LoginSuccess') {
+        // 登录成功
         alertType.value = 'success'
         handleDone()
-      } else if (qrCodeStatus == 'NEW' || qrCodeStatus == 'SCANED') {
+      } else if (qrCodeStatus == 'WaitLogin' || qrCodeStatus == 'ScanSuccess') {
+        // 等待登录扫码成功
         alertType.value = 'info'
-        // 新建、待扫码
         clearTimeout(timeoutTimer)
         timeoutTimer = setTimeout(checkQrcode, 3000)
       } else {
-        // 过期或者已取消
+        // 二维码过期
         alertType.value = 'error'
       }
     } else {
@@ -100,7 +89,13 @@ onUnmounted(() => {
       <DialogCloseBtn @click="emit('close')" />
       <VCardText class="pt-2 flex flex-col items-center">
         <div class="my-6 shadow-lg rounded text-center p-3 border">
-          <QrcodeVue class="mx-auto" :value="qrCodeContent" :size="200" />
+          <VImg class="mx-auto" :src="qrCodeUrl" width="200" height="200">
+            <template #placeholder>
+              <div class="w-full h-full">
+                <VSkeletonLoader class="object-cover aspect-w-1 aspect-h-1" />
+              </div>
+            </template>
+          </VImg>
         </div>
         <VAlert variant="tonal" :type="alertType" class="my-4 text-center" :text="text">
           <template #prepend />