Commit 7ab7cb31 by 高淑倩

3001

parent 4d37668c
...@@ -126,8 +126,8 @@ App({ ...@@ -126,8 +126,8 @@ App({
// brandId: 2711, // brandId: 2711,
// brandId: 2005, // brandId: 2005,
// brandId: 1001, // brandId: 1001,
brandId: 1002, // brandId: 1002,
// brandId: 3001, brandId: 3001,
// brandId: 3002, // brandId: 3002,
} }
}) })
...@@ -44,8 +44,8 @@ Component({ ...@@ -44,8 +44,8 @@ Component({
wxService.request({ wxService.request({
url: app.globalData.ctx + '/sale/premium/query', url: app.globalData.ctx + '/sale/premium/query',
header: { header: {
'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试 // 'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token' : 'brand1001', // 开发 // 'tunnel-token' : 'brand1001', // 开发
// 'tunnel-token' : 'brand1002', // 测试 // 'tunnel-token' : 'brand1002', // 测试
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// 组件plus 中数据请求 token 修改 // 组件plus 中数据请求 token 修改
// app.js 中brandId 修改为对应 // app.js 中brandId 修改为对应
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test, 预生产 pre const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const needMock = '' // const needMock = '' //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wx313ec36b710125d4",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
......
...@@ -100,8 +100,8 @@ class Http { ...@@ -100,8 +100,8 @@ class Http {
method: 'GET', method: 'GET',
header: { header: {
// 'tunnel-token' : 'brand1002', // 测试 // 'tunnel-token' : 'brand1002', // 测试
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token' : 'brand1001', // 开发 // 'tunnel-token' : 'brand1001', // 开发
'tentacle-content': this.getTentacle(), 'tentacle-content': this.getTentacle(),
// 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}' // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
...@@ -137,8 +137,8 @@ class Http { ...@@ -137,8 +137,8 @@ class Http {
method: 'POST', method: 'POST',
header: { header: {
// 'tunnel-token' : 'brand1002', // 测试 // 'tunnel-token' : 'brand1002', // 测试
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db41/76465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token' : 'brand1001', // 开发 // 'tunnel-token' : 'brand1001', // 开发
'tentacle-content': this.getTentacle() 'tentacle-content': this.getTentacle()
// 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}' // 'tentacle-content': '{"id":"621346354647797760","tentacleType":3,"tentacleId":"611969009872691200","contentType":1}'
......
...@@ -574,6 +574,7 @@ class WXService extends Http { ...@@ -574,6 +574,7 @@ class WXService extends Http {
const page = this const page = this
_self.initAppGlobalDataSync() _self.initAppGlobalDataSync()
watch.setWatcher(page); watch.setWatcher(page);
// console.log('args ----',args)
//修改参数 //修改参数
let pageIsFromShare = false, id = null; let pageIsFromShare = false, id = null;
args.forEach(item => { args.forEach(item => {
...@@ -591,18 +592,19 @@ class WXService extends Http { ...@@ -591,18 +592,19 @@ class WXService extends Http {
} }
} }
if (item['scene']) { if (item['scene']) {
pageIsFromShare = true;
let idParam = decodeURIComponent(item['scene']).split('&')[0] let idParam = decodeURIComponent(item['scene']).split('&')[0]
console.log('idParam---', idParam)
let shareId = idParam && idParam.split('=')[1] || 0 let shareId = idParam && idParam.split('=')[1] || 0
item['id'] = Integer.digit(shareId, 64, 10) item['id'] = Integer.digit(shareId, 64, 10)
console.log('idParam', idParam) id = Integer.digit(shareId, 64, 10);
console.log('shareId', shareId)
console.log('id', item['id'])
} }
}); });
//如果打开的是分享界面则进行触点对象信息请求并存储到本地 放到后续的header中 //如果打开的是分享界面则进行触点对象信息请求并存储到本地 放到后续的header中
if (pageIsFromShare) { if (pageIsFromShare) {
//调用接口 //调用接口
console.log(id)
_self.getTentacleContentByTentacleId(id); _self.getTentacleContentByTentacleId(id);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment