Commit 6002f2bc977eee8628a31cf519112aad5d0e539a
1 parent
330cbfa3
等级卡修改
Showing
4 changed files
with
33 additions
and
16 deletions
components/goods_list/goods_list.wxml
| @@ -86,13 +86,15 @@ | @@ -86,13 +86,15 @@ | ||
| 86 | <view class="fs22">{{item.market_price}}</view> | 86 | <view class="fs22">{{item.market_price}}</view> |
| 87 | </view> | 87 | </view> |
| 88 | </view> | 88 | </view> |
| 89 | - <view class="flex" style="line-height: 28rpx;"> | 89 | + <view class="flexr" style=""> |
| 90 | <!-- 等级价 --> | 90 | <!-- 等级价 --> |
| 91 | - <view class="price flex ai_and"> | 91 | + <view class="price flex ai-center"> |
| 92 | <view class="fs22">￥</view> | 92 | <view class="fs22">￥</view> |
| 93 | <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</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"> | 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> | 95 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> |
| 96 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 97 | + </view> | ||
| 96 | </view> | 98 | </view> |
| 97 | </view> | 99 | </view> |
| 98 | </block> | 100 | </block> |
components/goods_list/goods_list.wxss
| @@ -3,6 +3,10 @@ | @@ -3,6 +3,10 @@ | ||
| 3 | margin-bottom: 40rpx; | 3 | margin-bottom: 40rpx; |
| 4 | } | 4 | } |
| 5 | 5 | ||
| 6 | +.ai-center{ | ||
| 7 | + align-items: center; | ||
| 8 | +} | ||
| 9 | + | ||
| 6 | .ib { | 10 | .ib { |
| 7 | display: inline-block; | 11 | display: inline-block; |
| 8 | } | 12 | } |
| @@ -184,11 +188,11 @@ | @@ -184,11 +188,11 @@ | ||
| 184 | box-sizing: border-box; | 188 | box-sizing: border-box; |
| 185 | /* display: flex; */ | 189 | /* display: flex; */ |
| 186 | padding: 2rpx 10rpx; | 190 | padding: 2rpx 10rpx; |
| 187 | - height: 25rpx; | 191 | + height: 28rpx; |
| 188 | /* align-items: center; */ | 192 | /* align-items: center; */ |
| 189 | border-radius: 26rpx; | 193 | border-radius: 26rpx; |
| 190 | - font-size: 19rpx; | ||
| 191 | - line-height: 1em; | 194 | + font-size: 18rpx; |
| 195 | + line-height: 28rpx; | ||
| 192 | /* max-width: 110rpx; */ | 196 | /* max-width: 110rpx; */ |
| 193 | max-width: 220rpx; | 197 | max-width: 220rpx; |
| 194 | background: #333; | 198 | background: #333; |
| @@ -203,9 +207,16 @@ | @@ -203,9 +207,16 @@ | ||
| 203 | margin-right: 8rpx; | 207 | margin-right: 8rpx; |
| 204 | } | 208 | } |
| 205 | 209 | ||
| 206 | -.card_bg .card_name { | 210 | +/* .card_bg .card_name { |
| 207 | max-width: 76rpx; | 211 | max-width: 76rpx; |
| 208 | width: auto; | 212 | width: auto; |
| 209 | overflow: hidden; | 213 | overflow: hidden; |
| 210 | white-space: nowrap; | 214 | white-space: nowrap; |
| 215 | +} */ | ||
| 216 | + | ||
| 217 | +.card_name { | ||
| 218 | + position: relative; | ||
| 219 | + top: -4rpx; | ||
| 211 | } | 220 | } |
| 221 | + | ||
| 222 | + |
pages/goods/goodsList/goodsList.wxml
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | <view class="price">￥{{item[card_field]}}</view> | 71 | <view class="price">￥{{item[card_field]}}</view> |
| 72 | <view class="card_bg ellipsis-1"> | 72 | <view class="card_bg ellipsis-1"> |
| 73 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 73 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
| 74 | - <view class="card_name">{{card_name}}</view> | 74 | + <text class="card_name">{{card_name}}</text> |
| 75 | </view> | 75 | </view> |
| 76 | </view> | 76 | </view> |
| 77 | <view class="comment flex jc_sb"> | 77 | <view class="comment flex jc_sb"> |
| @@ -98,7 +98,7 @@ | @@ -98,7 +98,7 @@ | ||
| 98 | <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> | 98 | <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view> |
| 99 | <view class="card_bg ellipsis-1"> | 99 | <view class="card_bg ellipsis-1"> |
| 100 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | 100 | <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> |
| 101 | - {{g_filter.get_card_price(item,card_list,1)}} | 101 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> |
| 102 | </view> | 102 | </view> |
| 103 | </view> | 103 | </view> |
| 104 | <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> | 104 | <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> |
pages/goods/goodsList/goodsList.wxss
| @@ -175,29 +175,33 @@ | @@ -175,29 +175,33 @@ | ||
| 175 | 175 | ||
| 176 | box-sizing: border-box; | 176 | box-sizing: border-box; |
| 177 | padding: 2rpx 10rpx; | 177 | padding: 2rpx 10rpx; |
| 178 | - height: 25rpx; | 178 | + height: 28rpx; |
| 179 | border-radius: 26rpx; | 179 | border-radius: 26rpx; |
| 180 | - font-size: 19rpx; | ||
| 181 | - line-height: 1em; | 180 | + font-size: 18rpx; |
| 181 | + line-height: 28rpx; | ||
| 182 | max-width: 220rpx; | 182 | max-width: 220rpx; |
| 183 | background: #333; | 183 | background: #333; |
| 184 | color: #fff; | 184 | color: #fff; |
| 185 | margin-left: 8rpx; | 185 | margin-left: 8rpx; |
| 186 | - | ||
| 187 | } | 186 | } |
| 188 | 187 | ||
| 189 | -.card_bg .card_name { | 188 | +/* .card_bg .card_name { |
| 190 | max-width: 76rpx; | 189 | max-width: 76rpx; |
| 191 | width: auto; | 190 | width: auto; |
| 192 | overflow: hidden; | 191 | overflow: hidden; |
| 193 | white-space: nowrap; | 192 | white-space: nowrap; |
| 193 | +} */ | ||
| 194 | + | ||
| 195 | +.card_name { | ||
| 196 | + position: relative; | ||
| 197 | + top: -4rpx; | ||
| 194 | } | 198 | } |
| 195 | 199 | ||
| 200 | + | ||
| 196 | .card_bg image { | 201 | .card_bg image { |
| 197 | width: 19rpx; | 202 | width: 19rpx; |
| 198 | height: 19rpx; | 203 | height: 19rpx; |
| 199 | - margin-right: 1rpx; | ||
| 200 | - vertical-align: middle; | 204 | + margin-right: 8rpx; |
| 201 | } | 205 | } |
| 202 | 206 | ||
| 203 | .mk_price { | 207 | .mk_price { |