Merge branch 'dev' into 'test'

Dev See merge request !161

Merge branch 'dev' into 'test'
Dev See merge request !161
后端研发-苏明海
2 parents f299fd98 ac2aad22
Showing 2 changed files with 1 additions and 3 deletions
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
@@ -264,7 +264,7 @@
             <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data)}}">
-                  <view class="flex ai-center  grade-card-frame card-frame"style="padding-right:0rpx" >
+                  <view class="flex ai-center  grade-card-frame card-frame" >
 					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 					        <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
                   </view>
@@ -2541,8 +2541,6 @@ border-radius: 55rpx;
 .grade-card-frame .card-name{
 	margin-left: 5rpx;
   max-width: 120rpx;
-  margin-right: 6px;
-
 }
 .card-effect{
   margin-left: 15rpx;