Commit d842823f by 高淑倩

下单plus

parent a8f1eda6
......@@ -88,6 +88,7 @@ Component({
params = {
type,
id,
sid,
faceAmount: amount,
couponDiscount: couponDiscount
}
......
......@@ -9,8 +9,8 @@ wxService.page({
* 页面的初始数据
*/
data: {
couponId: null,
couponSettingId: null,
couponId: null, // 当前选中优惠券 id
couponSettingId: null, // 当前选中plus优惠券 id
checkByPremium: false,
addressInfo: [],
showSelectCoupon: false,
......@@ -33,7 +33,7 @@ wxService.page({
plusMemberPrice: 0, // plus 默认价
plusMemberName: '',
defalutCoupon: '',
defalutCouponId: '',
defalutCouponId: '', // 默认第一项
addressId: '', // 收货地址id
},
......@@ -92,7 +92,6 @@ wxService.page({
// select 传过来
updateCoupon(e) {
// faceAmount 抵用多少钱(分) 1 抵用券 2 折扣券
console.log('detail', e.detail)
if(!e.detail) {
this.setData({
defalutCoupon: 0,
......@@ -103,15 +102,19 @@ wxService.page({
return
}
const { faceAmount, type, id, couponDiscount,sid } = e.detail
const { defalutCouponId } = this.data
console.log('detail=====', e.detail)
const { orderPrice } = this.data
console.log('faceAmount', faceAmount)
// couponId couponSettingId
// couponId---id couponSettingId --sid
let finCouponId = id ? id : sid
let finCouponName = id ? 'couponId' : 'couponSettingId'
console.log('upppppppppppppp', finCouponName,finCouponId )
if (type == 1) {
this.setData({
defalutCoupon: true,
defalutCouponId: finCouponId ? '' : defalutCouponId,
[finCouponName] : finCouponId,
// couponId: id,
haveCoupon: true,
......@@ -123,6 +126,7 @@ wxService.page({
this.setData({
defalutCoupon: true,
[finCouponName] : finCouponId,
defalutCouponId: finCouponId ? '' : defalutCouponId,
// couponId: id,
haveCoupon: true,
currentCoupon: `${couponDiscount} 元`
......@@ -302,7 +306,11 @@ wxService.page({
const { isSelect } = this.data
console.log('isSelect', isSelect)
this.setData({
checkByPremium: isSelect
checkByPremium: isSelect,
defalutCoupon: 0,
couponId: '',
couponSettingId: '',
defalutCouponId: ''
}, () => {
const { trolleySku2Buy, checkByPremium, addressId, addressInfo } = this.data
......@@ -391,12 +399,27 @@ wxService.page({
},
handelGobuy() {
// 第一项 defalutCouponId couponId/
const { isSelect, trolleySku2Buy, couponId, couponSettingId, addressId, addressInfo, defalutCouponId } = this.data
let NoPlusCouponId = couponId ? couponId : defalutCouponId // couponId / 第一项 id
let finCouponName = isSelect ? 'couponSettingId' : 'couponId' // key
let finCouponId = isSelect ? couponSettingId: NoPlusCouponId // val
// let finCouponId = NoPlusCouponId ? NoPlusCouponId : couponSettingId
const { isSelect, defalutCoupon,trolleySku2Buy, couponId, couponSettingId, addressId, addressInfo, defalutCouponId } = this.data
// let NoPlusCouponId = couponId ? couponId : defalutCouponId // couponId / 第一项 id
let finCouponName,finCouponId
if(!defalutCoupon) {
finCouponName = 'couponId'
finCouponId = ''
} else {
// 当前选中 哪一个id couponSettingId
// 默认券存在 id settingId
let currentCouponId // couponId / 第一项 id
if(defalutCouponId) {
finCouponId = defalutCouponId
finCouponName = 'couponId'
} else {
currentCouponId = couponId ? couponId : couponSettingId
finCouponName = couponId ? 'couponId' : 'couponSettingId'
finCouponId = currentCouponId
}
}
let params = {
[finCouponName]: finCouponId,
// couponId: couponId? couponId : defalutCouponId,
......@@ -404,7 +427,11 @@ wxService.page({
addressId: addressId ? addressId : addressInfo.id // 微信地址 or 地址id
}
console.log('params', params, this.data)
console.log('defalutCoupon',this.data.defalutCoupon)
console.log('couponIdiiiiiiiiiiiidddddd',couponId)
console.log('couponSettingIdiiiiiiidddddd',couponSettingId)
console.log('defalutCouponIdiiiiiiiiiiiiiidddddd',defalutCouponId)
console.log('params', params)
this.getBill(params) // 下单
},
// 下单
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment