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
7e76240b
Commit
7e76240b
authored
Mar 24, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码,定额券
parent
279554d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
selectCoupon.js
src/component/selectCoupon/selectCoupon.js
+1
-1
selectCoupon.wxml
src/component/selectCoupon/selectCoupon.wxml
+3
-3
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+10
-0
No files found.
src/component/selectCoupon/selectCoupon.js
View file @
7e76240b
...
...
@@ -105,7 +105,7 @@ Component({
this
.
setData
({
newConponOrderList
},
()
=>
{
// this.hidePopup()
this
.
hidePopup
();
})
},
hidePopup
:
function
()
{
// 隐藏弹出框
...
...
src/component/selectCoupon/selectCoupon.wxml
View file @
7e76240b
...
...
@@ -12,8 +12,8 @@
</view>
<view class="modal-info" wx:if="{{newConponOrderList.length}}">
<block wx:for="{{newConponOrderList}}" wx:key="
{{index}}
" wx:for-item="item">
<block wx:for="{{item.couponDTOS}}" wx:key="
{{index}}
" wx:for-item="coupon">
<block wx:for="{{newConponOrderList}}" wx:key="
*this
" wx:for-item="item">
<block wx:for="{{item.couponDTOS}}" wx:key="
*this
" wx:for-item="coupon">
<view
class="coupon-list"
data-id="{{coupon.id}}"
...
...
@@ -39,7 +39,7 @@
</view>
<view class="right-info">
<view class="coupon-title">{{coupon.title}}</view>
<view wx:for="{{coupon.newNotice}}" wx:key="
{{index}}
" wx:for-item="notice">
<view wx:for="{{coupon.newNotice}}" wx:key="
*this
" wx:for-item="notice">
<text class='coupon-time'>{{notice.label}}</text>
<text class='coupon-desc wpl'>{{notice.value}}</text>
</view>
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
7e76240b
...
...
@@ -220,6 +220,7 @@ wxService.page({
},
// select 传过来
updateCoupon
(
e
)
{
console
.
log
(
e
)
// faceAmount 抵用多少钱(分) 1 抵用券 2 折扣券 3 定额券
if
(
!
e
.
detail
)
{
this
.
setData
({
...
...
@@ -260,7 +261,16 @@ wxService.page({
currentCoupon
:
`
${
couponDiscount
}
元`
});
}
else
if
(
type
==
3
){
//定额券
this
.
setData
({
defalutCoupon
:
true
,
defalutCouponId
:
finCouponId
?
''
:
defalutCouponId
,
[
finCouponName
]:
finCouponId
,
haveCoupon
:
true
,
currentCoupon
:
`
${
couponDiscount
}
元`
})
}
// 实付款
this
.
setPayPrice
();
},
...
...
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