Skip to content

M
mr-julyedu
Commit 271e4d14 by zhanghaozhe
Options

ui调整

parent e3a1e440
Showing with 333 additions and 281 deletions
src/assets/css/index.scss
......@@ -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
......@@ -6,7 +6,7 @@
text-align: center;
i {
font-size: 18px !important;
font-size: 22px !important;
}
i:nth-of-type(1) {
......
src/common/Tag/tag.scss
.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: 11px;
font-size: 12px;
padding: 4px 10px;
border-radius: 14px;
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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
.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
html, body, #root {
height: 100%!important;
height: 100% !important;
}
.cart-page {
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
.cart-tip {
color: #555;
margin-top: 140px;
text-align: center;
.iconfridge {
font-size: 21px;
}
.cart-mess {
font-size: 12px;
color: $color_666;
}
a {
display: inline-block;
font-size: 16px;
margin-top: 40px;
color: $active;
}
}
.edit {
padding-right: 10px;
font-size: 14px;
}
.cart-body {
height: 100%;
flex: 1;
margin-bottom: 50px;
width: 100%;
display: flex;
background-color: $bg_f5f5f5;
overflow-y: auto;
position: relative;
.cart-main {
width: 100%;
flex-direction: column;
> .am-list-item {
border-bottom: 1px solid #eee;
.cart-tip {
color: #555;
margin-top: 140px;
text-align: center;
.am-list-line::after {
background-color: transparent;
.iconfridge {
font-size: 21px;
}
}
> .am-list-item.am-list-item-active {
background-color: transparent;
}
.cart-c-title {
display: flex;
align-items: center;
justify-content: space-between;
> div {
flex: 1;
.cart-mess {
font-size: 12px;
color: $color_666;
}
span {
font-size: 14px;
margin-left: 10px;
a {
display: inline-block;
font-size: 16px;
margin-top: 40px;
color: $active;
}
}
.next {
width: 14px;
height: 14px;
display: inline-block;
margin-left: 10px;
}
.edit {
padding-right: 10px;
font-size: 14px;
}
i {
font-style: inherit;
font-size: 14px;
display: block;
padding: 0 10px;
}
}
.cart-body {
height: 100%;
flex: 1;
margin-bottom: 50px;
display: flex;
background-color: $bg_f5f5f5;
overflow-y: auto;
position: relative;
.cart-c-body {
.am-list-item-active {
background-color: transparent;
}
.cart-main {
width: 100%;
.am-list-line {
padding-right: 0px;
}
> .am-list-item {
border-bottom: 1px solid #eee;
.am-list-content {
position: relative;
}
.am-list-line::after {
background-color: transparent;
}
}
.cart-c-item {
overflow: hidden;
margin: 8px 0;
height: 120px;
padding: 15px 15px 15px 12px;
background-color: $white;
> .am-list-item.am-list-item-active {
background-color: transparent;
}
.cart-c-check {
width: 30px;
float: left;
display: flex;
align-items: center;
height: 100%;
}
}
.cart-c-title {
display: flex;
align-items: center;
justify-content: space-between;
> div {
flex: 1;
}
span {
font-size: 14px;
margin-left: 10px;
}
.next {
width: 14px;
height: 14px;
display: inline-block;
margin-left: 10px;
}
i {
font-style: inherit;
font-size: 14px;
display: block;
padding: 0 10px;
}
}
.cart-ci-left {
position: absolute;
top: 0;
left: 40px;
height: 100%;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
img {
height: 85px;
width: 85px;
display: block;
border: 1px solid #eee;
}
.cart-c-body {
.am-list-item-active {
background-color: transparent;
}
.am-list-line {
padding-right: 0px;
}
.am-list-content {
position: relative;
}
.cart-c-item {
overflow: hidden;
margin: 8px 0;
height: 120px;
padding: 15px 15px 15px 12px;
background-color: $white;
.cart-c-check {
width: 30px;
float: left;
display: flex;
align-items: center;
height: 100%;
}
}
.cart-ci-left {
position: absolute;
top: 0;
left: 40px;
height: 100%;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
img {
height: 85px;
width: 85px;
display: block;
border: 1px solid #eee;
}
}
.cart-ci-right {
min-height: 87px;
margin-left: 135px;
margin-right: 8px;
.am-stepper-handler {
line-height: 28px;
font-size: 14px;
width: 26px;
height: 26px;
display: flex;
justify-content: center;
align-items: center;
}
.r-title {
font-size: 15px;
white-space: normal;
font-weight: bold;
overflow: hidden;
max-height: 46px;
span {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
/* autoprefixer: ignore next */
-webkit-box-orient: vertical;
white-space: inherit;
-webkit-line-clamp: 2;
}
}
.r-step {
display: flex;
justify-content: space-between;
.r-price {
color: #ff5b05;
font-size: 14px;
line-height: 30px;
span {
font-size: 12px;
}
}
.span-stepper {
width: 100px;
}
.am-stepper-input {
font-size: 12px;
}
}
}
}
}
}
.cart-ci-right {
min-height: 87px;
margin-left: 135px;
margin-right: 8px;
.cart-footer {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
display: flex;
justify-content: space-between;
background-color: rgba(255, 255, 255, 1);
height: 50px;
.am-stepper-handler {
line-height: 28px;
font-size: 14px;
width: 26px;
height: 26px;
.cart-label {
display: flex;
justify-content: center;
align-items: center;
}
}
.r-title {
font-size: 15px;
white-space: normal;
font-weight: bold;
overflow: hidden;
max-height: 46px;
& > div:nth-child(1) {
text-align: center;
height: 50px;
line-height: 50px;
padding-left: 12px;
span {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
/* autoprefixer: ignore next */
-webkit-box-orient: vertical;
white-space: inherit;
-webkit-line-clamp: 2;
div {
font-size: $font_16;
color: $color_333;
margin-left: 6px;
}
}
}
.r-step {
.all-pirce {
flex: 1;
margin-right: 20px;
display: flex;
justify-content: space-between;
.r-price {
color: #ff5b05;
font-size: 14px;
line-height: 30px;
span {
font-size: 12px;
}
}
.span-stepper {
width: 100px;
}
align-items: center;
.am-stepper-input {
font-size: 12px;
p {
margin: 0;
padding: 0;
font-size: $font_16;
text-align: right;
width: 100%;
span {
color: $color_666;
font-size: $font_14;
}
span:nth-child(2) {
color: $red;
}
}
}
}
}
}
}
.cart-footer {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
display: flex;
justify-content: space-between;
border-top: 1px solid #eee;
background-color: rgba(255, 255, 255, 1);
height: 50px;
.cart-label {
display: flex;
}
& > div:nth-child(1) {
text-align: center;
height: 50px;
line-height: 50px;
padding-left: 12px;
div {
font-size: $font_16;
color: $color_333;
margin-left: 6px;
}
}
& > div:nth-child(3) {
width: 100px;
line-height: 50px;
text-align: center;
font-size: $font_16;
background-color: #999;
color: $white;
.all-pirce {
flex: 1;
margin-right: 20px;
display: flex;
align-items: center;
p {
margin: 0;
padding: 0;
font-size: $font_16;
text-align: right;
width: 100%;
span {
color: $color_666;
font-size: $font_14;
span {
font-size: 16px;
font-weight: 400;
}
}
span:nth-child(2) {
color: $red;
div.active {
background-color: #ff3131;
color: #fff;
}
}
}
& > div:nth-child(3) {
width: 100px;
line-height: 50px;
text-align: center;
font-size: $font_16;
background-color: $bg_ff3131;
color: $white;
span {
font-size: 16px;
font-weight: 400;
}
}
div.active {
background-color: #ff5b05;
color: #fff;
.am-navbar-light {
background-color: $bg_f7f9fc;
}
}
.am-navbar-light {
background-color: $bg_f7f9fc;
}
}
src/components/study/study.scss
......@@ -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 {
......
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