Commit 34d4f9e2 by 高淑倩

种草截图

parent fa6b1e5d
...@@ -47,6 +47,7 @@ Component({ ...@@ -47,6 +47,7 @@ Component({
'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试 'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD' // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token' : 'brand1001', // 开发 // 'tunnel-token' : 'brand1001', // 开发
// 'tunnel-token' : 'brand1002', // 测试
}, },
success: (res) => { success: (res) => {
const { result, data } = res.data const { result, data } = res.data
......
...@@ -21,20 +21,18 @@ Component({ ...@@ -21,20 +21,18 @@ Component({
type: { type: {
type: Number, type: Number,
value: [], value: [],
},
urlBase: {
type: String,
value: '',
} }
}, },
attached() {
this.setData({
baseImgUrl: app.globalData.imageUrl
})
},
/** /**
* 组件的初始数据 * 组件的初始数据
*/ */
data: { data: {
// imageheight: 0 // imageheight: 0
userIsLogin: false, userIsLogin: false
baseImgUrl: '',
}, },
observers: { observers: {
'**': function (e) { '**': function (e) {
...@@ -44,15 +42,7 @@ Component({ ...@@ -44,15 +42,7 @@ Component({
this.setData({ this.setData({
userIsLogin: val userIsLogin: val
}) })
}, }
baseImgUrl(e) {
console.log('eeeee', e)
// this.setData({
// baseImgUrl:e
// })
},
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<view class="water-wrap {{type == 2 ? 'release-water' : ''}}"> <view class="water-wrap {{type == 2 ? 'release-water' : ''}}">
<view class="left"> <view class="left">
<block wx:for="{{imageData}}" wx:key=""> <block wx:for="{{imageData}}" wx:key="">
<template is="water-list" data="{{...item}}" wx:if="{{index%2==0}}" /> <template is="water-list" data="{{...item,urlBase}}" wx:if="{{index%2==0}}" />
</block> </block>
</view> </view>
<view class="right"> <view class="right">
<block wx:for="{{imageData}}" wx:key=""> <block wx:for="{{imageData}}" wx:key="">
<template is="water-list" data="{{...item}}" wx:if="{{index%2==1}}" /> <template is="water-list" data="{{...item, urlBase}}" wx:if="{{index%2==1}}" />
</block> </block>
</view> </view>
</view> </view>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> </view>
<image <image
class="item-img" class="item-img"
src="{{utils.formateUrl(url,baseImgUrl)}}" src="{{utils.formateUrl(url,urlBase)}}"
data-id="{{id}}" data-id="{{id}}"
mode="widthFix" mode="widthFix"
bindload="imageLoad" bindload="imageLoad"
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
"id": 13, "id": 13,
"name": "subPage", "name": "subPage",
"pathName": "subPackage/page/pages/subPage/subPage", "pathName": "subPackage/page/pages/subPage/subPage",
"query": "pageId= 15", "query": "pageId=26",
"scene": null "scene": null
}, },
{ {
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<water-flow-layout <water-flow-layout
type="2" type="2"
image-data="{{contentList}}" image-data="{{contentList}}"
url-base="{{baseImgUrl}}"
bind:updataLike="gotoLike" bind:updataLike="gotoLike"
bind:_onTapShare="_onTapShare" bind:_onTapShare="_onTapShare"
/> />
......
...@@ -99,6 +99,7 @@ class Http { ...@@ -99,6 +99,7 @@ class Http {
url, url,
method: 'GET', method: 'GET',
header: { header: {
// 'tunnel-token' : 'brand1002', // 测试
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// 'tunnel-token' : 'brand1001', // 开发 // 'tunnel-token' : 'brand1001', // 开发
...@@ -135,8 +136,9 @@ class Http { ...@@ -135,8 +136,9 @@ class Http {
url, url,
method: 'POST', method: 'POST',
header: { header: {
// 'tunnel-token' : 'brand1002', // 测试
'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 // 'tunnel-token' : 'd6db651f8b9c7db41/76465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产
// '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}'
......
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