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
b08c5314
Commit
b08c5314
authored
Sep 20, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
preview_addressId
parent
bfbb8bb3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
30 deletions
+39
-30
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+39
-30
No files found.
src/pages/confirmOrder/confirmOrder.js
View file @
b08c5314
...
@@ -25,7 +25,7 @@ wxService.page({
...
@@ -25,7 +25,7 @@ wxService.page({
orderPrice
:
null
,
// 订单金额
orderPrice
:
null
,
// 订单金额
orderInitPrice
:
0
,
orderInitPrice
:
0
,
plusMemberPrice
:
0
,
// plus 默认价
plusMemberPrice
:
0
,
// plus 默认价
plusMemberName
:
''
,
plusMemberName
:
''
,
defalutCoupon
:
''
,
defalutCoupon
:
''
,
addressId
:
''
,
// 收货地址id
addressId
:
''
,
// 收货地址id
showPlus
:
null
showPlus
:
null
...
@@ -41,10 +41,8 @@ wxService.page({
...
@@ -41,10 +41,8 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
console
.
log
(
'dddd'
,
app
.
globalData
.
isPlusVip
)
console
.
log
(
'dddd'
,
app
.
globalData
.
isPlusVip
)
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
let
pages
=
getCurrentPages
();
let
pages
=
getCurrentPages
();
let
currPage
=
pages
[
pages
.
length
-
1
];
let
currPage
=
pages
[
pages
.
length
-
1
];
...
@@ -56,24 +54,24 @@ wxService.page({
...
@@ -56,24 +54,24 @@ wxService.page({
// 下单 && 计算优惠价
// 下单 && 计算优惠价
this
.
setData
({
this
.
setData
({
trolleySku2Buy
:
tradeDto
.
trolleySku2Buy
,
trolleySku2Buy
:
tradeDto
.
trolleySku2Buy
,
showPlus
:
app
.
globalData
.
isPlusVip
?
false
:
true
showPlus
:
app
.
globalData
.
isPlusVip
?
false
:
true
},
()
=>
{
},
()
=>
{
console
.
log
(
'showPlus'
,
this
.
data
.
showPlus
)
this
.
initCitys
()
const
{
trolleySku2Buy
,
checkByPremium
}
=
this
.
data
// 地址列表
let
params
=
{
this
.
getAddressList
()
checkByPremium
,
// if (!this.data.wxAddress){
trolleySku2Buy
// this.getAddressList()
}
// }
this
.
calPreferentialPrice
(
params
)
// 计算优惠价
})
})
this
.
initCitys
()
// this.initCitys()
// 地址列表
// // 地址列表
if
(
!
this
.
data
.
wxAddress
){
// this.getAddressList()
this
.
getAddressList
()
// // if (!this.data.wxAddress){
}
// // this.getAddressList()
// // }
},
},
updateCoupon
(
e
)
{
updateCoupon
(
e
)
{
// faceAmount 抵用多少钱(分) 1 抵用券 2 折扣券
// faceAmount 抵用多少钱(分) 1 抵用券 2 折扣券
...
@@ -101,7 +99,7 @@ wxService.page({
...
@@ -101,7 +99,7 @@ wxService.page({
},
},
setPayPrice
()
{
setPayPrice
()
{
const
{
currentCoupon
,
orderInitPrice
,
isSelect
,
plusMemberPrice
}
=
this
.
data
const
{
currentCoupon
,
orderInitPrice
,
isSelect
,
plusMemberPrice
}
=
this
.
data
let
newCurrentCoupon
=
currentCoupon
?
currentCoupon
:
0
let
newCurrentCoupon
=
currentCoupon
?
currentCoupon
:
0
let
orderCoupon
=
parseFloat
(
newCurrentCoupon
)
// 优惠券价格
let
orderCoupon
=
parseFloat
(
newCurrentCoupon
)
// 优惠券价格
let
plusPrice
=
isSelect
?
plusMemberPrice
:
0
// plus
let
plusPrice
=
isSelect
?
plusMemberPrice
:
0
// plus
// 实际价格 - 优惠价 + plus
// 实际价格 - 优惠价 + plus
...
@@ -244,17 +242,19 @@ wxService.page({
...
@@ -244,17 +242,19 @@ wxService.page({
this
.
setData
({
this
.
setData
({
checkByPremium
:
isSelect
checkByPremium
:
isSelect
},
()
=>
{
},
()
=>
{
const
{
trolleySku2Buy
,
checkByPremium
}
=
this
.
data
const
{
trolleySku2Buy
,
checkByPremium
,
addressId
,
addressInfo
}
=
this
.
data
let
params
=
{
let
params
=
{
checkByPremium
,
checkByPremium
,
trolleySku2Buy
trolleySku2Buy
,
addressId
:
addressId
?
addressId
:
addressInfo
.
id
// 微信地址 or 地址id
}
}
this
.
calPreferentialPrice
(
params
)
// 重新计算优惠价
this
.
calPreferentialPrice
(
params
)
// 重新计算优惠价
// 获取默认付费会员设置
// 获取默认付费会员设置
this
.
getPremiumDefault
()
this
.
getPremiumDefault
()
})
})
})
})
},
},
// /premium/getDefault
// /premium/getDefault
getPremiumDefault
()
{
getPremiumDefault
()
{
...
@@ -266,10 +266,10 @@ wxService.page({
...
@@ -266,10 +266,10 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
plusMemberPrice
:
data
.
price
,
plusMemberPrice
:
data
.
price
,
plusMemberName
:
data
.
name
plusMemberName
:
data
.
name
},
()
=>
{
},
()
=>
{
// 实付款
// 实付款
this
.
setPayPrice
()
this
.
setPayPrice
()
})
})
...
@@ -283,6 +283,7 @@ wxService.page({
...
@@ -283,6 +283,7 @@ wxService.page({
},
},
// 计算优惠价
// 计算优惠价
calPreferentialPrice
(
params
)
{
calPreferentialPrice
(
params
)
{
console
.
log
(
'params'
,
params
)
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
})
})
...
@@ -291,11 +292,11 @@ wxService.page({
...
@@ -291,11 +292,11 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
currentOrderList
:
data
,
currentOrderList
:
data
,
defalutCoupon
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
].
couponDiscount
||
''
,
defalutCoupon
:
data
&&
data
.
couponDiscountPreviews
.
length
&&
data
.
couponDiscountPreviews
[
0
].
couponDiscount
||
''
,
orderInitPrice
:
data
.
amount
orderInitPrice
:
data
.
amount
},
()
=>
{
},
()
=>
{
// 实付款
// 实付款
this
.
setPayPrice
()
this
.
setPayPrice
()
})
})
...
@@ -304,7 +305,7 @@ wxService.page({
...
@@ -304,7 +305,7 @@ wxService.page({
})
})
},
},
handelGobuy
()
{
handelGobuy
()
{
const
{
trolleySku2Buy
,
couponId
,
addressId
,
addressInfo
}
=
this
.
data
const
{
trolleySku2Buy
,
couponId
,
addressId
,
addressInfo
}
=
this
.
data
let
params
=
{
let
params
=
{
couponId
,
couponId
,
trolleySku2Buy
,
trolleySku2Buy
,
...
@@ -370,8 +371,16 @@ wxService.page({
...
@@ -370,8 +371,16 @@ wxService.page({
this
.
setData
({
this
.
setData
({
addressInfo
:
_defalutAddress
addressInfo
:
_defalutAddress
},
()
=>
{
// preview
const
{
trolleySku2Buy
,
checkByPremium
,
addressId
,
addressInfo
}
=
this
.
data
let
params
=
{
checkByPremium
,
trolleySku2Buy
,
addressId
:
addressId
?
addressId
:
addressInfo
.
id
// 微信地址 or 地址id
}
this
.
calPreferentialPrice
(
params
)
// 计算优惠价
})
})
console
.
log
(
this
.
data
.
addressInfo
)
}
}
}
}
}).
finally
(()
=>
{
}).
finally
(()
=>
{
...
@@ -391,7 +400,7 @@ wxService.page({
...
@@ -391,7 +400,7 @@ wxService.page({
goodsAddress
:
false
,
goodsAddress
:
false
,
wxAddress
:
true
,
wxAddress
:
true
,
addressInfo
:
res
,
addressInfo
:
res
,
params
:{
params
:
{
userId
:
memberId
,
userId
:
memberId
,
name
:
res
.
userName
,
name
:
res
.
userName
,
phone
:
res
.
telNumber
,
phone
:
res
.
telNumber
,
...
@@ -407,7 +416,7 @@ wxService.page({
...
@@ -407,7 +416,7 @@ wxService.page({
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
addressId
:
data
addressId
:
data
})
})
}
}
}).
finally
(()
=>
{
}).
finally
(()
=>
{
...
...
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