联调接口

src/pages/userinfo/userinfo.vue

@@ -113,17 +113,7 @@ onLoad(async(opt) => {
 // 1.头部导航栏
 const navBarPaddingTop = ref(0);
 let appVersion = ref("1.0.0");//当前版本号
-onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 
-    let systemInfo = uni.getSystemInfoSync();
-    // #ifdef APP-PLUS
-    appVersion.value=systemInfo.appWgtVersion; //当前版本号
-    // #endif
-    // #ifdef H5
-    appVersion.value=systemInfo.appVersion;
-    // #endif
-})
 
 // 下拉刷新
 const mescrollRef = ref(null);
@@ -158,7 +148,6 @@ const selectUserInfo = async ()=>{
     let data = await getUserInfo({});
     userObj.value = data;
 }
-selectUserInfo()
 
 // 3.退出登录
 const handleLoginOut = async ()=>{
@@ -168,14 +157,25 @@ const handleLoginOut = async ()=>{
     });
 }
 
-
-
-
 // 4.跳转到版本
 const handleVersion=()=>{
     uni.navigateTo({url:'/pages/userinfo/version'})
 }
 
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+
+    let systemInfo = uni.getSystemInfoSync();
+    // #ifdef APP-PLUS
+    appVersion.value=systemInfo.appWgtVersion; //当前版本号
+    // #endif
+    // #ifdef H5
+    appVersion.value=systemInfo.appVersion;
+    // #endif
+
+    selectUserInfo()
+})
+
 </script>
 
 <style scoped>

src/pages/userinfo/version.vue

@@ -26,10 +26,17 @@
 </template>
 
 <script setup>
+import { onLoad } from '@dcloudio/uni-app';
 import { ref, onMounted } from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import { versionCheck } from '@/api/auth.js';
 import { getNavBarPaddingTop } from '@/utils/system.js'
+import { formatIOS } from '@/utils/status.js'
+
+// 初始load页面
+onLoad(async(opt) => {
+    getOSVesion();
+});
 
 // 1.头部导航栏
 let navBarPaddingTop = ref(0);
@@ -38,29 +45,24 @@ let newVersion = ref('1.0.0');//最新版本号
 let remark = ref('');//更新内容
 onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-    getOSVesion();
 })
 let getOSVesion = async()=>{
     let systemInfo = uni.getSystemInfoSync();
     let param = {
         // #ifdef APP-PLUS
-        appVersion:systemInfo.appWgtVersion,//当前版本号
+        verNumber:systemInfo.appWgtVersion,//当前版本号
         // #endif
         // #ifdef H5
-        appVersion : systemInfo.appVersion,
+        verNumber : systemInfo.appVersion,
         // #endif
-        deviceType:systemInfo.model,//型号
-        os: systemInfo.osName,//操作系统 Android  IOS
-        osVersion:systemInfo.osVersion,//操作系统版本
-        resolution:systemInfo.windowWidth+"*"+systemInfo.windowHeight,//分辨率
-        trademark:systemInfo.deviceBrand,//设备品牌
-        uniqueCode:systemInfo.deviceId//设备ID
+        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
     }
     // 当前手机版本
     appVersion.value = param.appVersion;
-    // console.log("appVersion=>",appVersion)
+    console.log("appVersion=>",appVersion)
     let data = await versionCheck(param);
-    newVersion.value = data.latestVersion;
+    newVersion.value = data.verNumber;
+    downloadURL.value = data.downloadUrl;
     remark.value = data.remark //|| '全新的UI界面 优化了签到/打卡功能，整体流程更加简洁清晰 搜索功能全面升级 修复了已知BUG'
 }
 
@@ -69,11 +71,11 @@ const handleDown = ()=>{
     // #ifdef APP-PLUS
     // 跳转到应用商店或下载最新版本的页面
     plus.runtime.openURL(downloadURL.value);			
-    // if (versionData.value.os == 'ios'){
-    //     plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-    // } else if (versionData.value.os == 'android'){
+    if (versionData.value.os == 'ios'){
+        plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+    } else if (versionData.value.os == 'android'){
         plus.runtime.quit();
-    // }
+    }
     // #endif
 }
 </script>