Skip to content

7
7-Eleven
Commit dfa04567 by 赵雅纹
Options

Merge branch 'feature-zyw-sc' into 'dev_7.1.0' 

Feature zyw sc

See merge request !117
parents 0cce0dd7 86189b5c
Showing with 3 additions and 2 deletions
src/component/waterFlowLayout/waterFlowLayout.wxss
...@@ -12,6 +12,7 @@ page{ ...@@ -12,6 +12,7 @@ page{
width: 349.86rpx; width: 349.86rpx;
border-radius: 10rpx; border-radius: 10rpx;
box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5); box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
background-color: #ffffff;
} }
.item-ava{ .item-ava{
......
src/subPackage/page/pages/grassCommunity/grassCommunity.js
...@@ -67,11 +67,11 @@ wxService.page({ ...@@ -67,11 +67,11 @@ wxService.page({
}) })
for (var i in data.sspList){ for (var i in data.sspList){
if (data.sspList[i].url){ if (data.sspList[i].url){
this.data.pics.push(app.globalData.imageUrl + data.sspList[i].url) this.data.pics.push(data.sspList[i].url)
} }
if (data.sspList[i].videoUrl){ if (data.sspList[i].videoUrl){
this.setData({ this.setData({
video: app.globalData.imageUrl + data.sspList[i].videoUrl video: data.sspList[i].videoUrl
}) })
} }
} }
......
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