diff --git a/ext.json b/ext.json index 83e3089..c94ab09 100644 --- a/ext.json +++ b/ext.json @@ -1,74 +1,52 @@ { "ext": { "attr": { - "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" - }, - "imgProxy": [ - { - "newUrl": "https://c.malls.iformall.com/img", - "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" - }, - { - "newUrl": "https://c.malls.iformall.com/img1", - "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" - }, - { - "newUrl": "https://c.malls.iformall.com/img2", - "orgUrl": "https://wx.qlogo.cn" - } - ], - "configUrl": "https://c.malls.iformall.com/C/api", - "ifStoreApp": "0", + "imgProxy": [{ + "newUrl": "https://ctest.malls.iformall.com/img", + "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" + }, { + "newUrl": "https://ctest.malls.iformall.com/img1", + "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" + }, { + "newUrl": "https://ctest.malls.iformall.com/img2", + "orgUrl": "https://wx.qlogo.cn" + }], + "configUrl": "https://ctest.malls.iformall.com/C/api", + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "富茂链客生产版", - "weappId": "wx6a2524a8286d687f", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { - "list": [ - { - "text": "首页", - "iconPath": "assets/images/home.png", - "pagePath": "index/index", - "selectedIconPath": "assets/images/home-a.png" - }, - { - "text": "门店", - "iconPath": "assets/images/mendian.png", - "pagePath": "index/searchbar", - "selectedIconPath": "assets/images/mendian-a.png" - }, - { - "text": "停车", - "iconPath": "assets/images/park.png", - "pagePath": "index/passCar", - "selectedIconPath": "assets/images/park-a.png" - }, - { - "text": "我的", - "iconPath": "assets/images/user.png", - "pagePath": "index/user", - "selectedIconPath": "assets/images/user-a.png" - } - ], - "custom": true + "list": [{ + "text": "首页", + "iconPath": "assets/images/home.png", + "pagePath": "index/index", + "selectedIconPath": "assets/images/home-a.png" + }, { + "text": "门店", + "iconPath": "assets/images/mendian.png", + "pagePath": "index/searchbar", + "selectedIconPath": "assets/images/mendian-a.png" + }, { + "text": "停车", + "iconPath": "assets/images/park.png", + "pagePath": "index/passCar", + "selectedIconPath": "assets/images/park-a.png" + }, { + "text": "我的", + "iconPath": "assets/images/user.png", + "pagePath": "index/user", + "selectedIconPath": "assets/images/user-a.png" + }], + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -82,7 +60,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index f77108d..5b76684 100644 --- a/index/index.js +++ b/index/index.js @@ -408,7 +408,12 @@ Page({ }, getWeapNote: function(couponChannelId, couponId, orderId) { var that = this; + + app.tokenCallback = token => { + + // 登录 + console.log(app.globalData.token) that.getmemberId(app.globalData.token); that.getBannerlist(); that.topicShow(); @@ -431,7 +436,10 @@ Page({ } }) .then(res => { + console.log(33333333333) + console.log(app.globalData.token) console.log(res) + console.log(33333333333) // that.getGameOne(app.globalData.token) that.getStaticGame(app.globalData.token) that.getGg(app.globalData.token) @@ -451,6 +459,7 @@ Page({ showCancel: false }); }); + } }, getStaticGame(token) { diff --git a/project.config.json b/project.config.json index 37c20e3..850364e 100644 --- a/project.config.json +++ b/project.config.json @@ -32,7 +32,7 @@ }, "compileType": "miniprogram", "libVersion": "2.5.0", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "oldC", "isGameTourist": false, "simulatorType": "wechat",