From 7c5233f8f506e25334e058b0da7101881e5366f1 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 12 Aug 2025 14:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deviceAuth/deviceAuth.vue |  5 ++---
 src/pages/loading/loading.vue       | 28 ++++------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue
index a3e78e3..f9cde53 100644
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -110,7 +110,6 @@ onMounted(async () => {
     navBarPaddingTop.value = getNavBarPaddingTop();
     deviceId.value = uni.getStorageSync('app_device_id');// 本地设备ID
     await selectBindStatus();
-    console.log("333bindStatus=>",bindStatus.value)
     if(bindStatus.value==2){
         // bindStatus=2-----到等待页面（定时任务查询 10秒查询一次）
         timer = setInterval(()=>{  
@@ -152,7 +151,7 @@ let refreshBindStatus = async ()=>{
     bindStatus.value = res.bindStatus;
     console.log("222bindStatus=>",bindStatus.value)
     if(bindStatus.value==2){
-        
+
     }else{
         if(bindStatus.value==4){
             if (userStore.isLogin) {
@@ -165,7 +164,7 @@ let refreshBindStatus = async ()=>{
                 });
             }
         }
-        clearInterval(timer);
+        if (timer) clearInterval(timer)
     }
 }
 
diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue
index 0e85ade..86b71d2 100644
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -9,7 +9,7 @@
         <view class="v-bg">
             <view class="v-title">发现新版本</view>
             <uni-icons custom-prefix="iconfont" color="#28B6FF" type="icon-phonefilled" size="40"></uni-icons>
-            <view class="v-version">最新版本 Version 8.1.2</view>
+            <view class="v-version">最新版本 Version {{ newVersion }}</view>
             <view class="v-update">立刻更新吗？</view>
             <view class="version-btn" @click="handleDown">更 新</view>
             <view class="version-sub" @click="handleClose" v-if="btnVisible">暂不处理</view>
@@ -88,9 +88,11 @@ let getOSVesion = async()=>{
     appVersion.value = param.verNumber;
     // console.log("appVersion=>",appVersion)
     versionData.value = param;
-    
+    console.log("versionCheck=>param=>",param)
     let data = await versionCheck(param);
+    console.log("versionCheck=>",data)
     newVersion.value = data.verNumber;
+    downloadURL.value = data.downloadUrl;
 
     // isForceUpdate 是否强制更新 1-是 2-否
     let isForceUpdate = data.isForceUpdate;
@@ -106,28 +108,6 @@ let getOSVesion = async()=>{
     }else{
         versionVisible.value=true;
     }
-
-    // 版本状态 0-最新版本  1-有新版本，但现有版本可用  2-现有版本不可用，需要下载新版本
-    // if(data.status == 1 || data.status == 2){
-    //     versionVisible.value = true;
-    //     downloadURL.value = data.downloadURL;
-    //     // 可用版本列表
-    //     let availableVersionsList = data.availableVersionsList;
-    //     // let versionList = availableVersionsList.split(",");
-    //     if(availableVersionsList.indexOf(appVersion.value)>-1){
-           
-    //     }else{
-    //         btnVisible.value = false;
-    //     }
-    // // }else{
-    //     if(userStore.isLogin){
-    //         // _this.getUserInfo();
-    //     }else{
-    //         uni.reLaunch({
-    //             url: '/pages/home/home',
-    //         });
-    //     }
-    // }
 }
 
 // 查询设备ID