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

java-mall-app-shop-admin/config/appUpdate.js

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

java-mall-app-shop-admin/config/componentConfig.js

@@ -71,7 +71,7 @@ export default {
     }
 
     console.log('marketId', marketId);
-	console.log('phoneInfo.brand',phoneInfo.brand)
+    console.log('phoneInfo.brand', phoneInfo.brand);
 
     let params = {
       marketId: marketId,
@@ -83,6 +83,13 @@ export default {
 
     if (res && res.status == 200) {
       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);
+        }
       }
     }