front/merchapp
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.gpxscs.cn/front/merchapp

Browse Source
This commit is contained in:
mixtan 2025-05-08 13:49:37 +08:00
commit f451e44715
3 changed files with 48 additions and 2172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java-mall-app-shop-admin/config/appUpdate.js
View File

@ -864,10 +864,9 @@ function downloadPopup(data) {
} }
export default function (isPrompt = false) { export default function (isPrompt = false) {
getCurrentNo((versionInfo) => { getCurrentNo((versionInfo) => {
componentConfig.getServerNo(versionInfo, isPrompt, (res) => { componentConfig.getServerNo(versionInfo, isPrompt, (res) => {
if (res.updateType == 'forcibly' || res.updateType == 'silent') { if (res.updateType == 'forcibly' || res.updateType == 'silent') {
if (/\.wgt$/i.test(res.downloadUrl)) { if (/\.wgt$/i.test(res.download_wgt_url)) {
getDownload(res); getDownload(res);
} else if (/\.html$/i.test(res.downloadUrl)) { } else if (/\.html$/i.test(res.downloadUrl)) {
plus.runtime.openURL(res.downloadUrl); plus.runtime.openURL(res.downloadUrl);

9
java-mall-app-shop-admin/config/componentConfig.js
View File

@ -71,7 +71,7 @@ export default {
} }
console.log('marketId', marketId); console.log('marketId', marketId);
console.log('phoneInfo.brand',phoneInfo.brand) console.log('phoneInfo.brand', phoneInfo.brand);
let params = { let params = {
marketId: marketId, marketId: marketId,
@ -83,6 +83,13 @@ export default {
if (res && res.status == 200) { if (res && res.status == 200) {
if (res.data) { if (res.data) {
res.data.updateType = 'solicit';
if (res.data.is_force_update) {
res.updateType = 'forcibly';
callback && callback(res.data);
} else {
callback && callback(res.data);
}
} }
} }

2204
java-mall-app-shop-admin/unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long