Commit 4547134d126d42b54d27a804de30c2ff31f64fa1
1 parent
a10da174
1。 类别显示
2。 购物车多个商品多少促销活动 3。 尾款切换地址
Showing
4 changed files
with
9 additions
and
9 deletions
pages/cart/cart2/cart2.js
| ... | ... | @@ -1858,11 +1858,11 @@ Page({ |
| 1858 | 1858 | if(t_item.s_intValue>0){ |
| 1859 | 1859 | order_prom_list.give_integral=t_item.s_intValue; |
| 1860 | 1860 | } |
| 1861 | - if(t_item.s_coupon_id>0){ | |
| 1861 | + if(t_item.s_coupon_id){ | |
| 1862 | 1862 | order_prom_list.give_coupon_id=t_item.s_coupon_id; |
| 1863 | 1863 | order_prom_list.g_coupon_num= JSON.stringify(t_item.g_coupon_num); |
| 1864 | 1864 | } |
| 1865 | - if(t_item.s_libao>0){ | |
| 1865 | + if(t_item.s_libao){ | |
| 1866 | 1866 | order_prom_list.give_lb_id=t_item.s_libao; |
| 1867 | 1867 | order_prom_list.g_lb_num=JSON.stringify(t_item.g_lb_num); |
| 1868 | 1868 | } |
| ... | ... | @@ -1972,7 +1972,7 @@ Page({ |
| 1972 | 1972 | |
| 1973 | 1973 | if (pdata.length==0) return; |
| 1974 | 1974 | var str = JSON.stringify(pdata); |
| 1975 | - | |
| 1975 | + | |
| 1976 | 1976 | wx.showLoading({title: "加载中"}); |
| 1977 | 1977 | wx.request({ |
| 1978 | 1978 | url: oo.url + '/api/weshop/order/createWxdOrder', | ... | ... |
pages/cart/cart_wk/cart_wk.js
| ... | ... | @@ -28,7 +28,7 @@ Page({ |
| 28 | 28 | //配送方式 0=用户自选 1=自提 2=物流 |
| 29 | 29 | distr_type: 0, |
| 30 | 30 | //实际配送方式 0物流 1自提 |
| 31 | - exp_type: 0, | |
| 31 | + exp_type: 1, | |
| 32 | 32 | //------物流费用------ |
| 33 | 33 | exp_price: 0, |
| 34 | 34 | enterAddressPage: 0, //进入地址页面 |
| ... | ... | @@ -65,8 +65,7 @@ Page({ |
| 65 | 65 | wx.navigateTo({ |
| 66 | 66 | url: "/pages/index/index/index" |
| 67 | 67 | }) |
| 68 | - } | |
| 69 | - | |
| 68 | + } | |
| 70 | 69 | th.getuser_addr(function(addr) { |
| 71 | 70 | if(addr==null || addr==undefined || addr.length==0) { |
| 72 | 71 | th.setData({ user_addr: null, enterAddressPage: 1,}); |
| ... | ... | @@ -76,7 +75,7 @@ Page({ |
| 76 | 75 | }); |
| 77 | 76 | } |
| 78 | 77 | |
| 79 | - if (th.data.exp_type == 0){ | |
| 78 | + if (th.data.exp_type == 0 && th.data.goods){ | |
| 80 | 79 | th.calculate_wuliu(); |
| 81 | 80 | } |
| 82 | 81 | }) |
| ... | ... | @@ -514,6 +513,7 @@ Page({ |
| 514 | 513 | |
| 515 | 514 | //--进入收货地址的编辑页面-- |
| 516 | 515 | enterAddressPage: function() { |
| 516 | + getApp().globalData.is_cart_old=1; | |
| 517 | 517 | this.data.enterAddressPage =1, wx.navigateTo({ |
| 518 | 518 | url: "/pages/user/address_list/address_list?is_back=1" |
| 519 | 519 | }); | ... | ... |
pages/cart/cart_wk/cart_wk.wxml
| ... | ... | @@ -89,7 +89,7 @@ |
| 89 | 89 | </view> |
| 90 | 90 | |
| 91 | 91 | <!--尾款--> |
| 92 | -<view class='chentuan bdr14'> | |
| 92 | +<view class='chentuan bdr14' style="margin-bottom: 100rpx;"> | |
| 93 | 93 | <view class='ct_one jc_sb'> |
| 94 | 94 | <view class='ct_one_left'>尾款金额</view> |
| 95 | 95 | <view class='ct_one_right'><text class='redwz'>￥{{order.tail_money}}</text> | ... | ... |
pages/goods/categoryList/categoryList.wxml
| ... | ... | @@ -119,7 +119,7 @@ |
| 119 | 119 | |
| 120 | 120 | |
| 121 | 121 | <!-- 分类项目内容 22 --> |
| 122 | - <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx" id="two_type"> | |
| 122 | + <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx; height: auto;" id="two_type"> | |
| 123 | 123 | <!-- 分类项目的类型 --> |
| 124 | 124 | <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;"> |
| 125 | 125 | <view class="project_type-frame" style="margin-bottom:120rpx;"> | ... | ... |