liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

670人员登记调整，蓝牙成功不再走后端

Browse Source
This commit is contained in:
liub
2025-10-09 14:34:22 +08:00
parent c556b802e4
commit 4f3a8bb3ec
15 changed files with 360 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
utils/update.js
View File

@ -12,26 +12,25 @@ function checkAndUpdateWgt(updateUrl) {
}
// 显示加载提示
let urls = ['http://114.55.111.217/app/CheckUpdate', 'https://t3v3e2xsjv.by.takin.cc/app/CheckUpdate'];
let urls = ['https://dmsapp.skf.com.cn/HummerService/app/CheckUpdate'];
// 1. 获取当前应用版本信息
plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
const currentVersion = widgetInfo.version;
console.log("当前版本:" + currentVersion);
let callbck = (res) => {
let flag = false;
uni.hideLoading();
// console.log("检查更新成功=", res)
console.log("检查更新成功=", res)
if (res.statusCode === 200) {
const updateInfo = res.data.data;
if (!updateInfo.hasUpdate) {
return;
return true;
}
flag = true;
// 3. 显示更新提示
uni.showModal({
title: '检测到更新',
@ -45,16 +44,14 @@ function checkAndUpdateWgt(updateUrl) {
}
});
} else {
uni.showToast({
title: '当前已是最新版本',
icon: 'none',
duration: 2000
});
console.log('当前已是最新版本');
}
return flag;
};
let Update = (url) => {
console.log("url=",url);
console.log("url=", url);
return new Promise((resolve, reject) => {
uni.request({
url: url,
@ -62,42 +59,57 @@ function checkAndUpdateWgt(updateUrl) {
data: {
currentVersion: currentVersion,
platform: uni.getSystemInfoSync().platform,
appId:"xhyc"
appId: "xhyc"
},
success: (res) => {
// console.log("res=>",res)
res.type='1';
resolve(res);
if (res.statusCode === 200) {
res.type = '1';
resolve(res);
} else {
reject(res);
}
},
fail: (err) => {
console.log("err=",err);
console.log("err=", err);
reject(err);
},
complete:()=>{
complete: () => {
console.log("complete");
}
});
});
}
let Callback1 = (res) => {
console.log("检查版本更新:", res);
let os = plus.os.name.toLowerCase();
let flag = false;
if (res.code != 200) {
return;
return flag;
}
let f = res.data.find(v => {
if (v.dictLabel.toLowerCase() == os) {
return true;
}
return false;
});
console.log("f=", f)
if (f) {
if (f.dictValue == currentVersion) {
flag = false;
return flag;
}
if(!f.dictValue || !f.remark){
flag=false;
return;
}
flag = true;
uni.showModal({
title: '检测到更新',
content: '当前版本“' + currentVersion + '”,发现新版本“' + f.dictValue + '”，是否立即更新？',
@ -109,17 +121,20 @@ function checkAndUpdateWgt(updateUrl) {
}
}
});
} else {
flag = false;
}
return flag;
}
let Update1 = () => {
return request({
url: '/app/auth/version',
method: 'get'
});
}
let promises = [];
for (var i = 0; i < urls.length; i++) {
promises.push(Update(urls[i]));
@ -128,25 +143,25 @@ function checkAndUpdateWgt(updateUrl) {
Promise.allSettled(promises).then(results => {
let length = results.length;
let flag=false;
let flag = false;
for (var i = 0; i < length; i++) {
console.log('results['+i+']=',results[i]);
if (results[i].status == 'fulfilled' && results[i].value.type==='1' && !flag ) {
flag=true;
callbck(results[i].value)
console.log('results[' + i + ']=', results[i]);
if (results[i].status == 'fulfilled' && results[i].value.type === '1' && !flag) {
if (results[i].value.statusCode === 200) {
flag = callbck(results[i].value)
}
// break;
}
if(results[i].status == 'fulfilled' && results[i].value.type!=='1' && !flag){
flag=true;
Callback1(results[i].value);
if (results[i].status == 'fulfilled' && results[i].value.type !== '1' && !flag) {
flag = Callback1(results[i].value);
// break;
}
}
if(!flag){
if (!flag) {
console.log("检查更新失败了");
}else{
} else {
console.log("检查更新成功");
}
});