diff --git a/config/config.js b/config/config.js index cc5c795..f6a6646 100755 --- a/config/config.js +++ b/config/config.js @@ -1,16 +1,7 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let weappId; -let configUrls; -let sockUrls; -if (Object.keys(extConfig).length == 0){ - weappId = 'wx649b3be73c1afe47'; - configUrls = 'https://ctest.malls.iformall.com/C/api'; - sockUrls = 'wss://wstest.malls.iformall.com/W/ws'; -}else{ - weappId = extConfig.weappId; - configUrls = extConfig.attr.configUrl; - sockUrls = extConfig.attr.socketUrl; -} +let weappId = extConfig.weappId; +let configUrls = extConfig.attr.configUrl; +let sockUrls = extConfig.attr.socketUrl; var config = { url: configUrls, wsurl: sockUrls, diff --git a/ext.json b/ext.json index 5f2fb83..977b5f8 100644 --- a/ext.json +++ b/ext.json @@ -6,13 +6,13 @@ "name": "富茂客官开发", "appVersion": "C.4.2.100", "attr": { - "ifHaveCarModular": "1", - "ifHaveWebSocket": "0", - "etcpversion": "release", "configUrl": "https://ciformall.youlane.cn/C/api", "socketUrl": "wss://mp.youlane.cn/W/ws", - "passCarAppId": "wx192b7d2e8dcbefd0", - "passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" + "ifHaveWebSocket": "0", + "ifHaveCarModular": "1", + "etcpVersion": "release", + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" } }, "permission": { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 60ca56b..c0d5fa3 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -62,7 +62,7 @@ Page({ }, gotoetcp: function () { wx.navigateToMiniProgram({ - appId: that.data.passCarAppId, + appId: that.data.etcpAppId, extraData: this.data.extraData, envVersion: 'release', path: "pages/main/main", @@ -83,21 +83,12 @@ Page({ onShow: function (options) { var that = this; console.log(that.data.ifHaveCarModular) - if (Object.keys(extConfig).length != 0) { - that.setData({ - passCarAppId: extConfig.attr.passCarAppId, - etcpversion: extConfig.attr.etcpversion, - passCarreturnUrl: extConfig.attr.passCarreturnUrl, - ifHaveCarModular: extConfig.attr.ifHaveCarModular - }) - } else { - that.setData({ - passCarAppId:'wx192b7d2e8dcbefd0', - etcpversion:'release', - passCarreturnUrl:'https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback', - ifHaveCarModular:1 - }) - } + that.setData({ + etcpAppId: extConfig.attr.etcpAppId, + etcpVersion: extConfig.attr.etcpVersion, + etcpCallbackUrl: extConfig.attr.etcpCallbackUrl, + ifHaveCarModular: extConfig.attr.ifHaveCarModular + }) console.log(that.data.ifHaveCarModular) if (app.globalData.token) { that.getList(); @@ -570,7 +561,7 @@ Page({ syncId: res.data.orderId, payType: 6, // 小程序支付 CarNumber: carNumber, - returnUrl: that.data.passCarreturnUrl, + returnUrl: that.data.etcpCallbackUrl, source: "FUMAO-001", actionId: "1" //操作ID,1:小程序支付 } diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index a7ed4d6..b1a0c7e 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -53,7 +53,7 @@ - + 立即支付 立即支付 diff --git a/pages/user/index.js b/pages/user/index.js index fae543f..0a1b505 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -1,8 +1,4 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let appVersion; -if (Object.keys(extConfig).length == 0) { - appVersion = 'C.4.1.1'; -} var config = require("../../config/config.js"); var app = getApp(); const Http = require("../../utils/HttpBasics"); @@ -106,7 +102,7 @@ Page({ onShow: function() { let that = this; that.setData({ - appVersion: extConfig.appVersion ? extConfig.appVersion : appVersion + appVersion: extConfig.appVersion }) let num = wx.getStorageSync('couponNum'); let num1 = wx.getStorageSync('couponNum2');