diff --git a/pages/order/coupon/index.js b/pages/order/coupon/index.js index d52d3f4..5a3d7b1 100644 --- a/pages/order/coupon/index.js +++ b/pages/order/coupon/index.js @@ -8,11 +8,8 @@ Page({ * 页面的初始数据 */ data: { - noUseList: [], list:[], - moreFlag:true, - - productList: [], + moreFlag:true }, /** @@ -20,75 +17,28 @@ Page({ */ onLoad: function (options) { - console.log(app.globalData.postProduct,app.globalData.list,app.globalData.product) - let sourceFrom = options.sourceFrom - let postList = app.globalData.postProduct || [] - let ticketList = app.globalData.list || [] - let signleProduct = app.globalData.product || null - - let listData = [] - // 门票类 - if (sourceFrom == 'cart') { - ticketList.forEach(v=>{ - listData.push({ - sku_id: v.sku.id, - price: v.sku.price, - sell_price: v.sku.price, - num: v.num, - use_date: v.time&&v.time.sale_date?v.time.sale_date:'' - }) - }) - } else { - if (signleProduct) { - listData.push({ - sku_id: signleProduct.sku.id, - price: signleProduct.sku.price, - sell_price: signleProduct.sku.price, - num: signleProduct.productNum, - use_date: signleProduct.date&&signleProduct.date.date?signleProduct.date.date:'' - }) - } - } - // 特产类 - postList.forEach(v=>{ - listData.push({ - sku_id: v.sku.id, - price: v.sku.price, - sell_price: v.sku.price, - num: v.productNum, - }) - }) - - this.setData({ - productList: listData - }) this.getList(options) }, getList:function(options){ if(!this.data.moreFlag) return - commonApi.user_post('coupon/use_coupon_listv3',{ + commonApi.user_post('coupon/use_coupon_list',{ money:options.money, - sku_ids:options.sku, - cart_data: this.data.productList + sku_ids:options.sku }).then(res=>{ res.data.map(item=>{ item.selected = false; }) - - this.setData({ - list:res.data.filter(x=>x.can_use), - noUseList: res.data.filter(x=>!x.can_use), + list:res.data }) this.getMaxC(options) }) }, //获取最高优惠 getMaxC(options){ - commonApi.user_post('coupon/use_max_coupon_listv2',{ + commonApi.user_post('coupon/use_max_coupon_list',{ money:options.money, - sku_ids:options.sku, - cart_data: this.data.productList + sku_ids:options.sku }).then(res=>{ console.log(app.globalData.couponInfo); diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml index 02baf62..dd15e4b 100644 --- a/pages/order/postOrder/index.wxml +++ b/pages/order/postOrder/index.wxml @@ -36,7 +36,7 @@ - + 购买须知:使用优惠券的组合订单均不支持部分退款 diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml index e3b855d..dee95c0 100644 --- a/pages/order/scene/index.wxml +++ b/pages/order/scene/index.wxml @@ -58,8 +58,8 @@ --> - - + + 购买须知:使用优惠券的组合订单均不支持部分退款 diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js index 62a9583..73d672e 100644 --- a/pages/user/cartlist/list.js +++ b/pages/user/cartlist/list.js @@ -268,7 +268,7 @@ Page({ app.globalData.postProduct = product; // 是否从购物车下单 - app.globalData.isCartBuy = true; + // app.globalData.isCartBuy = true; if (app.globalData.list) { app.globalData.product = app.globalData.list[app.globalData.index]