Commit b32b0b80d5b47a45da47be54c0d5551acbafcc8b
1 parent
66364963
订单列表的评价的显示, 购物车input 穿透, 商品详情页的门店
Showing
4 changed files
with
6 additions
and
5 deletions
pages/cart/cart/cart.wxml
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | </block> | 35 | </block> |
36 | </view> | 36 | </view> |
37 | 37 | ||
38 | - <view class="pay-for"> | 38 | + <cover-view class="pay-for"> |
39 | <label bindtap="checkAll" class="checkbox"> | 39 | <label bindtap="checkAll" class="checkbox"> |
40 | <icon class="ico-check" color="{{checkAllToggle?'red':'gray'}}" size="20" type="success"></icon>全选 | 40 | <icon class="ico-check" color="{{checkAllToggle?'red':'gray'}}" size="20" type="success"></icon>全选 |
41 | </label> | 41 | </label> |
@@ -45,7 +45,8 @@ | @@ -45,7 +45,8 @@ | ||
45 | </view> | 45 | </view> |
46 | <text class="tips">不包含运费</text> | 46 | <text class="tips">不包含运费</text> |
47 | </view> | 47 | </view> |
48 | - </view> | 48 | + </cover-view> |
49 | + | ||
49 | </view> | 50 | </view> |
50 | <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> | 51 | <view class="no-data" wx:if="{{!requestData||requestData.length==0}}"> |
51 | <image class="cart-image" src="{{imgUrl}}/miniapp/images/cart-null.png"></image> | 52 | <image class="cart-image" src="{{imgUrl}}/miniapp/images/cart-null.png"></image> |
pages/cart/cart/cart.wxss
pages/goods/goodsInfo/goodsInfo.wxss
@@ -2346,9 +2346,7 @@ height: 72%; | @@ -2346,9 +2346,7 @@ height: 72%; | ||
2346 | width: 95%; | 2346 | width: 95%; |
2347 | height: 72%; | 2347 | height: 72%; |
2348 | overflow-y: scroll; | 2348 | overflow-y: scroll; |
2349 | - overflow: hidden; | ||
2350 | margin: auto; | 2349 | margin: auto; |
2351 | - | ||
2352 | } | 2350 | } |
2353 | .store-list .store_choose{ | 2351 | .store-list .store_choose{ |
2354 | width: 100%; | 2352 | width: 100%; |
pages/user/order_list/order_list.wxml
@@ -86,11 +86,12 @@ | @@ -86,11 +86,12 @@ | ||
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> | 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> | 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 | 88 | ||
89 | + <block wx:if="{{item.order_status==2}}"> | ||
89 | <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b" | 90 | <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b" |
90 | url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator> | 91 | url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator> |
91 | <navigator wx:else class="order-btn white red-b" | 92 | <navigator wx:else class="order-btn white red-b" |
92 | url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator> | 93 | url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator> |
93 | - | 94 | + </block> |
94 | 95 | ||
95 | <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> | 96 | <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> |
96 | <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> | 97 | <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> |