From b32b0b80d5b47a45da47be54c0d5551acbafcc8b Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 16 Oct 2019 15:43:15 +0800
Subject: [PATCH] 订单列表的评价的显示， 购物车input 穿透，  商品详情页的门店

---
 pages/cart/cart/cart.wxml             | 5 +++--
 pages/cart/cart/cart.wxss             | 1 +
 pages/goods/goodsInfo/goodsInfo.wxss  | 2 --
 pages/user/order_list/order_list.wxml | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 7f8d9b3..7518033 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -35,7 +35,7 @@
       </block>    
     </view>
 
-    <view class="pay-for">
+    <cover-view class="pay-for">
         <label bindtap="checkAll" class="checkbox">
             <icon class="ico-check" color="{{checkAllToggle?'red':'gray'}}" size="20" type="success"></icon>全选
         </label>
@@ -45,7 +45,8 @@
             </view>
             <text class="tips">不包含运费</text>
         </view>
-    </view>
+    </cover-view>
+
 </view>
 <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
     <image class="cart-image" src="{{imgUrl}}/miniapp/images/cart-null.png"></image>
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 2a62032..7274c90 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -107,6 +107,7 @@ page {
     font-size: 28rpx;
     color: #666;
     background-color: #f0f2f5;
+    z-index: 9999999
 }
 
 .pay-for .pay-btn {
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index c3a00c1..ad887b0 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2346,9 +2346,7 @@ height: 72%;
   width: 95%;
   height: 72%;
   overflow-y: scroll;
-  overflow: hidden;
   margin: auto;
-
 }
 .store-list .store_choose{
   width: 100%;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 7fd9a41..330f4b1 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -86,11 +86,12 @@
                     <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>
                     <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>
 
+                     <block wx:if="{{item.order_status==2}}">
                      <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white red-b"
                                 url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
                      <navigator wx:else  class="order-btn white red-b"
                                 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>
-
+                     </block>
 
                     <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>
                     <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>
--
libgit2 0.21.4