From bfe84779d6d68b200065687fa718b20162262ee8 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 10 Oct 2019 22:16:02 +0800
Subject: [PATCH] 提交订单页面的bug修改

---
 pages/cart/cart2/cart2.js   |  7 ++++---
 pages/cart/cart2/cart2.wxml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 16a5707..a1b9547 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -290,7 +290,7 @@ Page({
             var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
             if(e_t==0 && def_exp_code){
                  for(var k=0;k<th.data.wu_arr.length;k++){
-                      var item=th.data.wu_arr[k]; if(def_exp_code=item.code){  m_wind=k; }
+                      var item=th.data.wu_arr[k]; if(def_exp_code==item.code){  m_wind=k; }
                  }
             }
 
@@ -399,7 +399,7 @@ Page({
           var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
           if(et==0 && def_exp_code){
                 for(var k=0;k<th.data.wu_arr.length;k++){
-                    var item=th.data.wu_arr[k]; if(def_exp_code=item.code){  m_wind=k; }
+                    var item=th.data.wu_arr[k]; if(def_exp_code==item.code){  m_wind=k; }
                 }
           }
 
@@ -667,11 +667,12 @@ Page({
           all_shipping_m += th.data.cartlist[i].shipping_price;
           all_order_m += th.data.cartlist[i].order_amount;
           all_user_m += th.data.cartlist[i].user_money;
-          all_coupon_price_m+=th.data.cartlist[i].coupon_price;
+          all_coupon_price_m=parseFloat(all_coupon_price_m)+parseFloat(th.data.cartlist[i].coupon_price);
 
 
         }
 
+        all_shipping_m=parseFloat(all_shipping_m).toFixed(2);
         all_total_m =  parseFloat(all_total_m).toFixed(2);
         all_order_m = parseFloat(all_order_m).toFixed(2);
         all_price = parseFloat(all_price).toFixed(2);
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 5819a45..42a4b08 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -303,8 +303,8 @@
         <view class="xc-frame flex-level">
             <view class="list-frame">	
 
-           <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item"  wx:if="{{!item.is_using}}"  data-ind="{{index}}" wx:for-item="item"wx:for-index="index">
-            <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{index}}">
+           <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item"  wx:if="{{!item.is_using}}"  data-ind="{{q_index}}" wx:for-item="item"wx:for-index="q_index">
+            <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{q_index}}">
       <view class="coupon-frame flex rel">
           <!-- 锯齿 -->
           <view class="circle-frame abs">
@@ -372,12 +372,12 @@
                        <image class="coupon-code" src='{{iurl}}/miniapp/images/hui-ewm.png'></image>
                    </view> -->
 
-                    <block wx:if="{{is_coupon==index}}">
-        <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
-      </block>
-      <block wx:else>
-     <view class="circle  xc-hooks on"></view>
-        </block>
+                   <block wx:if="{{item.show_red}}">
+                         <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view>
+                  </block>
+                  <block wx:else>
+                       <view class="circle  xc-hooks on"></view>
+                 </block>
              </view>
 
     
--
libgit2 0.21.4