From 505afee761e2de7e4714fb413217e4b17c0023f9 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 10 Apr 2019 15:37:35 +0800 Subject: [PATCH] =?UTF-8?q?[formId][=E4=BF=AE=E6=94=B9]:[order/save?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=8A=E4=BC=A0formId=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/bargain/bargain.js | 6 ++- pages/bargain/bargain.wxml | 13 +++-- pages/bargain/bargainDatail/bargainDatail.js | 4 +- .../bargain/bargainDatail/bargainDatail.wxml | 16 +++--- pages/cardListDetail/cardListDetail.js | 2 +- pages/coupon/detail/index.js | 1 + pages/coupon/detail/index.wxml | 22 ++++---- pages/joinFrDpell/index.js | 9 +++- pages/joinFrDpell/index.wxml | 39 ++++++++------ pages/spellGroup/mySpellGroup/index.js | 8 +-- pages/spellGroup/mySpellGroup/index.wxml | 36 +++++++------ pages/spellGroup/spellGroup.js | 52 +++++++++---------- 12 files changed, 118 insertions(+), 90 deletions(-) diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index cacce2a..18aa910 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -177,11 +177,12 @@ Page({ /** * 如果是重新砍价,需要重新下单 */ - orderSave: function (couponId,couponChannelId) { + orderSave: function (couponId,couponChannelId,formId) { Http.post({ url: config.api.orderSave, data: { couponId: "" + couponId, + formId:formId, couponChannelId:""+couponChannelId, press: true } @@ -210,10 +211,11 @@ Page({ barginAgain: function (e) { let that = this; console.log(e) + let formId = e.detail.formId; let couponId = e.currentTarget.dataset.couponid; let couponChannelId = e.currentTarget.dataset.couponchannelid; // let orderId = e.currentTarget.dataset.id; - that.orderSave(couponId,couponChannelId) + that.orderSave(couponId,couponChannelId,formId) }, mybargain: function () { let that = this; diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml index 7516844..cc2cd11 100644 --- a/pages/bargain/bargain.wxml +++ b/pages/bargain/bargain.wxml @@ -39,10 +39,15 @@ 立即支付 - - 重新砍价 - - + +
+ + + + +
+ diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 473d188..a756957 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -297,6 +297,7 @@ Page({ */ orderFunc1(e) { var that = this; + let formId = e.detail.formId; that.setData({ showButton: true }) @@ -313,7 +314,8 @@ Page({ */ var data = { couponChannelId:e.currentTarget.dataset.couponchannelid, - couponId:e.currentTarget.dataset.couponid + couponId:e.currentTarget.dataset.couponid, + formId:formId } return Http.post({ url: config.api.orderSave, diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml index 43f51d7..8189f1c 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxml +++ b/pages/bargain/bargainDatail/bargainDatail.wxml @@ -60,13 +60,15 @@ - - - - +
+ + + + +
diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js index ea6a944..913cf36 100644 --- a/pages/cardListDetail/cardListDetail.js +++ b/pages/cardListDetail/cardListDetail.js @@ -324,7 +324,7 @@ Page({ .then(res => { var data = { couponChannelId: "" + that.data.couponChannelId, - couponId: "" + that.data.couponId + couponId: "" + that.data.couponId, }; if (that.data.couponChannelId == null) { var data = { diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 965151f..a1a8615 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -254,6 +254,7 @@ Page({ */ gotopay: function(e) { let that = this; + console.log(e) let formId = e.detail.formId; var discount = e.currentTarget.dataset.discount; that.setData({ diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 5397c00..080fd38 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -105,16 +105,18 @@ - - - - - +
+ + + + + +
diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 526a3a6..e177597 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -84,8 +84,12 @@ Page({ /** * 直接购买 */ - gotoBuy() { + gotoBuy(e) { console.log(22222) + let formId = e.detail.formId; + that.setData({ + formId:formId + }) this.setData({ canBuyIf: false }) @@ -272,7 +276,8 @@ Page({ orderFunc(orderGroupId) { let data = { couponChannelId: this.data.data.id, - couponId: this.data.data.couponId + couponId: this.data.data.couponId, + orderId:this.data.formId } /** * 拼团订单 diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml index 2c5d3c9..3390cd8 100644 --- a/pages/joinFrDpell/index.wxml +++ b/pages/joinFrDpell/index.wxml @@ -43,24 +43,29 @@ - - - - - {{data.price}} - - - 立即购买 - - - - - {{data.salePrice}} - - - 参加拼团 + + +
+ + + + + + + {{data.salePrice}} + + + 参加拼团 + - +
+
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 125bb1c..24c6e0f 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -73,10 +73,11 @@ Page({ /** * 直接购买 */ - gotoBuy(){ + gotoBuy(e){ console.log(22222) this.setData({ - canBuyIf: false + canBuyIf: false, + formId:e.detail.formId }) this.orderFunc() }, @@ -262,7 +263,8 @@ Page({ orderFunc(orderGroupId) { let data = { couponChannelId: this.data.data.id, - couponId: this.data.data.couponId + couponId: this.data.data.couponId, + formId:this.data.formId } /** * 拼团订单 diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml index 4f04dfc..3605d32 100644 --- a/pages/spellGroup/mySpellGroup/index.wxml +++ b/pages/spellGroup/mySpellGroup/index.wxml @@ -49,24 +49,26 @@ - - - - - {{data.price}} - +
+ + + + + + + {{data.salePrice}} + + + 发起拼团 + - 立即购买 - - - - - {{data.salePrice}} - - - 发起拼团 - - +
\ No newline at end of file diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 69c03bb..8bb1712 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -339,30 +339,30 @@ Page({ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${e.currentTarget.dataset.id}` }) }, - barginAgain: function (e) { - let that = this; - console.log(e) - let couponId = e.currentTarget.dataset.couponid; - let couponChannelId = e.currentTarget.dataset.couponchannelid; - // let orderId = e.currentTarget.dataset.id; - that.orderSave(couponId, couponChannelId) - }, - myspellList: function () { - let that = this; - that.setData({ - spellList: false, - myspellList: true, - flag: "myspellList", - allow_load: true, - loading: false, - content: "", - page: 1 - }) - that.getList(1, 'myspellList'); - wx.setNavigationBarTitle({ - title: '我的砍价' - }) - }, + // barginAgain: function (e) { + // let that = this; + // console.log(e) + // let couponId = e.currentTarget.dataset.couponid; + // let couponChannelId = e.currentTarget.dataset.couponchannelid; + // // let orderId = e.currentTarget.dataset.id; + // that.orderSave(couponId, couponChannelId) + // }, + // myspellList: function () { + // let that = this; + // that.setData({ + // spellList: false, + // myspellList: true, + // flag: "myspellList", + // allow_load: true, + // loading: false, + // content: "", + // page: 1 + // }) + // that.getList(1, 'myspellList'); + // wx.setNavigationBarTitle({ + // title: '我的砍价' + // }) + // }, spellList: function () { let that = this; that.setData({ @@ -403,8 +403,8 @@ Page({ that.getList(that.data.page, that.data.flag); }, /** -* 刷新 -*/ + * 刷新 + */ onPullDownRefresh: function (e) { let that = this; if (that.data.flag == 'spellList') {