Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
80691e18
Commit
80691e18
authored
Oct 29, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
selectCoupon
parent
d842823f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
selectCoupon.js
src/component/selectCoupon/selectCoupon.js
+10
-1
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+5
-9
No files found.
src/component/selectCoupon/selectCoupon.js
View file @
80691e18
...
...
@@ -78,8 +78,17 @@ Component({
if
(
coupon
.
checked
)
{
coupon
.
checked
=
coupon
.
checked
?
false
:
true
}
else
{
coupon
.
checked
=
coupon
.
id
==
id
?
true
:
false
if
(
coupon
.
id
)
{
coupon
.
checked
=
coupon
.
id
==
id
?
true
:
false
}
else
if
(
coupon
.
couponSettingId
)
{
coupon
.
checked
=
coupon
.
couponSettingId
==
sid
?
true
:
false
}
}
// if(coupon.checked) {
// coupon.checked = coupon.checked ? false : true
// } else {
// coupon.checked = coupon.id == id ? true : false
// }
}
)
})
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
80691e18
...
...
@@ -103,14 +103,11 @@ wxService.page({
}
const
{
faceAmount
,
type
,
id
,
couponDiscount
,
sid
}
=
e
.
detail
const
{
defalutCouponId
}
=
this
.
data
console
.
log
(
'detail====='
,
e
.
detail
)
const
{
orderPrice
}
=
this
.
data
// couponId---id couponSettingId --sid
let
finCouponId
=
id
?
id
:
sid
let
finCouponName
=
id
?
'couponId'
:
'couponSettingId'
console
.
log
(
'upppppppppppppp'
,
finCouponName
,
finCouponId
)
console
.
log
(
'sele'
,
finCouponName
,
finCouponId
)
if
(
type
==
1
)
{
this
.
setData
({
defalutCoupon
:
true
,
...
...
@@ -252,7 +249,6 @@ wxService.page({
}
},
bindMultiPickerColumnChange
(
e
)
{
console
.
log
(
'0000'
,
e
)
const
detail
=
e
.
detail
const
index
=
detail
.
value
let
cityName
=
''
...
...
@@ -427,10 +423,10 @@ wxService.page({
addressId
:
addressId
?
addressId
:
addressInfo
.
id
// 微信地址 or 地址id
}
console
.
log
(
'defalutCoupon'
,
this
.
data
.
defalutCoupon
)
console
.
log
(
'couponIdiiiiiiiiiiiidddddd'
,
couponId
)
console
.
log
(
'couponSettingIdiiiiiiidddddd'
,
couponSettingId
)
console
.
log
(
'defalutCouponIdiiiiiiiiiiiiiidddddd'
,
defalutCouponId
)
//
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
)
// 下单
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment