Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

后端开发-许程
2 parents bd77643e bfe84779
Showing 2 changed files with 44 additions and 42 deletions
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
@@ -72,17 +72,17 @@ Page({
     //选择的券列表
     selected_quan_list:null,
   	//选择的券的门店
-	  selected_quan_pick:null,  
+	selected_quan_pick:null,
     is_close_quan:0,
     disabled:0,
     open_express:0,//控制选择物流名列表 的属性
-  
-    is_express:0,//选中物流的属性
-    expres_name:"",//点击选定
-    isopen:0,//券的说明
-    is_coupon:55555,//选择券的控制属性
+    is_express:0,       //选中物流的属性
+    expres_name:"",     //点击选定
+    isopen:0,           //券的说明
+    is_coupon:null,     //选择券的控制属性
     is_shipping_code:"",//插入用户默认地址
+    wu_arr_txt:"",      //要更新的物流的字段
   },
   onLoad: function(t) {
@@ -97,7 +97,6 @@ Page({
         }
     });
-
   },
   onUnload: function () { this.setData({ isclose: 1 })},
@@ -291,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; }
                  }
             }
@@ -400,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; }
                 }
           }
@@ -668,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);
@@ -1400,26 +1400,32 @@ Page({
         }
         return arr;
   },
-  // // 开启物流的弹窗
-  express_name:function(){
-    this.setData({ open_express: 1});
+  //// 开启物流的弹窗
+  show_wu_arr:function(e){
+    var wu_arr_txt=e.currentTarget.dataset.txt;
+    this.setData({ open_express: 1,wu_arr_txt:wu_arr_txt});
   },
     // 关闭物流的弹窗
   close_express:function(){
     this.setData({ open_express:0 });
   },
-  // 选择物流
+    // 选择物流
     click_express_name:function(e){
       var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode;
-      console.log("判断是不是11111111111111111111111111111", shippingcode);
       var index=e.currentTarget.dataset.idxe;
-      this.setData({ is_express: index, index: index, is_shipping_code: shippingcode});
+      var ob={ is_express: index, is_shipping_code: shippingcode};
+      ob[this.data.wu_arr_txt]=index;
+      this.setData(ob);
     },
+
     //点击确定物流
   determine_expres:function(e){
     this.setData({ open_express: 0});
-    this.calculatePrice();
+    if(this.data.is_b_now==1)
+         this.calculatePrice2();
+    else
+        this.calculatePrice();
   },
   //点击打开优惠券使用说明
@@ -1452,7 +1458,8 @@ Page({
         if (rse.data.code==0){
           th.setData({ open_express: 0 });
           //----计算此时购物车的价格----
-          th.calculatePrice();
+          if(th.data.is_b_now==1) th.calculatePrice2();
+          else th.calculatePrice();
        }
       }
     })
@@ -118,10 +118,10 @@
                           </view>
                           </view>
                           <block wx:if="{{item.exp_type==0}}">
-                          <view class="flex-vertical" bindtap="show" data-txt='cartlist[{{pidx}}].wind'>
-                              <view >{{wu_arr[item.wind].name}}</view>
-                              	<view class="xc-right"></view>
-                          </view>
+                              <!-- 点击显示物流选择 -->
+                              <view class="flex-vertical" bindtap="show_wu_arr"  data-txt='cartlist[{{pidx}}].wind'>
+                                  <view >{{wu_arr[item.wind].name}}</view><view class="xc-right"></view>
+                              </view>
                           </block>
                     </view>
@@ -157,9 +157,7 @@
         <!------立即购买-------->
         <view class="xc-border xc-border"></view>
         <block wx:if="{{is_b_now==1}}">
-          
                 <view class="use-item bfff">
-             
                       <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view>
                 <view class="order-detail">
                       <view class="goods-img">
@@ -209,12 +207,9 @@
                             <view class="yu_er">物流</view>
                         </view>
 </view>
-                           <block wx:if="{{item.exp_type==0}}">
-                         <view class="flex-vertical">
-                          <view class="logistics-name">{{wu_arr[index].name}}</view>
-                          		<view class="xc-right"></view>
-                              </view>
-                              </block>
+                           <block wx:if="{{bn_exp_type==0}}">
+                              <view class="flex-vertical"  bindtap="show_wu_arr"  data-txt='index'><view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view></view>
+                           </block>
                     </view>
                 </view>
@@ -308,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">
@@ -377,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>
@@ -419,9 +414,7 @@
     </view >
 </view>
-
 <!----弹起选择物流名的列表---->
-
 <view wx:if='{{open_express==1}}' >
     <view class="cover-layer flex-center "  bindtap='close_express'>
     </view>
@@ -439,7 +432,10 @@
         </view>
       <view class="express_list">
         <view  wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx">
-        <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" data-name="{{express_list.name}}" data-idxe="{{idx}}">
+        <view class="express_list_frame" bindtap="click_express_name"
+              data-shippingcode="{{express_list.shipping_code}}"
+              data-name="{{express_list.name}}" data-idxe="{{idx}}">
+
         <block wx:if="{{is_express==idx}}">
         <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view>
       </block>
@@ -465,5 +461,4 @@
-
 <warn id="warn"></warn>
 \ No newline at end of file