| @@ -100,7 +100,6 @@ App({ | |||||
| if (res.data.mall) { | if (res.data.mall) { | ||||
| tt.setStorageSync("selectedMall", res.data.mall.tenantId) | tt.setStorageSync("selectedMall", res.data.mall.tenantId) | ||||
| } | } | ||||
| } | } | ||||
| Http.setToken(res.data.token); | Http.setToken(res.data.token); | ||||
| that.globalData.token = res.data.token | that.globalData.token = res.data.token | ||||
| @@ -110,7 +109,7 @@ App({ | |||||
| } | } | ||||
| }).catch(err => { | }).catch(err => { | ||||
| console.log(err); | |||||
| console.log(err, 'getUserInfo'); | |||||
| tt.showModal({ | tt.showModal({ | ||||
| title: '提示', | title: '提示', | ||||
| showCancel: false, | showCancel: false, | ||||
| @@ -127,9 +126,7 @@ App({ | |||||
| } | } | ||||
| }); | }); | ||||
| }) | }) | ||||
| }), | }), | ||||
| }); | }); | ||||
| } | } | ||||
| }) | }) | ||||
| @@ -1,23 +1,21 @@ | |||||
| { | { | ||||
| "ext": { | "ext": { | ||||
| "attr": { | "attr": { | ||||
| "configUrl": "https://c.malls.iformall.com/C/api" | |||||
| "configUrl": "https://ctest.malls.iformall.com/C/api" | |||||
| }, | }, | ||||
| "name": "吾悦广场", | |||||
| "weappId": "tt48a23e1fd79d648801" | |||||
| "name": "富茂券券集团版", | |||||
| "weappId": "tt620e14b3fd30264101" | |||||
| }, | }, | ||||
| "window": { | "window": { | ||||
| "backgroundTextStyle": "light", | "backgroundTextStyle": "light", | ||||
| "navigationBarTextStyle": "black", | "navigationBarTextStyle": "black", | ||||
| "navigationBarTitleText": "Mini Program", | |||||
| "navigationBarBackgroundColor": "#fff" | "navigationBarBackgroundColor": "#fff" | ||||
| }, | }, | ||||
| "extAppid": "tt48a23e1fd79d648801", | |||||
| "extAppid": "tt620e14b3fd30264101", | |||||
| "extEnable": true, | "extEnable": true, | ||||
| "directCommit": false, | "directCommit": false, | ||||
| "networkTimeout": { | "networkTimeout": { | ||||
| "request": 30000, | "request": 30000, | ||||
| "downloadFile": 10000 | "downloadFile": 10000 | ||||
| }, | |||||
| "requiredPrivateInfos": ["chooseLocation", "getLocation"] | |||||
| } | |||||
| } | } | ||||
| @@ -314,7 +314,7 @@ Page({ | |||||
| console.log(obj, "obj") | console.log(obj, "obj") | ||||
| if (obj.linkType == 1) { | if (obj.linkType == 1) { | ||||
| if (obj.linkUrl == "/pages/game/index") { | if (obj.linkUrl == "/pages/game/index") { | ||||
| this.gotogame() | |||||
| // this.gotogame() | |||||
| } else { | } else { | ||||
| tt.navigateTo({ | tt.navigateTo({ | ||||
| @@ -88,7 +88,6 @@ Page({ | |||||
| }) | }) | ||||
| }, | }, | ||||
| onLoad: function (options) { | onLoad: function (options) { | ||||
| console.log(app.globalData.skip, app.globalData.skipUrl, app.globalData.type, "跳转地址") | console.log(app.globalData.skip, app.globalData.skipUrl, app.globalData.type, "跳转地址") | ||||
| var that = this; | var that = this; | ||||
| // options.fromflag == 'coupondetail'; | // options.fromflag == 'coupondetail'; | ||||
| @@ -504,7 +503,7 @@ Page({ | |||||
| }) | }) | ||||
| }).catch(err => { | }).catch(err => { | ||||
| console.log(err); | |||||
| console.log(err, 'getUserInfo'); | |||||
| tt.showModal({ | tt.showModal({ | ||||
| title: '提示', | title: '提示', | ||||
| showCancel: false, | showCancel: false, | ||||
| @@ -32,7 +32,7 @@ | |||||
| "id": 1678428610317, | "id": 1678428610317, | ||||
| "name": "index/index", | "name": "index/index", | ||||
| "pathName": "pages/main/index", | "pathName": "pages/main/index", | ||||
| "query": "type=scanIn&tenantId=1055", | |||||
| "query": "type=scanIn&tenantId=1032", | |||||
| "scene": "990001", | "scene": "990001", | ||||
| "launchFrom": "scan", | "launchFrom": "scan", | ||||
| "location": "qr_code" | "location": "qr_code" | ||||