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
35c0a533
Commit
35c0a533
authored
May 06, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券修改
parent
e40e4551
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
17 deletions
+16
-17
index.js
src/config/index.js
+1
-1
couponDetail.js
src/pages/couponDetail/couponDetail.js
+3
-2
couponDetail.wxml
src/pages/couponDetail/couponDetail.wxml
+2
-4
coupons.js
src/pages/coupons/coupons.js
+10
-10
No files found.
src/config/index.js
View file @
35c0a533
...
...
@@ -9,7 +9,7 @@
const
PROJECT_ENV
=
'test'
// 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播
//门户 wx833d5ece112fc3fd
//2007 多多一上 , wxf7bc302c51166dc0 有直播
//2012 悦芙媞 wxfe14ebde4a6eea3d 有直播
...
...
src/pages/couponDetail/couponDetail.js
View file @
35c0a533
...
...
@@ -30,7 +30,7 @@ wxService.page({
this
.
getCouponDetail
(
cardno
,
type
)
this
.
setData
({
cardno
:
cardno
,
couponType
:
type
,
couponType
:
t
his
.
data
.
couponT
ype
,
});
},
//页面卸载
...
...
@@ -80,7 +80,8 @@ wxService.page({
data
.
coupon
.
startTime
=
data
.
coupon
.
startTime
.
substring
(
0
,
10
)
data
.
coupon
.
endTime
=
data
.
coupon
.
endTime
.
substring
(
0
,
10
)
data
.
coupon_name
=
data
.
couponSetting
.
title
;
data
.
couponSetting
.
notice
=
JSON
.
parse
(
data
.
couponSetting
.
notice
)
data
.
couponSetting
.
notice
=
JSON
.
parse
(
data
.
couponSetting
.
notice
);
data
.
indexImgUrl
=
data
.
couponDetail
.
style
.
takeCouponBgimg
;
for
(
let
i
in
data
.
couponSetting
.
notice
){
if
(
data
.
couponSetting
.
notice
[
i
].
type
==
1
){
data
.
couponSetting
.
notice
[
i
].
value
=
data
.
coupon
.
startTime
.
substring
(
0
,
10
)
+
' 至 '
+
data
.
coupon
.
endTime
.
substring
(
0
,
10
)
...
...
src/pages/couponDetail/couponDetail.wxml
View file @
35c0a533
...
...
@@ -13,9 +13,7 @@
<view class='coupon-name fs-28'>{{couponDetail.couponSetting.title}}</view>
<view class='coupon-desc fs-28'>{{couponDetail.coupon.startTime}} 至 {{couponDetail.coupon.endTime}}</view>
</view>
<view class='coupon-code fs-24' bindtap="handelPresentCouponCode" wx:if="{{!couponType}}">出示券码</view>
<view class='coupon-code fs-24' wx:if="{{couponType == 1}}">支付券</view>
<view class='coupon-code fs-24' wx:if="{{couponType == 2}}">包邮券</view>
<view class='coupon-code fs-24' bindtap="handelPresentCouponCode">出示券码</view>
</view>
<view class='integral-detail'>
<!-- <view class='integral-list'>
...
...
@@ -84,7 +82,7 @@
<!--goHome-->
<go-home/>
<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/>
<view class="position-bottom" wx:if="{{
!couponType
}}">
<view class="position-bottom" wx:if="{{
couponType == 'coupon'
}}">
<button type='primary' class="redeem-now" bindtap='handelPresentCouponCode'>出示券码</button>
</view>
...
...
src/pages/coupons/coupons.js
View file @
35c0a533
...
...
@@ -36,16 +36,16 @@ wxService.page({
});
// 所有可使用优惠券
if
(
current
==
0
){
this
.
getCouponList
(
1
,
10
,
1
)
}
else
if
(
current
==
1
){
//微信支付券
this
.
getPayCouponList
();
}
else
if
(
current
==
2
){
//包邮券
this
.
getPosCouponList
();
}
//
if( current == 0 ){
//
this.getCouponList(1,10,1)
//
}else if( current == 1){
//
//微信支付券
//
this.getPayCouponList();
//
}
//
else if(current == 2){
//
//包邮券
//
this.getPosCouponList();
//
}
}
,
/**
* 生命周期函数--监听页面加载
...
...
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