Commit afc260dcfaf387190d7de14e0215fd63a7284af4
1 parent
2dd758aa
等级卡修改
Showing
3 changed files
with
26 additions
and
9 deletions
components/goods_list/goods_list.wxml
| @@ -88,12 +88,12 @@ | @@ -88,12 +88,12 @@ | ||
| 88 | </view> | 88 | </view> |
| 89 | <view class="flex" style="line-height: 28rpx;"> | 89 | <view class="flex" style="line-height: 28rpx;"> |
| 90 | <!-- 等级价 --> | 90 | <!-- 等级价 --> |
| 91 | - <view class="price flex ai_and"> | ||
| 92 | - <view class="fs22">￥</view> | ||
| 93 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 94 | - <view class="card_bg"> | ||
| 95 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 96 | - </view> | 91 | + <view class="price flex ai_and"> |
| 92 | + <view class="fs22">￥</view> | ||
| 93 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 94 | + <view class="card_bg ellipsis-1"> | ||
| 95 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
| 96 | + </view> | ||
| 97 | </view> | 97 | </view> |
| 98 | </block> | 98 | </block> |
| 99 | <block wx:else> | 99 | <block wx:else> |
components/goods_list/goods_list.wxss
| @@ -37,6 +37,20 @@ | @@ -37,6 +37,20 @@ | ||
| 37 | align-items: center; | 37 | align-items: center; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | +.ellipsis-1 { | ||
| 41 | + overflow: hidden; | ||
| 42 | + white-space: nowrap; | ||
| 43 | + text-overflow: ellipsis; | ||
| 44 | +} | ||
| 45 | + | ||
| 46 | +/* .ellipsis-1x { | ||
| 47 | + overflow: hidden; | ||
| 48 | + text-overflow: ellipsis; | ||
| 49 | + display: -webkit-box; | ||
| 50 | + -webkit-box-orient: vertical; | ||
| 51 | + -webkit-line-clamp: 1; | ||
| 52 | +} */ | ||
| 53 | + | ||
| 40 | .xc-wc { | 54 | .xc-wc { |
| 41 | color: #d60021; | 55 | color: #d60021; |
| 42 | } | 56 | } |
| @@ -167,17 +181,19 @@ | @@ -167,17 +181,19 @@ | ||
| 167 | } | 181 | } |
| 168 | 182 | ||
| 169 | .card_bg { | 183 | .card_bg { |
| 170 | - display: flex; | 184 | + box-sizing: border-box; |
| 185 | + /* display: flex; */ | ||
| 171 | padding: 2rpx 10rpx; | 186 | padding: 2rpx 10rpx; |
| 172 | height: 25rpx; | 187 | height: 25rpx; |
| 173 | - align-items: center; | 188 | + /* align-items: center; */ |
| 174 | border-radius: 26rpx; | 189 | border-radius: 26rpx; |
| 175 | font-size: 19rpx; | 190 | font-size: 19rpx; |
| 176 | line-height: 1em; | 191 | line-height: 1em; |
| 177 | /* max-width: 110rpx; */ | 192 | /* max-width: 110rpx; */ |
| 193 | + max-width: 220rpx; | ||
| 178 | background: #333; | 194 | background: #333; |
| 179 | color: #fff; | 195 | color: #fff; |
| 180 | - justify-content: center; | 196 | + /* justify-content: center; */ |
| 181 | margin-left: 8rpx; | 197 | margin-left: 8rpx; |
| 182 | } | 198 | } |
| 183 | 199 |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -2549,6 +2549,7 @@ border-radius: 55rpx; | @@ -2549,6 +2549,7 @@ border-radius: 55rpx; | ||
| 2549 | .grade-card-frame .card-name{ | 2549 | .grade-card-frame .card-name{ |
| 2550 | margin-left: 8rpx; | 2550 | margin-left: 8rpx; |
| 2551 | /* max-width: 120rpx; */ | 2551 | /* max-width: 120rpx; */ |
| 2552 | + max-width: 165rpx; | ||
| 2552 | } | 2553 | } |
| 2553 | .card-effect{ | 2554 | .card-effect{ |
| 2554 | margin-left: 15rpx; | 2555 | margin-left: 15rpx; |