Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
dfa04567
Commit
dfa04567
authored
Sep 06, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zyw-sc' into 'dev_7.1.0'
Feature zyw sc See merge request
!117
parents
0cce0dd7
86189b5c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
waterFlowLayout.wxss
src/component/waterFlowLayout/waterFlowLayout.wxss
+1
-0
grassCommunity.js
src/subPackage/page/pages/grassCommunity/grassCommunity.js
+2
-2
No files found.
src/component/waterFlowLayout/waterFlowLayout.wxss
View file @
dfa04567
...
...
@@ -12,6 +12,7 @@ page{
width: 349.86rpx;
border-radius: 10rpx;
box-shadow: 0px 2px 5px 0px rgba(199, 199, 199, 0.5);
background-color: #ffffff;
}
.item-ava{
...
...
src/subPackage/page/pages/grassCommunity/grassCommunity.js
View file @
dfa04567
...
...
@@ -67,11 +67,11 @@ wxService.page({
})
for
(
var
i
in
data
.
sspList
){
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
){
this
.
setData
({
video
:
app
.
globalData
.
imageUrl
+
data
.
sspList
[
i
].
videoUrl
video
:
data
.
sspList
[
i
].
videoUrl
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment