diff --git a/application/api/controller/Buy.php b/application/api/controller/Buy.php index c24eaa17c..ddc7e04cc 100755 --- a/application/api/controller/Buy.php +++ b/application/api/controller/Buy.php @@ -60,6 +60,9 @@ class Buy extends Common // 支付方式 $payment_list = PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]); + // 当前选中的优惠劵 + $coupon_id = isset($params['coupon_id']) ? intval($params['coupon_id']) : 0; + // 数据返回组装 $result = [ 'goods_list' => $ret['data']['goods'], @@ -67,6 +70,9 @@ class Buy extends Common 'base' => $ret['data']['base'], 'extension_data' => $ret['data']['extension_data'], 'common_order_is_booking' => (int) MyC('common_order_is_booking', 0), + + // 优惠劵 + 'plugins_coupon_data' => CallPluginsServiceMethod('coupon', 'BaseService', 'BuyUserCouponData', ['order_goods'=>$ret['data']['goods'], 'coupon_id'=>$coupon_id]), ]; return DataReturn('操作成功', 0, $result); } diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 58ee9f6b3..817d1d1be 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -126,6 +126,8 @@ class Goods extends Common 'common_app_is_limitedtimediscount' => (int) MyC('common_app_is_limitedtimediscount'), 'common_app_is_good_thing' => (int) MyC('common_app_is_good_thing'), 'common_app_is_poster_share' => (int) MyC('common_app_is_poster_share'), + + // 优惠劵 'plugins_coupon_data' => $this->PluginsCouponGoods($goods_id), ]; diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index b88af12f9..d6811e07f 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -67,7 +67,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - request_url: 'https://test.shopxo.net/', + //request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index a48234485..c9b79e035 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,5 +1,5 @@ { - "pages": [ + "pages": ["pages/goods-detail/goods-detail", "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -8,7 +8,7 @@ "pages/login/login", "pages/paytips/paytips", "pages/goods-search/goods-search", - "pages/goods-detail/goods-detail", + "pages/goods-comment/goods-comment", "pages/goods-attribute/goods-attribute", "pages/buy/buy", diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js index d85e6c67f..369691825 100755 --- a/public/appmini/old/weixin/pages/buy/buy.js +++ b/public/appmini/old/weixin/pages/buy/buy.js @@ -15,6 +15,12 @@ Page({ extension_data: [], payment_id: 0, common_order_is_booking: 0, + + // 优惠劵 + plugins_coupon_data: null, + plugins_use_coupon_id: 0, + plugins_choice_coupon_value: '选择优惠劵', + popup_plugins_coupon_status: false, }, onLoad(params) { if((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0) @@ -70,6 +76,7 @@ Page({ var data = this.data.params; data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; + data['coupon_id'] = this.data.plugins_use_coupon_id; wx.request({ url: app.get_request_url("index", "buy"), method: "POST", @@ -89,8 +96,21 @@ Page({ extension_data: data.extension_data || [], data_list_loding_status: 3, common_order_is_booking: data.common_order_is_booking || 0, + plugins_coupon_data: data.plugins_coupon_data || null, }); + // 优惠劵选择处理 + if ((data.plugins_coupon_data || null) != null) + { + if ((data.plugins_coupon_data.coupon_choice || null) != null) + { + this.setData({ plugins_choice_coupon_value: data.plugins_coupon_data.coupon_choice.coupon.desc }); + } else { + var coupon_count = ((data.plugins_coupon_data.coupon_list || null) != null) ? data.plugins_coupon_data.coupon_list.length : 0; + this.setData({ plugins_choice_coupon_value: (coupon_count > 0) ? '可选优惠劵' + coupon_count + '张' : '暂无可用优惠劵' }); + } + } + // 地址 if (this.data.address == null || this.data.address_id == 0) { if((data.base.address || null) != null) { @@ -141,6 +161,7 @@ Page({ data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; data['user_note'] = this.data.user_note_value; + data['coupon_id'] = this.data.plugins_use_coupon_id; // 数据验证 var validation = [ @@ -203,6 +224,36 @@ Page({ } } this.setData({payment_list: data || []}); - } + }, + + // 优惠劵弹层开启 + plugins_coupon_open_event(e) { + this.setData({ popup_plugins_coupon_status: true}); + }, + + // 优惠劵弹层关闭 + plugins_coupon_close_event(e) { + this.setData({ popup_plugins_coupon_status: false }); + }, + + // 优惠劵选择 + plugins_coupon_use_event(e) { + var index = e.currentTarget.dataset.index; + var value = e.currentTarget.dataset.value; + this.setData({ + plugins_use_coupon_id: value, + popup_plugins_coupon_status: false, + }); + this.init(); + }, + + // 不使用优惠劵 + plugins_coupon_not_use_event(e) { + this.setData({ + plugins_use_coupon_id: 0, + popup_plugins_coupon_status: false, + }); + this.init(); + }, }); diff --git a/public/appmini/old/weixin/pages/buy/buy.json b/public/appmini/old/weixin/pages/buy/buy.json index 9a5b68f95..7d179bfd5 100755 --- a/public/appmini/old/weixin/pages/buy/buy.json +++ b/public/appmini/old/weixin/pages/buy/buy.json @@ -1,3 +1,6 @@ { - "enablePullDownRefresh": false + "enablePullDownRefresh": true, + "usingComponents": { + "component-popup": "/components/popup/popup" + } } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/buy/buy.wxml b/public/appmini/old/weixin/pages/buy/buy.wxml index c168e701d..4342024ed 100755 --- a/public/appmini/old/weixin/pages/buy/buy.wxml +++ b/public/appmini/old/weixin/pages/buy/buy.wxml @@ -44,6 +44,12 @@