wxd / MShopWeApp

Commit 7c66de15ea81ebd4d93771a3a5f51b8f2c88a1a5

Authored by 后端开发-许程
1 parent d7859623

样式,排版调整

Inline Side-by-side
Showing 2 changed files with 19 additions and 11 deletions
pages/user/order_list/order_list.wxml
  View file @7c66de1
... ... @@ -60,10 +60,13 @@
60 60  
61 61 </view>
62 62 </view>
63   - <view class="check-btn">
  63 +
  64 + </view>
  65 +
  66 + <view class="check-btn">
64 67 <navigator url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}"
65 68 class="order-btn order-btn-pay" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
66   - <navigator bindtap="jumpToCart4" class="order-btn order-btn-pay" data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
  69 + <navigator bindtap="jumpToCart4 white red-b" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
67 70 <view class="order-btn" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3 }}">已取消</view>
68 71 <view bindtap="cancelOrder" class="order-btn" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}"
69 72 hidden="{{!(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
... ... @@ -80,14 +83,14 @@
80 83 </block>
81 84  
82 85  
83   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
84   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
85   - <navigator redirect class="order-btn" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
  86 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
  87 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
  88 + <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
86 89 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
87 90 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
88 91  
89 92 </view>
90   - </view>
  93 +
91 94 </view>
92 95 <view class="no-data" wx:if="{{ (!orderList||orderList.length==0) && is_get}}">
93 96 <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
... ...
pages/user/order_list/order_list.wxss
  View file @7c66de1
... ... @@ -40,6 +40,8 @@
40 40 margin-bottom: 20rpx;
41 41 font-size: 28rpx;
42 42 border-bottom: 1rpx solid #eee;
  43 + padding-bottom: 25rpx;
  44 +
43 45 }
44 46  
45 47 .goods-title {
... ... @@ -108,7 +110,7 @@
108 110  
109 111 .goods-tips {
110 112 height: 60rpx;
111   - padding: 50rpx 0;
  113 + padding: 10rpx 0;
112 114 display: flex;
113 115 justify-content: space-between;
114 116 align-items: center;
... ... @@ -127,14 +129,14 @@
127 129 }
128 130  
129 131 .order-btn {
130   - width: 125rpx;
131   - height: 60rpx;
132   - line-height: 60rpx;
  132 + width: 150rpx;
  133 + height: 50rpx;
  134 + line-height: 50rpx;
133 135 text-align: center;
134 136 border: 1px solid #eee;
135 137 margin-left: 10rpx;
136 138 float: right;
137   - border-radius: 5rpx;
  139 + border-radius: 15rpx;
138 140 }
139 141  
140 142 .order-btn-pay {
... ... @@ -143,3 +145,6 @@
143 145 border-color: #f23030;
144 146 }
145 147 .return-btn.co-red{color: #e02e24}
  148 +.check-btn{
  149 + margin-bottom: 20rpx;
  150 +}
146 151 \ No newline at end of file
... ...