From 541aee9afd46762292647ec82dde650ae957a203 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Thu, 5 Sep 2019 22:50:46 +0800
Subject: [PATCH] 购物车使用优惠券

---
 pages/cart/cart2/cart2.js   | 21 +++++++++++++++++----
 pages/cart/cart2/cart2.wxml |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 3495567..3412ea7 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -332,17 +332,30 @@ Page({
 
               break;
             case 1: //---秒杀-----
+              var quanlist=null;
               getApp().request.get("/api/weshop/activitylist/getSJGoodsPrice/"+gd.store_id
                 + "/" + gd.goods_id + "/1/" + gd.prom_id,{
-                success: function (tt) {
+                success: async function (tt) {
                   if(tt.data.code==0){
-                    t.data.data.shop_price=tt.data.data.prom_price;
+                      t.data.data.shop_price=tt.data.data.prom_price;
                   }else{
-                    t.data.data.prom_id = 0; t.data.data.prom_type = 0;
+                      t.data.data.prom_id = 0; t.data.data.prom_type = 0;
+
+                     th.data.ckeck_quan_price=t.data.data.shop_price*gg.goods_num;
+                     th.data.check_quan_price_list=t.data.data.shop_price*gg.goods_num+"";
+                     th.data.check_quan_ware_list=t.data.data.erpwareid+"";
+
+                      var url="/api/weshop/couponList/getUseCouponList";
+                      await app.request.promiseGet(url,{
+                        data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100}
+                      }).then(res=>{
+                        if(res.data.code==0)
+                          quanlist=res.data.data.pageData;
+                      })
                   }
                   th.setData({
                     bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et,
-                    bn_pick: gg.pick_id, bn_t_exp_t: distr_t
+                    bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist
                   });
                   //计算价格
                   th.calculatePrice2();
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index f8491a3..428b0a0 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -54,7 +54,7 @@
 
                 <!-----使用优惠券------>
                 <view class="xc-coupon-frame flex-center" data-bn="0"  bindtap="open_coupon_list" 
-				    wx:if="{{item.quan_list}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
+				    wx:if="{{item.quan_list && item.quan_list.length>0 }}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}">
                     <view class="work-frame flex-space-between">
                         <view class="work">使用优惠券</view>
                         <view class="xc-right-frame">
@@ -127,7 +127,7 @@
                     </view>
 
                     <view class="xc-coupon-frame flex-center" data-bn="1"  bindtap="open_coupon_list"  data-pickid="{{bn_pick}}"
-					      wx:if="{{selected_quan_list}}">
+					      wx:if="{{selected_quan_list && selected_quan_list.length>0}}">
                         <view class="work-frame flex-space-between">
                             <view class="work">
                                 使用优惠券
--
libgit2 0.21.4