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
You need to sign in or sign up before continuing.
Commit
51c917d3
authored
Nov 27, 2019
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
已失效优惠券最多只显示20,并增加文字说明
parent
0f70d2fd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
30 deletions
+35
-30
coupons.js
src/pages/coupons/coupons.js
+1
-1
coupons.wxml
src/pages/coupons/coupons.wxml
+29
-29
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({
this
.
setData
({
invalidCouponList
:
this
.
data
.
invalidPageNo
==
1
?
[...
data
.
content
]:
[...
this
.
data
.
invalidCouponList
,...
data
.
content
],
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 @@
wx:for="{{couponList}}"
wx:for-item="item"
wx:for-index="k"
wx:key="{{k}}"
>
<view data-title="{{item.title}}"
data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
wx:key="{{k}}"
>
<view data-title="{{item.title}}"
data-cardNo="{{item.cardNo}}" data-id="{{item.couponId}}" bindtap="handelPresentCouponDetail">
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
<view class='coupon-img' >
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
...
...
@@ -43,32 +43,32 @@
</swiper-item>
<swiper-item>
<scroll-view scroll-y wx:if="{{invalidCouponList.length}}">
<view class='coupon-wrap'
>
<view
class='coupon-list'
wx:for="{{invalidCouponList}}"
wx:for-item="item
"
wx:for-index="k
"
wx:key="{{k}}
"
>
<view class='invalid-coupon' />
<!--5 已使用 !5 过期-->
<image wx:if="{{item.status == 5}}" src='/assets/imgs/invalid.png' class='invalid-img' />
<image wx:else src='/assets/imgs/expired.png' class='invalid-img' />
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'>
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/qr-code.png' />
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
<!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</view>
</view>
<no-more wx:if="{{noMoreCouponInvalid}}" />
<view class='invalid-coupon-tips'>只显示最近20张已失效优惠券</view
>
<view class='coupon-wrap'>
<view
class='coupon-list'
wx:for="{{invalidCouponList}}
"
wx:for-item="item
"
wx:for-index="k
"
wx:key="{{k}}"
>
<view class='invalid-coupon' />
<!--5 已使用 !5 过期-->
<image wx:if="{{item.status == 5}}" src='/assets/imgs/invalid.png' class='invalid-img' />
<image wx:else src='/assets/imgs/expired.png' class='invalid-img' />
<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
<view class='coupon-img'>
<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
<image wx:else src='/assets/imgs/qr-code.png' />
</view>
<view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.title}}</view>
<view class='coupon-time fs-24'>{{item.startTime}} 至 {{item.endTime}}</view>
<!-- <view class='coupon-desc fs-24'>{{item.notice}}</view> -->
</view>
<view class='coupon-code fs-24'>出示劵码</view>
</view>
</view>
<no-more wx:if="{{noMoreCouponInvalid}}" />
</scroll-view>
<view class='empty-wrap' wx:if="{{!invalidCouponList.length}}">
...
...
src/pages/coupons/coupons.wxss
View file @
51c917d3
...
...
@@ -41,6 +41,11 @@ scroll-view{
.coupon-wrap{
padding: 20rpx;
}
.invalid-coupon-tips{
padding: 0 20rpx;
color: #666666;
font-size: 24rpx;
}
.coupon-list{
width: 712rpx;
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