Commit 65b4a4c9ab207e750ca39d9cf59aac6ca6456259

Authored by 后端研发-苏明海
2 parents f299fd98 ac2aad22

Merge branch 'dev' into 'test'

Dev

See merge request !161
pages/goods/goodsInfo/goodsInfo.wxml
... ... @@ -264,7 +264,7 @@
264 264  
265 265 <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
266 266  
267   - <view class="flex ai-center grade-card-frame card-frame"style="padding-right:0rpx" >
  267 + <view class="flex ai-center grade-card-frame card-frame" >
268 268 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
269 269 <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
270 270 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
... ... @@ -2541,8 +2541,6 @@ border-radius: 55rpx;
2541 2541 .grade-card-frame .card-name{
2542 2542 margin-left: 5rpx;
2543 2543 max-width: 120rpx;
2544   - margin-right: 6px;
2545   -
2546 2544 }
2547 2545 .card-effect{
2548 2546 margin-left: 15rpx;
... ...