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
51c917d3
Commit
51c917d3
authored
Nov 27, 2019
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
已失效优惠券最多只显示20,并增加文字说明
parent
0f70d2fd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
coupons.js
src/pages/coupons/coupons.js
+1
-1
coupons.wxml
src/pages/coupons/coupons.wxml
+5
-5
coupons.wxss
src/pages/coupons/coupons.wxss
+5
-0
No files found.
src/pages/coupons/coupons.js
View file @
51c917d3
...
@@ -143,7 +143,7 @@ wxService.page({
...
@@ -143,7 +143,7 @@ wxService.page({
this
.
setData
({
this
.
setData
({
invalidCouponList
:
this
.
data
.
invalidPageNo
==
1
?
[...
data
.
content
]:
[...
this
.
data
.
invalidCouponList
,...
data
.
content
],
invalidCouponList
:
this
.
data
.
invalidPageNo
==
1
?
[...
data
.
content
]:
[...
this
.
data
.
invalidCouponList
,...
data
.
content
],
invalidTotalPages
:
data
.
totalPages
,
invalidTotalPages
:
data
.
totalPages
,
invalidTotalElements
:
data
.
totalElements
invalidTotalElements
:
data
.
totalElements
>
20
?
20
:
data
.
totalElements
,
})
})
}
}
}
}
...
...
src/pages/coupons/coupons.wxml
View file @
51c917d3
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
wx:for="{{couponList}}"
wx:for="{{couponList}}"
wx:for-item="item"
wx:for-item="item"
wx:for-index="k"
wx:for-index="k"
wx:key="{{k}}"
wx:key="{{k}}"
>
>
<view data-title="{{item.title}}"
<view data-title="{{item.title}}"
data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
<view class='coupon-img' >
<view class='coupon-img' >
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
...
@@ -43,14 +43,14 @@
...
@@ -43,14 +43,14 @@
</swiper-item>
</swiper-item>
<swiper-item>
<swiper-item>
<scroll-view scroll-y wx:if="{{invalidCouponList.length}}">
<scroll-view scroll-y wx:if="{{invalidCouponList.length}}">
<view class='invalid-coupon-tips'>只显示最近20张已失效优惠券</view>
<view class='coupon-wrap'>
<view class='coupon-wrap'>
<view
<view
class='coupon-list'
class='coupon-list'
wx:for="{{invalidCouponList}}"
wx:for="{{invalidCouponList}}"
wx:for-item="item"
wx:for-item="item"
wx:for-index="k"
wx:for-index="k"
wx:key="{{k}}"
wx:key="{{k}}">
>
<view class='invalid-coupon' />
<view class='invalid-coupon' />
<!--5 已使用 !5 过期-->
<!--5 已使用 !5 过期-->
<image wx:if="{{item.status == 5}}" src='/assets/imgs/invalid.png' class='invalid-img' />
<image wx:if="{{item.status == 5}}" src='/assets/imgs/invalid.png' class='invalid-img' />
...
...
src/pages/coupons/coupons.wxss
View file @
51c917d3
...
@@ -41,6 +41,11 @@ scroll-view{
...
@@ -41,6 +41,11 @@ scroll-view{
.coupon-wrap{
.coupon-wrap{
padding: 20rpx;
padding: 20rpx;
}
}
.invalid-coupon-tips{
padding: 0 20rpx;
color: #666666;
font-size: 24rpx;
}
.coupon-list{
.coupon-list{
width: 712rpx;
width: 712rpx;
height: 209rpx;
height: 209rpx;
...
...
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