Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
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
baiguangyao
mr-julyedu
Commits
271e4d14
Commit
271e4d14
authored
Aug 21, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ui调整
parent
e3a1e440
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
103 additions
and
51 deletions
+103
-51
src/assets/css/index.scss
+16
-1
src/common/HeaderBar/index.scss
+1
-1
src/common/Tag/tag.scss
+7
-5
src/components/Index/index.scss
+2
-1
src/components/detail/outline/index.js
+2
-1
src/components/detail/outline/index.scss
+1
-3
src/components/myOrders/index.scss
+1
-1
src/components/order/order.scss
+11
-1
src/components/order/payOrder/PayOrder.scss
+7
-1
src/components/purchased/index.scss
+1
-1
src/components/search/search-result.scss
+1
-1
src/components/search/search_header.scss
+52
-33
src/components/shopCart/card.scss
+0
-0
src/components/study/study.scss
+1
-1
No files found.
src/assets/css/index.scss
View file @
271e4d14
...
...
@@ -73,7 +73,8 @@ body {
line-height
:
1
.5
;
color
:
$body-color
;
background-color
:
$body-bg
;
font-size
:
0
.24rem
;
//font-size: 0.24rem;
font-size
:
12px
;
padding-bottom
:
constant
(
safe-area-inset-bottom
);
}
...
...
@@ -497,4 +498,17 @@ input[type="radio"]:checked:before {
line-height
:
24px
;
color
:
#333333
;
font-weight
:
600
;
}
.am-modal-button-group-h
{
.am-modal-button
{
font-size
:
15px
;
}
}
.am-modal-alert-content
,
.am-modal-propmt-content
{
color
:
#333
;
font-size
:
15px
;
}
\ No newline at end of file
src/common/HeaderBar/index.scss
View file @
271e4d14
...
...
@@ -6,7 +6,7 @@
text-align
:
center
;
i
{
font-size
:
18
px
!
important
;
font-size
:
22
px
!
important
;
}
i
:nth-of-type
(
1
)
{
...
...
src/common/Tag/tag.scss
View file @
271e4d14
.tagLately
,
.tagHot
{
.tagLately
,
.tagHot
{
display
:
block
;
max-width
:
100%
;
overflow
:
hidden
;
margin-right
:
10px
;
margin-bottom
:
10px
;
font-size
:
12px
;
padding
:
4px
10px
;
border-radius
:
1
1
px
;
font-size
:
12px
;
padding
:
4px
10px
;
border-radius
:
1
4
px
;
float
:
left
;
background-color
:
#F5F5F5
;
line-height
:
20px
;
color
:
#666
;
}
.tagHot
{
.tagHot
{
color
:
#333
;
}
\ No newline at end of file
src/components/Index/index.scss
View file @
271e4d14
...
...
@@ -37,7 +37,7 @@
}
.index-swiper
{
margin-top
:
7px
;
//
margin-top: 7px;
height
:
168px
;
.swiper-container
{
...
...
@@ -203,6 +203,7 @@
width
:
100px
;
height
:
72px
;
margin-right
:
8px
;
border-radius
:
3px
;
}
.item-content
.item-title
,
.item-teacher
,
.item-time
{
...
...
src/components/detail/outline/index.js
View file @
271e4d14
...
...
@@ -123,7 +123,8 @@ class OutLine extends Component {
{
// 返现课程 是返现课程 未开课 已开课 是返现课程 未开课 已开课 已练习
introduce
.
is_aist
&&
(
!
item
.
is_open
||
introduce
.
is_baoming
===
0
)
&&
<
i
className
=
'aist aist_close'
><
/i
>
<
i
className
=
'aist iconfont iconiconfront-74'
><
/i
>
}
<
/h2
>
{
...
...
src/components/detail/outline/index.scss
View file @
271e4d14
...
...
@@ -142,10 +142,8 @@
}
.aist
{
display
:
inline-block
;
position
:
absolute
;
width
:
22px
;
height
:
22px
;
line-height
:
33px
;
right
:
22px
;
top
:
50%
;
transform
:
translateY
(
-50%
);
...
...
src/components/myOrders/index.scss
View file @
271e4d14
...
...
@@ -84,7 +84,7 @@
.cancel
{
color
:
$color_333
;
border
:
1px
solid
$bg_
333
;
border
:
1px
solid
$bg_
999
;
margin-right
:
15px
;
}
...
...
src/components/order/order.scss
View file @
271e4d14
...
...
@@ -156,7 +156,6 @@
.order-bar-text
{
flex
:
1
;
font-weight
:
500
;
text-align
:
right
;
color
:
#323233
;
padding-right
:
20px
;
...
...
@@ -206,6 +205,11 @@
}
.order-prefer
{
.am-list-body
{
&
:
:
after
{
display
:
none
;
}
}
.am-list-content
{
font-size
:
15px
!
important
;
}
...
...
@@ -231,6 +235,12 @@
.am-list-content
.iconiconfront-22.question-mark
{
font-size
:
24px
;
}
.am-list-body
{
&
:
:
before
,
&::
after
{
display
:
none
;
}
}
.balance-used
{
font-size
:
24px
;
color
:
#0099FF
;
...
...
src/components/order/payOrder/PayOrder.scss
View file @
271e4d14
...
...
@@ -21,6 +21,12 @@
}
.pay-type-list
{
.am-list-body
{
&
:
:
after
{
display
:
none
;
}
}
.am-list-header
{
color
:
#333333
;
font-size
:
15px
;
...
...
@@ -124,6 +130,7 @@
.am-list-item
.am-list-line
.am-list-extra
{
flex-basis
:
16%
;
}
.am-radio-inner
{
width
:
20px
;
height
:
20px
;
...
...
@@ -186,7 +193,6 @@
.v-list-item
{
padding
:
10px
15px
;
background-color
:
#fff
;
border-bottom
:
1px
solid
#e7eaf1
;
.content
{
border
:
none
;
...
...
src/components/purchased/index.scss
View file @
271e4d14
...
...
@@ -4,7 +4,7 @@ html, body, #root {
.purchased-box
{
width
:
100%
;
height
:
100%
;
background-color
:
$bg_f5f5f5
;
//
background-color: $bg_f5f5f5;
.tip
{
...
...
src/components/search/search-result.scss
View file @
271e4d14
...
...
@@ -51,7 +51,7 @@
color
:
$color_666
;
padding
:
30px
0
;
text-align
:
center
;
background-color
:
$bg_ccc
;
background-color
:
#f5f5f5
;
}
.status
{
...
...
src/components/search/search_header.scss
View file @
271e4d14
.search-head
{
height
:
44px
;
display
:
flex
;
background-color
:
#F7F9FC
;
border-bottom
:
1px
solid
#eee
;
.left
{
width
:
44px
;
height
:
44px
;
line-height
:
44px
;
.search-head
{
height
:
44px
;
display
:
flex
;
background-color
:
#F7F9FC
;
border-bottom
:
1px
solid
#eee
;
.left
{
width
:
44px
;
height
:
44px
;
line-height
:
44px
;
text-align
:
center
;
img
{
width
:
14px
;
height
:
14px
;
img
{
width
:
14px
;
height
:
14px
;
display
:
block
;
padding
:
15px
;
padding
:
15px
;
}
}
.center
{
.center
{
flex
:
1
;
.am-search
{
.am-search
{
background-color
:
#F7F9FC
;
.am-search-input
{
background-color
:
#EBEFF5
;
border-radius
:
44px
;
.am-search-input
{
background
:
#F0F2F6
;
border-radius
:
44px
;
}
}
.am-search-start
{
.am-search-input
{
background
:
#fff
;
border-radius
:
44px
;
}
}
}
.right
{
width
:
44px
;
height
:
44px
;
line-height
:
44px
;
.am-icon-md
{
padding
:
11px
;
.right
{
width
:
44px
;
height
:
44px
;
line-height
:
44px
;
.am-icon-md
{
padding
:
11px
;
}
}
.right-btn
{
width
:auto
;
.submit-btn
{
.right-btn
{
width
:
auto
;
.submit-btn
{
line-height
:
30px
;
border
:
0
;
height
:
30px
;
margin
:
7px
0px
;
border
:
0
;
height
:
30px
;
margin
:
7px
0px
;
padding
:
0
12px
;
margin-left
:
0
;
border-radius
:
3px
;
margin-left
:
0
;
border-radius
:
3px
;
font-size
:
$font_14
;
color
:
$color_333
;
}
}
}
.am-search
{
.am-search
{
height
:
43px
;
padding
:
0
;
}
\ No newline at end of file
src/components/shopCart/card.scss
View file @
271e4d14
This diff is collapsed.
Click to expand it.
src/components/study/study.scss
View file @
271e4d14
...
...
@@ -36,7 +36,7 @@ html, body, #root {
flex
:
1
1
auto
;
overflow-y
:
auto
;
box-sizing
:
border-box
;
background
:
$bg_f5f5f5
;
//
background: $bg_f5f5f5;
}
.active
{
...
...
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