Commit 1bcc71f3da6f2d746b1bbf111085662a602f08ff
Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…
….com/w-front-end/select_good into version_2.0.0_optimization_mall_update
Showing
2 changed files
with
12 additions
and
2 deletions
src/components/goodsItem_7/goodsItem_7.less
| @@ -76,6 +76,9 @@ | @@ -76,6 +76,9 @@ | ||
| 76 | text-overflow: ellipsis; | 76 | text-overflow: ellipsis; |
| 77 | overflow: hidden; | 77 | overflow: hidden; |
| 78 | } | 78 | } |
| 79 | + .grey-title{ | ||
| 80 | + font-size: 36px; | ||
| 81 | + } | ||
| 79 | .coupon-box { | 82 | .coupon-box { |
| 80 | display: inline; | 83 | display: inline; |
| 81 | margin-top: 8px; | 84 | margin-top: 8px; |
| @@ -126,9 +129,16 @@ | @@ -126,9 +129,16 @@ | ||
| 126 | line-height: 50px; | 129 | line-height: 50px; |
| 127 | display: flex; | 130 | display: flex; |
| 128 | align-items: center; | 131 | align-items: center; |
| 132 | + /**红色字*/ | ||
| 133 | + .num{ | ||
| 134 | + font-size: 36px; | ||
| 135 | + font-weight: 500; | ||
| 136 | + color: #FC1541; | ||
| 137 | + } | ||
| 129 | /**健康商城商品颜色*/ | 138 | /**健康商城商品颜色*/ |
| 130 | .grey-box{ | 139 | .grey-box{ |
| 131 | color: #3EB781; | 140 | color: #3EB781; |
| 141 | + font-size: 36px; | ||
| 132 | } | 142 | } |
| 133 | span { | 143 | span { |
| 134 | font-size: 24px; | 144 | font-size: 24px; |
src/components/goodsItem_7/goodsItem_7.vue
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <slot name="flag"></slot> | 18 | <slot name="flag"></slot> |
| 19 | </div> | 19 | </div> |
| 20 | <div class="content-box"> | 20 | <div class="content-box"> |
| 21 | - <div class="title">{{item.title}}</div> | 21 | + <div class="title" :class="{'grey-title':company == 2}">{{item.title}}</div> |
| 22 | <!-- <div class="coupon-box"> | 22 | <!-- <div class="coupon-box"> |
| 23 | 满180减10 | 23 | 满180减10 |
| 24 | </div> --> | 24 | </div> --> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | </div> | 28 | </div> |
| 29 | <!-- 积分 --> | 29 | <!-- 积分 --> |
| 30 | <div v-else-if="company == 1 || company == 2" class="grade-box" > | 30 | <div v-else-if="company == 1 || company == 2" class="grade-box" > |
| 31 | - <span :class="{'grey-box':company == 2}">{{item.num}}</span> | 31 | + <span class="num" :class="{'grey-box':company == 2}">{{item.num}}</span> |
| 32 | <span v-if="company==1">积分</span><span v-else>健康值</span> | 32 | <span v-if="company==1">积分</span><span v-else>健康值</span> |
| 33 | </div> | 33 | </div> |
| 34 | <!-- 价格 --> | 34 | <!-- 价格 --> |