From 5ede09aafbf4bc558f663735165d3fc492c63d81 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 16 Apr 2019 10:23:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[test=E7=8E=AF=E5=A2=83=E5=8F=91=E7=89=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=95=B4=E7=90=86ext.json=E5=8F=8Acode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 11 ++--------- ext.json | 18 +++++++++--------- pages/passCar/passCar.js | 25 ++++++++----------------- pages/passCar/passCar.wxml | 2 +- pages/user/index.js | 6 +----- project.config.json | 2 +- 6 files changed, 22 insertions(+), 42 deletions(-) diff --git a/config/config.js b/config/config.js index 823a6f9..a8d405f 100755 --- a/config/config.js +++ b/config/config.js @@ -1,13 +1,6 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} -let weappId; -let configUrls; -if (Object.keys(extConfig).length == 0){ - weappId = 'wx649b3be73c1afe47'; - configUrls = 'https://ctest.malls.iformall.com/C/api'; -}else{ - configUrls = extConfig.attr.configUrl; - weappId = extConfig.weappId; -} +let weappId = extConfig.weappId; +let configUrls = extConfig.attr.configUrl; var config = { url: configUrls, api: { diff --git a/ext.json b/ext.json index 8b544e9..0aa481f 100644 --- a/ext.json +++ b/ext.json @@ -1,16 +1,16 @@ { "extEnable": true, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wx9b0a894a3bbe9627", "ext": { - "weappId": "wx6a2524a8286d687f", - "name": "富茂链客生产版", - "appVersion": "C.nocar.4.1.7", + "weappId": "wx9b0a894a3bbe9627", + "name": "金泸商务", + "appVersion": "C.4.1.8", "attr": { - "ifHaveCarModular": "0", - "etcpversion": "release", - "configUrl": "https://c.malls.iformall.com/C/api", - "passCarAppId": "wxc07f9d67923d676d", - "passCarreturnUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" + "configUrl": "https://ctest.malls.iformall.com/C/api", + "ifHaveCarModular": "1", + "etcpVersion": "release", + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpCallbackReturnUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" } }, "permission": { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 60ca56b..6438fd9 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, + etcpCallbackReturnUrl: extConfig.attr.etcpCallbackReturnUrl, + 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.etcpCallbackReturnUrl, 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'); diff --git a/project.config.json b/project.config.json index e03f6ca..960a119 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.2.0", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "condition": { From 4a899b884d262b8bd574a93b3c6c41a0142e13fd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 16 Apr 2019 12:38:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E6=94=AF=E4=BB=98callbac?= =?UTF-8?q?k=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 2 +- pages/passCar/passCar.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext.json b/ext.json index 0aa481f..a2a6d88 100644 --- a/ext.json +++ b/ext.json @@ -10,7 +10,7 @@ "ifHaveCarModular": "1", "etcpVersion": "release", "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpCallbackReturnUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" } }, "permission": { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 6438fd9..c0d5fa3 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -86,7 +86,7 @@ Page({ that.setData({ etcpAppId: extConfig.attr.etcpAppId, etcpVersion: extConfig.attr.etcpVersion, - etcpCallbackReturnUrl: extConfig.attr.etcpCallbackReturnUrl, + etcpCallbackUrl: extConfig.attr.etcpCallbackUrl, ifHaveCarModular: extConfig.attr.ifHaveCarModular }) console.log(that.data.ifHaveCarModular) @@ -561,7 +561,7 @@ Page({ syncId: res.data.orderId, payType: 6, // 小程序支付 CarNumber: carNumber, - returnUrl: that.data.etcpCallbackReturnUrl, + returnUrl: that.data.etcpCallbackUrl, source: "FUMAO-001", actionId: "1" //操作ID,1:小程序支付 }