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
8238a249
Commit
8238a249
authored
Oct 25, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isSelect ? 'couponSettingId' : 'couponId'
parent
d9aac290
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
selectCoupon.js
src/component/selectCoupon/selectCoupon.js
+3
-5
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+12
-3
No files found.
src/component/selectCoupon/selectCoupon.js
View file @
8238a249
...
...
@@ -38,18 +38,16 @@ Component({
if
(
couponList
.
length
)
{
couponList
.
map
(
coupon
=>
{
console
.
log
(
'22222'
,
coupon
)
coupon
.
couponDTOS
.
forEach
(
item
=>
{
// item.checked = false
coupon
.
couponDTOS
.
forEach
((
item
,
index
)
=>
{
item
.
checked
=
false
item
[
0
].
checked
=
true
coupon
.
couponDTOS
[
0
].
checked
=
true
item
.
couponDiscount
=
coupon
.
couponDiscount
item
.
title
=
coupon
.
couponSettingDTO
.
title
item
.
type
=
coupon
.
couponSettingDTO
.
type
item
.
faceAmount
=
coupon
.
couponSettingDTO
.
faceAmount
item
.
takeCouponBgimg
=
coupon
.
couponSettingDetailDTO
.
style
.
takeCouponBgimg
// notice 格式
item
.
newNotice
=
JSON
.
parse
(
item
.
notice
)
console
.
log
(
'11111'
,
item
)
item
.
newNotice
=
item
&&
item
.
notice
?
JSON
.
parse
(
item
.
notice
)
:
''
for
(
let
i
in
item
.
newNotice
)
{
if
(
item
.
newNotice
[
i
].
type
==
1
)
{
item
.
newNotice
[
i
].
value
=
item
.
startTime
.
substring
(
0
,
10
)
+
' 至 '
+
item
.
endTime
.
substring
(
0
,
10
)
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
8238a249
...
...
@@ -370,6 +370,7 @@ wxService.page({
currentOrderList
:
data
,
defalutCoupon
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
].
couponSettingDTO
.
type
==
1
?
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
].
couponSettingDTO
.
faceAmount
/
100
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
]
&&
data
.
couponDiscountPreviews
[
0
].
couponDiscount
,
defalutCouponId
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
]
&&
data
.
couponDiscountPreviews
[
0
].
couponDTOS
[
0
]
&&
data
.
couponDiscountPreviews
[
0
].
couponDTOS
[
0
].
id
||
''
,
couponSettingId
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
]
&&
data
.
couponDiscountPreviews
[
0
].
couponDTOS
[
0
]
&&
data
.
couponDiscountPreviews
[
0
].
couponDTOS
[
0
].
couponSettingId
||
''
,
orderInitPrice
:
data
.
amount
},
()
=>
{
// 实付款
...
...
@@ -380,14 +381,22 @@ wxService.page({
})
},
handelGobuy
()
{
const
{
trolleySku2Buy
,
couponId
,
addressId
,
addressInfo
,
defalutCouponId
}
=
this
.
data
// 第一项 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
let
params
=
{
couponId
:
couponId
?
couponId
:
defalutCouponId
,
[
finCouponName
]:
finCouponId
,
// couponId: couponId? couponId : defalutCouponId,
trolleySku2Buy
,
addressId
:
addressId
?
addressId
:
addressInfo
.
id
// 微信地址 or 地址id
}
this
.
getBill
(
params
)
// 下单
console
.
log
(
'params'
,
params
,
this
.
data
)
// this.getBill(params) // 下单
},
// 下单
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