diff --git a/public/appmini/old/alipay/pages/buy/buy.acss b/public/appmini/old/alipay/pages/buy/buy.acss
index f1f73b666..2402e0c98 100755
--- a/public/appmini/old/alipay/pages/buy/buy.acss
+++ b/public/appmini/old/alipay/pages/buy/buy.acss
@@ -121,4 +121,36 @@
}
.extension-list .item .text-tips {
color: #ff8f44;
+}
+
+
+/**
+ * 插件样式区域
+ */
+ /**
+ * 优惠劵
+ */
+.plugins-coupon {
+ padding: 25rpx 40rpx 25rpx 10rpx;
+}
+.plugins-coupon-popup {
+ padding-top: 20rpx;
+}
+.plugins-coupon-popup .close {
+ margin-right: 20rpx;
+}
+.coupon-container {
+ max-height: 80vh;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ padding-bottom: 50rpx;
+}
+.coupon-container .item,
+.coupon-container .v-right,
+.coupon-container .v-right .circle {
+ height: 230rpx;
+}
+.coupon-container .not-use-tips {
+ color: #f7b240;
+ font-size: 32rpx;
}
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/buy/buy.axml b/public/appmini/old/alipay/pages/buy/buy.axml
index e54ce9681..179f93b03 100755
--- a/public/appmini/old/alipay/pages/buy/buy.axml
+++ b/public/appmini/old/alipay/pages/buy/buy.axml
@@ -45,6 +45,12 @@
+
+
+ 优惠劵
+ {{plugins_choice_coupon_value}}
+
+
@@ -80,4 +86,38 @@
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js
index a0becfd1d..f5ab76b07 100755
--- a/public/appmini/old/alipay/pages/buy/buy.js
+++ b/public/appmini/old/alipay/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)
@@ -72,6 +78,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;
my.request({
url: app.get_request_url("index", "buy"),
method: "POST",
@@ -79,6 +86,7 @@ Page({
dataType: "json",
headers: { 'content-type': 'application/x-www-form-urlencoded' },
success: res => {
+ my.stopPullDownRefresh();
my.hideLoading();
if (res.data.code == 0) {
var data = res.data.data;
@@ -92,8 +100,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) {
@@ -120,6 +141,7 @@ Page({
}
},
fail: () => {
+ my.stopPullDownRefresh();
my.hideLoading();
this.setData({
data_list_loding_status: 2,
@@ -130,6 +152,11 @@ Page({
});
},
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.init();
+ },
+
// 用户留言事件
bind_user_note_event(e) {
this.setData({user_note_value: e.detail.value});
@@ -142,6 +169,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 = [
@@ -204,6 +232,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/alipay/pages/buy/buy.json b/public/appmini/old/alipay/pages/buy/buy.json
index 9f51be06a..55e2d05af 100755
--- a/public/appmini/old/alipay/pages/buy/buy.json
+++ b/public/appmini/old/alipay/pages/buy/buy.json
@@ -1,3 +1,6 @@
{
- "pullRefresh": false
+ "pullRefresh": true,
+ "usingComponents": {
+ "popup": "mini-antui/es/popup/index"
+ }
}
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/buy/buy.css b/public/appmini/old/baidu/pages/buy/buy.css
index 6a44f7631..dad4a0e67 100755
--- a/public/appmini/old/baidu/pages/buy/buy.css
+++ b/public/appmini/old/baidu/pages/buy/buy.css
@@ -130,4 +130,36 @@
padding: 10rpx;
min-height: 10vh;
width: 100%;
+}
+
+
+/**
+ * 插件样式区域
+ */
+ /**
+ * 优惠劵
+ */
+.plugins-coupon {
+ padding: 25rpx 40rpx 25rpx 10rpx;
+}
+.plugins-coupon-popup {
+ padding-top: 20rpx;
+}
+.plugins-coupon-popup .close {
+ margin-right: 20rpx;
+}
+.coupon-container {
+ max-height: 80vh;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ padding-bottom: 50rpx;
+}
+.coupon-container .item,
+.coupon-container .v-right,
+.coupon-container .v-right .circle {
+ height: 230rpx;
+}
+.coupon-container .not-use-tips {
+ color: #f7b240;
+ font-size: 32rpx;
}
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/buy/buy.js b/public/appmini/old/baidu/pages/buy/buy.js
index 6e915fe10..a111b397e 100755
--- a/public/appmini/old/baidu/pages/buy/buy.js
+++ b/public/appmini/old/baidu/pages/buy/buy.js
@@ -14,7 +14,13 @@ Page({
is_first: 1,
extension_data: [],
payment_id: 0,
- common_order_is_booking: 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) {
@@ -67,12 +73,14 @@ 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;
swan.request({
url: app.get_request_url("index", "buy"),
method: "POST",
data: data,
dataType: "json",
success: res => {
+ swan.stopPullDownRefresh();
swan.hideLoading();
if (res.data.code == 0) {
var data = res.data.data;
@@ -84,9 +92,22 @@ Page({
total_price: data.base.actual_price,
extension_data: data.extension_data || [],
data_list_loding_status: 3,
- common_order_is_booking: data.common_order_is_booking || 0
+ 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) {
@@ -114,6 +135,7 @@ Page({
}
},
fail: () => {
+ swan.stopPullDownRefresh();
swan.hideLoading();
this.setData({
data_list_loding_status: 2,
@@ -125,6 +147,11 @@ Page({
});
},
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.init();
+ },
+
// 用户留言事件
bind_user_note_event(e) {
this.setData({ user_note_value: e.detail.value });
@@ -137,6 +164,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 = [{ fields: 'address_id', msg: '请选择地址' }];
@@ -197,6 +225,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();
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/buy/buy.json b/public/appmini/old/baidu/pages/buy/buy.json
index 9a5b68f95..7d179bfd5 100755
--- a/public/appmini/old/baidu/pages/buy/buy.json
+++ b/public/appmini/old/baidu/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/baidu/pages/buy/buy.swan b/public/appmini/old/baidu/pages/buy/buy.swan
index f6c051359..2af2116ac 100755
--- a/public/appmini/old/baidu/pages/buy/buy.swan
+++ b/public/appmini/old/baidu/pages/buy/buy.swan
@@ -44,6 +44,12 @@
+
+
+ 优惠劵
+ {{plugins_choice_coupon_value}}
+
+
@@ -79,4 +85,38 @@
-
\ No newline at end of file
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index c9b79e035..a48234485 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
{
- "pages": ["pages/goods-detail/goods-detail",
+ "pages": [
"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.wxml b/public/appmini/old/weixin/pages/buy/buy.wxml
index 8be28243f..a9eea9e64 100755
--- a/public/appmini/old/weixin/pages/buy/buy.wxml
+++ b/public/appmini/old/weixin/pages/buy/buy.wxml
@@ -89,34 +89,34 @@
-
\ No newline at end of file
+
+
+ 不使用优惠劵
+
+
+
+
+
+ ¥
+ {{item.coupon.discount_value}}
+ {{item.coupon.type_unit}}
+ {{item.coupon.desc}}
+
+ {{item.coupon.use_limit_type_name}}
+ {{item.time_start_text}} 至 {{item.time_end_text}}
+
+
+
+ {{plugins_use_coupon_id == item.id ? '已选' : '选择'}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/buy/buy.wxss b/public/appmini/old/weixin/pages/buy/buy.wxss
index 21d393ba7..25ee49054 100755
--- a/public/appmini/old/weixin/pages/buy/buy.wxss
+++ b/public/appmini/old/weixin/pages/buy/buy.wxss
@@ -133,7 +133,10 @@
}
/**
- * 插件
+ * 插件样式区域
+ */
+ /**
+ * 优惠劵
*/
.plugins-coupon {
padding: 25rpx 40rpx 25rpx 10rpx;
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index e0932bbaf..240e0b280 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -69,7 +69,7 @@ Page({
params = app.launch_params_handle(params);
// 参数赋值,初始化
- params['goods_id']=2;
+ //params['goods_id']=2;
this.setData({params: params});
this.init();
},