购物车，和提交订单的页面

yvan.ni
1 parent 099d25b5
Showing 3 changed files with 13 additions and 18 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.wxml
pages/cart/cart2/cart2.wxss
@@ -1129,7 +1129,14 @@ Page({
                      map.set(item.prom_id+"",ob);
                  }
            }
+
+           if(item.is_gift==1){
+              var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+              getApp().request.delete(url, {});
+              list.goods.splice(i,1);
+           }
         }
+
         var map2=new Map();
         //请那些是赠品，但是优惠活动并没有被选中的商品要删除，同时满足条件的要放到map2，
         for(var i in list.goods){
@@ -1229,17 +1236,9 @@ Page({
                 }
               }
             }
-            else{
-              //---条件不到，删除相应的赠品---
-              for(var gi in list.goods){
-                var item=list.goods[gi];
-                if(item.is_gift==1 && item.prom_id==discount.prom_id){
-                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                     getApp().request.delete(url, {});
-                     list.goods.splice(gi,1);
-                }
-              }
-            }
+
+
+
             //-- 获取 --
             await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{
                data:{prom_id:prom.id}
@@ -311,12 +311,12 @@
             <!-- 优惠活动优惠金额 -->
             <view class="item" wx:if="{{formData.cut_price>0}}">
                <view>优惠活动</view>
-               <view class="co-red">- ￥ {{formData.cut_price}}元</view>
+               <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
             </view>
             <!-- 订单优惠优惠金额 -->
             <view class="item" wx:if="{{formData.order_prom_amount>0}}">
                  <view>订单优惠</view>
-                 <view class="co-red">- ￥ {{formData.order_prom_amount}}元</view>
+                 <view class="co-red">- ￥ {{filters.toFix(formData.order_prom_amount,2)}}元</view>
              </view>
             <view class="item" wx:if="{{formData.user_money>0}}">
                 <view>使用余额</view>
@@ -346,7 +346,7 @@ margin:auto;
 }
 .xc-frame{
     width: 100%;
-    height:68.9%;
+    height:60%;
 }
 .xc-frame .list-frame{
@@ -480,11 +480,7 @@ padding-left: 40rpx;
   margin-top: 30rpx;
 }
-.cx-popup.radius{
-  
-height: 650rpx;
-}
 .xc-hook {
 width: 33rpx;
 height: 33rpx;