From 0995e647b240751462fdb3297938c30e4d7abfab Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 10 Oct 2019 16:56:40 +0800
Subject: [PATCH] 提交订单页

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

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 95836e4..a968569 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1097,7 +1097,6 @@ Page({
 
   //--------购物车购买时，选择自提和物流-----------
   setexptype_w:function(t){
-    
     var def_exp_code= getApp().globalData.userInfo.def_exp_code,th=this;
     var ty = t.currentTarget.dataset.t, txt = t.currentTarget.dataset.txt,
         wl_txt = t.currentTarget.dataset.wl_txt,
@@ -1107,7 +1106,6 @@ Page({
     var iszt=1;
    
     if(ty==0){
-    
       th.setData({ is_all_zt: 0 });
     }else{
       for(var i=0;i<th.data.cartlist.length;i++){
@@ -1128,11 +1126,6 @@ Page({
             }
           }
       }
-    }else{
-        //判断是不是快递
-        if (ont == 66) {
-            this.express_name();
-        }
     }
     //----计算此时购物车的价格----
     th.calculatePrice();
@@ -1159,10 +1152,8 @@ Page({
               }
           }
       }
+      th.calculatePrice2()
 
-
-     th.calculatePrice2()
-     console.log('setexptype');
   },
 
   //--------立即购买时，使用余额--------
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 7bba21d..03015bb 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -101,7 +101,7 @@
                              <view bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
                           </view>
 
-                          <view  data-t='0'data-ont="66"data-txt='cartlist[{{pidx}}].exp_type'   bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
+                          <view  data-t='0' data-txt='cartlist[{{pidx}}].exp_type'   bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
                              <!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> -->
     <block wx:if="{{item.exp_type==0}}">
         <!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
@@ -118,7 +118,7 @@
                           </view>
                           </view>
                           <block wx:if="{{item.exp_type==0}}">
-                          <view class="flex-vertical">
+                          <view class="flex-vertical" bindtap="show" data-txt='cartlist[{{pidx}}].wind'>
                               <view >{{wu_arr[item.wind].name}}</view>
                               	<view class="xc-right"></view>
                           </view>
--
libgit2 0.21.4