diff --git a/src/api/publicApi.js b/src/api/publicApi.js index 6dc89c0..740c949 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -100,7 +100,7 @@ // 获取当前蒲公英APP版本 export function appVersion(query) { return request({ - url: '/system/version/pgyerVersion', + url: '/system/version/getCurrentVersionInfo', method: 'get', params: query, }); diff --git a/src/api/publicApi.js b/src/api/publicApi.js index 6dc89c0..740c949 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -100,7 +100,7 @@ // 获取当前蒲公英APP版本 export function appVersion(query) { return request({ - url: '/system/version/pgyerVersion', + url: '/system/version/getCurrentVersionInfo', method: 'get', params: query, }); diff --git a/src/utils/main.js b/src/utils/main.js index c336970..7d977ef 100644 --- a/src/utils/main.js +++ b/src/utils/main.js @@ -29,8 +29,8 @@ appXF.config.globalProperties.showFailToast = showFailToast; //toast失败提示 import VConsole from 'vconsole'; -// let vConsole = new VConsole(); -// appXF.use(vConsole); +let vConsole = new VConsole(); +appXF.use(vConsole); // 错误打印 appXF.config.errorHandler = (err, instance, info) => { diff --git a/src/api/publicApi.js b/src/api/publicApi.js index 6dc89c0..740c949 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -100,7 +100,7 @@ // 获取当前蒲公英APP版本 export function appVersion(query) { return request({ - url: '/system/version/pgyerVersion', + url: '/system/version/getCurrentVersionInfo', method: 'get', params: query, }); diff --git a/src/utils/main.js b/src/utils/main.js index c336970..7d977ef 100644 --- a/src/utils/main.js +++ b/src/utils/main.js @@ -29,8 +29,8 @@ appXF.config.globalProperties.showFailToast = showFailToast; //toast失败提示 import VConsole from 'vconsole'; -// let vConsole = new VConsole(); -// appXF.use(vConsole); +let vConsole = new VConsole(); +appXF.use(vConsole); // 错误打印 appXF.config.errorHandler = (err, instance, info) => { diff --git a/src/views/home/codeQR.vue b/src/views/home/codeQR.vue index 494d209..8f725ab 100644 --- a/src/views/home/codeQR.vue +++ b/src/views/home/codeQR.vue @@ -22,7 +22,8 @@ // 获取版本信息 function getVersionInfo() { pinias.showLoading(); - appVersion().then((res) => { + let version = window.android.versionName(); + appVersion({ version: version }).then((res) => { versionInfo.value = res.data; checkNewVersion(); //检测App是否有更新 pinias.hideLoading(); @@ -30,7 +31,8 @@ } // 检测App是否有更新; function checkNewVersion() { - appVersionCheck().then((res) => { + let version = window.android.versionName(); + appVersionCheck({ buildVersion: version }).then((res) => { ifNew.value = res.data.buildHaveNewVersion; }); } diff --git a/src/api/publicApi.js b/src/api/publicApi.js index 6dc89c0..740c949 100644 --- a/src/api/publicApi.js +++ b/src/api/publicApi.js @@ -100,7 +100,7 @@ // 获取当前蒲公英APP版本 export function appVersion(query) { return request({ - url: '/system/version/pgyerVersion', + url: '/system/version/getCurrentVersionInfo', method: 'get', params: query, }); diff --git a/src/utils/main.js b/src/utils/main.js index c336970..7d977ef 100644 --- a/src/utils/main.js +++ b/src/utils/main.js @@ -29,8 +29,8 @@ appXF.config.globalProperties.showFailToast = showFailToast; //toast失败提示 import VConsole from 'vconsole'; -// let vConsole = new VConsole(); -// appXF.use(vConsole); +let vConsole = new VConsole(); +appXF.use(vConsole); // 错误打印 appXF.config.errorHandler = (err, instance, info) => { diff --git a/src/views/home/codeQR.vue b/src/views/home/codeQR.vue index 494d209..8f725ab 100644 --- a/src/views/home/codeQR.vue +++ b/src/views/home/codeQR.vue @@ -22,7 +22,8 @@ // 获取版本信息 function getVersionInfo() { pinias.showLoading(); - appVersion().then((res) => { + let version = window.android.versionName(); + appVersion({ version: version }).then((res) => { versionInfo.value = res.data; checkNewVersion(); //检测App是否有更新 pinias.hideLoading(); @@ -30,7 +31,8 @@ } // 检测App是否有更新; function checkNewVersion() { - appVersionCheck().then((res) => { + let version = window.android.versionName(); + appVersionCheck({ buildVersion: version }).then((res) => { ifNew.value = res.data.buildHaveNewVersion; }); } diff --git a/src/views/login.vue b/src/views/login.vue index 2007405..92778d3 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -128,18 +128,18 @@ onMounted(() => { getCode(); - // 安卓,ios顶部适配 - let sys = checkUserSystem(); - if (sys == 'Android') { - window.android.updateChecker(); - } else { - } + if (allData.remberPass) { const usernameKFApp = localStorage.getItem('usernameKFApp'); const passwordKFApp = localStorage.getItem('passwordKFApp'); allData.userName = usernameKFApp ? usernameKFApp : ''; allData.password = passwordKFApp ? DecryptAES(passwordKFApp) : ''; } + // 安卓检查更新 + let sys = checkUserSystem(); + if (sys == 'Android') { + window.android.updateChecker(); + } });