diff --git a/ext.json b/ext.json index 34dfe10..3c0587f 100644 --- a/ext.json +++ b/ext.json @@ -1,14 +1,7 @@ { "ext": { "attr": { - "car": { - "etcp": { - "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" - } - }, - "mchId": "1604439800", + "mchId": "1602801645", "imgProxy": [ { "newUrl": "https://ctest.malls.iformall.com/img", @@ -24,12 +17,16 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", + "etcpAppId": "wx219a81b9c87aa4f7", + "etcpVersion": "release", "businessSwitch": "1", + "businessVersion": "1", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "金泸商务", - "weappId": "wx649b3be73c1afe47", + "name": "富茂光谷测试版", + "weappId": "wx219a81b9c87aa4f7", "appVersion": "C.test.5.2.0" }, "debug": false, @@ -77,15 +74,15 @@ }, "plugins": { "auto-points-plugin": { - "version": "1.3.0", + "version": "2.4.0", "provider": "wxfab2bf944bfc4da6" }, "live-player-plugin": { - "version": "1.3.4", + "version": "1.2.5", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wx219a81b9c87aa4f7", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/setUserInfo/index.js b/pages/setUserInfo/index.js index eed6acb..891c8cf 100644 --- a/pages/setUserInfo/index.js +++ b/pages/setUserInfo/index.js @@ -70,7 +70,7 @@ Page({ gender: res.data.sex, sexFlag: 2, date: util.fmtDate(parseInt(res.data.birthdate)), - dateFlag: 2, + dateFlag: res.data.birthdate ? 2 : 1, height: res.data.height, weight: res.data.weight, address: adress ? adress.name + '(' + adress.address + ')' : '' diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js index bb397ef..b3b0e8d 100644 --- a/pages/theme/index1/index.js +++ b/pages/theme/index1/index.js @@ -12,7 +12,7 @@ const config = require("../../../config/config"); const QR = require("../../../utils/memberqrcode.js"); const util = require("../../../utils/util"); const bgColor = require("../../../utils/bgColor.js") -// const myPluginInterface = requirePlugin('auto-points-plugin') +const myPluginInterface = requirePlugin('auto-points-plugin') || '' let app = getApp(); Page({ data: { diff --git a/project.private.config.json b/project.private.config.json index f160107..9dec4b6 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -5,5 +5,5 @@ "compileHotReLoad": true, "urlCheck": true }, - "libVersion": "2.27.0" + "libVersion": "2.27.1" } \ No newline at end of file