Commit f23e55345ee3f7a49cc14eaaf58501f961625a53
1 parent
ef376fca
1. 再来一单的排版
Showing
2 changed files
with
4 additions
and
2 deletions
pages/user/order_list/order_list.wxml
| @@ -133,7 +133,7 @@ | @@ -133,7 +133,7 @@ | ||
| 133 | </view> | 133 | </view> |
| 134 | </view> | 134 | </view> |
| 135 | </view> | 135 | </view> |
| 136 | - <view class="links flex-right-vertical fs30"> | 136 | + <view class="links flex-right-vertical fs30" style="flex-wrap: wrap;margin-top: 10rpx;"> |
| 137 | <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image> | 137 | <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image> |
| 138 | <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view> | 138 | <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view> |
| 139 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view> | 139 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view> |
pages/user/order_list/order_list.wxss
| @@ -221,7 +221,8 @@ page { | @@ -221,7 +221,8 @@ page { | ||
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | .commodity_evaluate .links { | 223 | .commodity_evaluate .links { |
| 224 | - height: 92rpx; | 224 | + /* height: 92rpx; */ |
| 225 | + height: auto; | ||
| 225 | } | 226 | } |
| 226 | 227 | ||
| 227 | .commodity_evaluate .commodity_To_evaluate { | 228 | .commodity_evaluate .commodity_To_evaluate { |
| @@ -229,6 +230,7 @@ page { | @@ -229,6 +230,7 @@ page { | ||
| 229 | height: 48rpx; | 230 | height: 48rpx; |
| 230 | border-radius: 10rpx; | 231 | border-radius: 10rpx; |
| 231 | line-height: 48rpx; | 232 | line-height: 48rpx; |
| 233 | + margin-bottom: 10rpx; | ||
| 232 | } | 234 | } |
| 233 | 235 | ||
| 234 | .commodity_evaluate .commodity_To_evaluate view { | 236 | .commodity_evaluate .commodity_To_evaluate view { |