Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
duiba-h5-frame
Project
Project
Details
Activity
Releases
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
江思志
duiba-h5-frame
Commits
9f410c15
Commit
9f410c15
authored
Mar 25, 2019
by
jsz315
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of gitlab2.dui88.com:jiangsizhi/duiba-h5-frame into develop
parents
44081519
e1476e94
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
activityList.json
mock/kjy/mp/content/activityList.json
+1
-1
home.less
src/pages/kejiji/webview/content/page/home.less
+8
-7
home.vue
src/pages/kejiji/webview/content/page/home.vue
+2
-2
No files found.
mock/kjy/mp/content/activityList.json
View file @
9f410c15
...
...
@@ -55,7 +55,7 @@
"head"
:
null
,
"myself"
:
0
,
"notLogin"
:
1
,
"status"
:
1
,
"status"
:
2
,
"sellerCardVO"
:
null
}]
}
\ No newline at end of file
src/pages/kejiji/webview/content/page/home.less
View file @
9f410c15
...
...
@@ -37,7 +37,7 @@
color: #333333;
letter-spacing: 0.44px;
width: 670px;
margin:
32px auto
;
margin:
0 auto 20px
;
font-weight: 600;
position: relative;
.see-more__link{
...
...
@@ -51,7 +51,7 @@
}
.no-bottom{
margin-bottom: 0;
margin-top:
6
0px;
margin-top:
4
0px;
}
.f-shadow{
position: relative;
...
...
@@ -63,8 +63,8 @@
.home{
border-radius: 20px;
width: 670px;
margin: 30px auto
7
0px;
padding
: 16px 0
;
margin: 30px auto
4
0px;
padding
-top: 16px
;
position: relative;
// box-shadow: @shadow;
&.activity{
...
...
@@ -104,7 +104,7 @@
height: 150px;
position: relative;
.pic{
width: 6
2
0px;
width: 6
3
0px;
height: 236px;
position: absolute;
bottom: 0;
...
...
@@ -275,10 +275,9 @@
overflow: hidden;
// border: solid 1px #999;
// box-shadow: @shadow;
padding: 0 10px;
box-sizing: border-box;
.activity__item{
padding: 2
4
px;
padding: 2
0
px;
font-size: 0;
}
p{
...
...
@@ -286,6 +285,8 @@
}
.activity-process{
width: 100%;
display: flex;
justify-content: space-between;
// .title__block{
// height: 40px;
// margin-bottom: 14px;
...
...
src/pages/kejiji/webview/content/page/home.vue
View file @
9f410c15
...
...
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div
class=
"activity-soon duiui-flex duiui-flex--spacebetween"
>
<
!--
<
div
class=
"activity-soon duiui-flex duiui-flex--spacebetween"
>
<div
class=
"activity__item "
v-for=
"item2 in activitLyist.activity_soon"
:key=
"item2.id"
>
<div
@
click=
"goActivitySetting(item2)"
>
<div
class=
"title__block"
>
...
...
@@ -45,7 +45,7 @@
<div
class=
"b-title"
>
{{
item2
.
title
}}
</div>
</div>
</div>
</div>
</div>
-->
</div>
</div>
</section>
...
...
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