From 2d3bc08e3482c3542d403b774a73ae7ef91489f6 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 18 Oct 2019 18:13:54 +0800
Subject: [PATCH] 购物车，首页导航，订单列表，loadMore的js修改

---
 pages/cart/cart2/cart2.js                 |  3 ++-
 pages/cart/cart2/cart2.wxml               |  6 +++---
 pages/cart/cart2/cart2.wxss               |  2 +-
 pages/index/index/index.js                | 13 ++++++++++++-
 pages/index/index/index.wxml              |  5 +++--
 pages/index/index/index.wxss              |  9 ++++++---
 pages/user/order_detail/order_detail.wxml |  7 +++++++
 pages/user/order_list/order_list.wxml     | 10 +++++++++-
 utils/LoadMore.js                         |  2 +-
 9 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 64d986e..1bda41a 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1450,12 +1450,13 @@ Page({
   clik_coupons:function(e){
     var ind = e.currentTarget.dataset.idx;
     var is_open = this.data.selected_quan_list[ind].is_open;
-    console.log(is_open,"是什么东西");
+
     if (is_open == 1) is_open = 0;
     else is_open = 1;
 
     var txt = "selected_quan_list[" + ind + "].is_open"
     var obj = {}; obj[txt] = is_open;
+
     this.setData(obj);
     this.setData({disabled:1})
   },
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 4b72586..b708acb 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -385,7 +385,7 @@
 
     
             
-           <view class="abs flex-vertical-between bottmo-explain" catchtap='clik_coupons' data-idx="{{index}}">
+           <view class="abs flex-vertical-between bottmo-explain" catchtap='clik_coupons' data-idx="{{q_index}}">
                <view></view>
            <view class="font-word flex">优惠券使用说明
            <view class="circle circle-size flex t-c">
@@ -395,9 +395,9 @@
            </view>
         </view>
       </view>
-
     </view>
-    <view class="xc-buttom "wx:if="{{item.is_open==1}}">
+
+    <view class="xc-buttom " wx:if="{{item.is_open==1}}">
        <text class="five-level-word  explain-coupon">{{util.format(item.Remark)}}</text>
     </view>
 
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index e010681..128ecdd 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -598,12 +598,12 @@ width:100%;
   line-height: 35rpx;
   font-size:21rpx;
   border-radius:10rpx; position: relative; top:-1px;
+  margin-right: 8rpx
 }
 .top-frame{
   width:82%;
   height: 75rpx;
   margin-top:10rpx;
-
 }
 .top-frame .coupon-wode{
   font-size: 25rpx;
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index ee33352..2e36821 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -55,6 +55,8 @@ Page({
     is_boot:0,
     gd_category:null,
     is_no_more:0,
+
+    max_sw_height:0,  //banner的最大高度
   },
 
   onLoad: function () {
@@ -603,7 +605,16 @@ Page({
          return false;
        }
        getApp().goto("/pages/user/userqy/userqy");
+   },
+
+   imageLoad:function (e) {
+      var imgwidth = e.detail.width;
+      var imgheight = e.detail.height;
+      //宽高比
+      var ratio = imgwidth / imgheight;
+      //计算的高度值
+      var viewHeight = 715 / ratio;
+      if(this.data.max_sw_height<viewHeight) this.setData({ max_sw_height:viewHeight });
    }
 
-
 });
\ No newline at end of file
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 7ef9037..a17a0ea 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -24,10 +24,11 @@
     </view>
     <!--滚动广告-->
     <view class="rel title-img" wx:if="{{banner}}" >
-        <swiper autoplay="true" class="swiper_box"  duration="1000"  interval="3000" vertical=""bindchange="bannerSwiperChange">
+        <swiper autoplay="true" class="swiper_box"  duration="1000"  interval="3000" vertical=""bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx">
             <swiper-item wx:for="{{banner}}"  wx:key="banner">
                 <view url="{{item.media_link}}" class="slide-image-frame">
-                    <image class="slide-image"mode="widthFix" src="{{item.ad_code}}"  lazy-load="true"  binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
+                    <image class="slide-image"mode="widthFix" src="{{item.ad_code}}"  bindload="imageLoad" data-index="{{index}}"
+                           lazy-load="true"  binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
                 </view>
             </swiper-item>
         </swiper>
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index ecbfd97..f7f839a 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -60,8 +60,8 @@ left: 10%;
 }
 
 .swiper_box {
-    width: 100%;
-  
+    width: 100%; 
+    height: auto;
 } 
 .s_prom{
     width: 100%;
@@ -77,6 +77,7 @@ left: 10%;
     display: inline-block;
     overflow: hidden;
     border-radius: 14rpx;
+    height: auto;
 
 }
 
@@ -118,12 +119,14 @@ left: 10%;
 
 .choice_box .choice_list image {
     width: 100%;
-    height: 368rpx;
+    
+    height: auto;
 }
 .title-img{
   margin-top: 110rpx;
 
   margin-bottom: 15rpx;
+  height: auto;
 
 }
 
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 558fa9e..c3950ad 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -149,6 +149,13 @@
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
+
+        <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}">
+            <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>
+        </block>
     </view>
 </view>
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 7c0661e..1584680 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -147,7 +147,15 @@
             <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" 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="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
           </block>
-          <navigator class="commodity_To_evaluate flex-level comment_go" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">去评价</navigator>
+
+          <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
+            <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="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
           <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
         </view>
diff --git a/utils/LoadMore.js b/utils/LoadMore.js
index be27638..37acfbd 100644
--- a/utils/LoadMore.js
+++ b/utils/LoadMore.js
@@ -79,7 +79,7 @@ var e = function() {
 
                     for (var ii = 0; ii < g.length; ii++) {
                       //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) {
-                      if (g[ii].prom_type == 1) {
+                      if (g[ii].prom_type && g[ii].prom_type == 1) {
                           glist += g[ii].goods_id+",";
                       }
                       if (g[ii].original_img!=undefined){
--
libgit2 0.21.4