From 4547134d126d42b54d27a804de30c2ff31f64fa1 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 28 Oct 2020 14:55:46 +0800
Subject: [PATCH] 1。  类别显示 2。  购物车多个商品多少促销活动 3。  尾款切换地址

---
 pages/cart/cart2/cart2.js                  | 6 +++---
 pages/cart/cart_wk/cart_wk.js              | 8 ++++----
 pages/cart/cart_wk/cart_wk.wxml            | 2 +-
 pages/goods/categoryList/categoryList.wxml | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index e1e3ff2..ebe8f55 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1858,11 +1858,11 @@ Page({
           if(t_item.s_intValue>0){
               order_prom_list.give_integral=t_item.s_intValue;
           }
-          if(t_item.s_coupon_id>0){
+          if(t_item.s_coupon_id){
               order_prom_list.give_coupon_id=t_item.s_coupon_id;
               order_prom_list.g_coupon_num=  JSON.stringify(t_item.g_coupon_num);
           }
-          if(t_item.s_libao>0){
+          if(t_item.s_libao){
               order_prom_list.give_lb_id=t_item.s_libao;
               order_prom_list.g_lb_num=JSON.stringify(t_item.g_lb_num);
           }
@@ -1972,7 +1972,7 @@ Page({
 
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
-
+	
     wx.showLoading({title: "加载中"});
     wx.request({
       url: oo.url + '/api/weshop/order/createWxdOrder',
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index b224433..2efd939 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -28,7 +28,7 @@ Page({
     //配送方式 0=用户自选 1=自提 2=物流
     distr_type: 0,
     //实际配送方式 0物流  1自提
-    exp_type: 0,
+    exp_type: 1,
     //------物流费用------
     exp_price: 0,
     enterAddressPage: 0,  //进入地址页面
@@ -65,8 +65,7 @@ Page({
       wx.navigateTo({
         url: "/pages/index/index/index"
       })
-    }
-	
+    }	
 	 th.getuser_addr(function(addr) {
       if(addr==null || addr==undefined || addr.length==0) {
         th.setData({ user_addr: null, enterAddressPage: 1,});
@@ -76,7 +75,7 @@ Page({
         });
       }
 
-     if (th.data.exp_type == 0){
+     if (th.data.exp_type == 0 && th.data.goods){
        th.calculate_wuliu();
      }
 	 })
@@ -514,6 +513,7 @@ Page({
 
   //--进入收货地址的编辑页面--
   enterAddressPage: function() {
+	 getApp().globalData.is_cart_old=1;
     this.data.enterAddressPage =1, wx.navigateTo({
       url: "/pages/user/address_list/address_list?is_back=1"
     });
diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml
index a2f5d2e..31d2f97 100644
--- a/pages/cart/cart_wk/cart_wk.wxml
+++ b/pages/cart/cart_wk/cart_wk.wxml
@@ -89,7 +89,7 @@
 </view>
 
 <!--尾款-->
-<view class='chentuan bdr14'>
+<view class='chentuan bdr14' style="margin-bottom: 100rpx;">
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>尾款金额</view>
     <view class='ct_one_right'><text class='redwz'>￥{{order.tail_money}}</text>
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index bed28bf..163c5fc 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -119,7 +119,7 @@
         
         
           <!-- 分类项目内容  22 -->
-          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx"  id="two_type">
+          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx; height: auto;"  id="two_type">
                <!-- 分类项目的类型 -->
            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;">
            <view class="project_type-frame" style="margin-bottom:120rpx;">
--
libgit2 0.21.4