From 0a15c625cf302603ea1eb3b618a1eed6e96d10d2 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 18 Oct 2019 18:33:24 +0800
Subject: [PATCH] 确认订单页面，订单详情页面，会员权益

---
 pages/cart/cart2/cart2.wxml               | 4 +++-
 pages/cart/cart2/cart2.wxss               | 8 ++++----
 pages/user/order_detail/order_detail.wxml | 3 ++-
 pages/user/order_detail/order_detail.wxss | 1 +
 pages/user/user_coupon/user_coupon.wxml   | 4 +++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index b708acb..48d08d8 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -398,7 +398,9 @@
     </view>
 
     <view class="xc-buttom " wx:if="{{item.is_open==1}}">
-       <text class="five-level-word  explain-coupon">{{util.format(item.Remark)}}</text>
+        <view style="padding:10rpx">
+           <text class="five-level-word  explain-coupon">{{util.format(item.Remark)}}</text>
+        </view>
     </view>
 
 </view>
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 128ecdd..4cfebae 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -685,15 +685,15 @@ border-bottom:1rpx solid #eee;
 margin-left: 6rpx;
 
 }
+
 .goods-num{
   font-size: 28rpx;
-color: #333;
-
+  color: #333;
 }
+
 .explain-coupon{
-  
   font-size:25rpx;
-
+  padding: 10rpx 10rpx
 }
 .circle-frame{ 
   width: 20rpx;
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index c3950ad..c5b253c 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -125,6 +125,7 @@
               <view wx:if="{{order.tail_pay_type==1}}">￥ {{filters.toFix(order.user_money+order.pt_tail_money,2)}}元</view>
               <view wx:else>￥ {{filters.toFix(order.user_money,2)}}元</view>
            </view>
+           <view style="height:10rpx"></view>
     </view>
 
     <view class="btn-wrap">
@@ -154,7 +155,7 @@
             <navigator wx:if="{{order.order_goods.length>1}}"  class="tips-btn"
                        url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价{{order.order_goods.length}}</navigator>
             <navigator wx:else  class="tips-btn"
-                       url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">评价{{order.order_goods.length}}</navigator>
+                       url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator>
         </block>
     </view>
 </view>
diff --git a/pages/user/order_detail/order_detail.wxss b/pages/user/order_detail/order_detail.wxss
index 0ca256c..b18b525 100644
--- a/pages/user/order_detail/order_detail.wxss
+++ b/pages/user/order_detail/order_detail.wxss
@@ -156,6 +156,7 @@
     height: 100rpx;
     background-color: #fff;
     text-align: right;
+    position: fixed; width: 100%; bottom: 0; border-top: 1rpx solid #ddd
 }
 
 .tips-btn {
diff --git a/pages/user/user_coupon/user_coupon.wxml b/pages/user/user_coupon/user_coupon.wxml
index 0c92b07..7b6df4a 100644
--- a/pages/user/user_coupon/user_coupon.wxml
+++ b/pages/user/user_coupon/user_coupon.wxml
@@ -99,7 +99,9 @@
 
     </view>
     <view class="xc-buttom "wx:if="{{item.is_open==1}}">
-       <text class="five-level-word  explain-coupon">{{util.format(item.Remark)}}</text>
+        <view style="padding: 10rpx">
+           <text class="five-level-word  explain-coupon">{{util.format(item.Remark)}}</text>
+        </view>
     </view>
   </view>
 </view>
--
libgit2 0.21.4