@@ -21,13 +21,13 @@ Component({ | |||||
}, | }, | ||||
back: { | back: { | ||||
type: Boolean, | type: Boolean, | ||||
value: false | |||||
value: true | |||||
}, | }, | ||||
home: { | home: { | ||||
type: Boolean, | type: Boolean, | ||||
value: false | value: false | ||||
}, | }, | ||||
}, | }, | ||||
data: { | data: { | ||||
@@ -37,7 +37,7 @@ Component({ | |||||
navigationBarHeight: (app.statusBarHeight + 44) + 'px', | navigationBarHeight: (app.statusBarHeight + 44) + 'px', | ||||
}, | }, | ||||
methods: { | methods: { | ||||
backHome: function () { | backHome: function () { | ||||
let url = app.globalData.goHomeUrl | let url = app.globalData.goHomeUrl | ||||
wx.switchTab({ | wx.switchTab({ | ||||
@@ -56,8 +56,8 @@ Component({ | |||||
}) | }) | ||||
} | } | ||||
}, | }, | ||||
attached: function(){ | |||||
attached: function () { | |||||
let pages = getCurrentPages(); | let pages = getCurrentPages(); | ||||
if (pages.length <= 1) { | if (pages.length <= 1) { | ||||
this.setData({ | this.setData({ | ||||
@@ -1,33 +1,47 @@ | |||||
{ | { | ||||
"ext": { | "ext": { | ||||
"attr": { | "attr": { | ||||
"mchId": "1602801645", | |||||
"car": { | |||||
"tjd": { | |||||
"payPath": "", | |||||
"tjdAppId": "wx6945d1bda68d7993" | |||||
}, | |||||
"etcp": { | |||||
"payPath": "pages/pay/order-pay-open/main", | |||||
"etcpAppId": "wxc07f9d67923d676d", | |||||
"etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
}, | |||||
"bolink": { | |||||
"payPath": "pages/park/park", | |||||
"bolinkAppId": "wxbd08b4baa10fcc1d" | |||||
}, | |||||
"version": "release" | |||||
}, | |||||
"mchId": "1623869862", | |||||
"imgProxy": [ | "imgProxy": [ | ||||
{ | { | ||||
"newUrl": "https://ctest.malls.iformall.com/img", | |||||
"newUrl": "https://c.malls.iformall.com/img", | |||||
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | ||||
}, | }, | ||||
{ | { | ||||
"newUrl": "https://ctest.malls.iformall.com/img1", | |||||
"newUrl": "https://c.malls.iformall.com/img1", | |||||
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | ||||
}, | }, | ||||
{ | { | ||||
"newUrl": "https://ctest.malls.iformall.com/img2", | |||||
"newUrl": "https://c.malls.iformall.com/img2", | |||||
"orgUrl": "https://wx.qlogo.cn" | "orgUrl": "https://wx.qlogo.cn" | ||||
} | } | ||||
], | ], | ||||
"configUrl": "https://ctest.malls.iformall.com/C/api", | |||||
"etcpAppId": "wx219a81b9c87aa4f7", | |||||
"etcpVersion": "release", | |||||
"businessSwitch": "0", | |||||
"configUrl": "https://c.malls.iformall.com/C/api", | |||||
"ifStoreApp": "0", | |||||
"businessSwitch": "1", | |||||
"businessVersion": "1", | "businessVersion": "1", | ||||
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
"ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
"ifHaveCarModular": "1" | |||||
"ifHaveCarModular": "0" | |||||
}, | }, | ||||
"name": "富茂光谷测试版", | |||||
"weappId": "wx219a81b9c87aa4f7", | |||||
"appVersion": "C.test.5.2.0" | |||||
"name": "泊悦茂邻荟", | |||||
"weappId": "wx34aa0a9a9a55b810", | |||||
"appVersion": "C.5.1.1" | |||||
}, | }, | ||||
"debug": false, | "debug": false, | ||||
"tabBar": { | "tabBar": { | ||||
@@ -63,8 +77,7 @@ | |||||
"selectedIconPath": "assets/images/user-a.png" | "selectedIconPath": "assets/images/user-a.png" | ||||
} | } | ||||
], | ], | ||||
"color": "#abb1be", | |||||
"selectedColor": "#b2743d" | |||||
"custom": true | |||||
}, | }, | ||||
"window": { | "window": { | ||||
"backgroundTextStyle": "dark", | "backgroundTextStyle": "dark", | ||||
@@ -82,7 +95,7 @@ | |||||
"provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
} | } | ||||
}, | }, | ||||
"extAppid": "wx219a81b9c87aa4f7", | |||||
"extAppid": "wx34aa0a9a9a55b810", | |||||
"extEnable": true, | "extEnable": true, | ||||
"permission": { | "permission": { | ||||
"scope.userLocation": { | "scope.userLocation": { | ||||
@@ -3,7 +3,7 @@ console.log(extConfig, 'extConfig'); | |||||
let ifStoreApp = extConfig.attr.ifStoreApp; | let ifStoreApp = extConfig.attr.ifStoreApp; | ||||
let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false | let businessSwitch = 1 * extConfig.attr.businessSwitch ? extConfig.attr.businessSwitch : false | ||||
console.log(businessSwitch, 'businessSwitch'); | console.log(businessSwitch, 'businessSwitch'); | ||||
let businessVersion = extConfig.attr.businessVersion | |||||
let businessVersion = 1 * extConfig.attr.businessVersion | |||||
let mch_id = extConfig.attr.mchId | let mch_id = extConfig.attr.mchId | ||||
const navigationBarHeight = (getApp().statusBarHeight + 44) + "px" | const navigationBarHeight = (getApp().statusBarHeight + 44) + "px" | ||||
const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
@@ -629,6 +629,7 @@ Page({ | |||||
console.log(res.status, 'member_status') | console.log(res.status, 'member_status') | ||||
}) | }) | ||||
if (businessVersion) { | if (businessVersion) { | ||||
console.log(this.data.mch_id, 'this.data.mch_id'); | |||||
this.setData({ | this.setData({ | ||||
goUrl: `plugin://auto-points-plugin/index?openid=${openId}&mch_id=${this.data.mch_id}&member_status=${1}` | goUrl: `plugin://auto-points-plugin/index?openid=${openId}&mch_id=${this.data.mch_id}&member_status=${1}` | ||||
}) | }) | ||||
@@ -33,7 +33,7 @@ | |||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.11.2", | "libVersion": "2.11.2", | ||||
"appid": "wxfa336cad86ed598d", | |||||
"appid": "wx453ae0d37f3550d0", | |||||
"projectname": "C", | "projectname": "C", | ||||
"simulatorType": "wechat", | "simulatorType": "wechat", | ||||
"simulatorPluginLibVersion": {}, | "simulatorPluginLibVersion": {}, | ||||
@@ -4,5 +4,5 @@ | |||||
"setting": { | "setting": { | ||||
"compileHotReLoad": true | "compileHotReLoad": true | ||||
}, | }, | ||||
"libVersion": "2.26.2" | |||||
"libVersion": "2.27.0" | |||||
} | } |