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
37acb952
Commit
37acb952
authored
May 24, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 兑换弹框样式
parent
9506014c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
12 deletions
+33
-12
exchange-coupon-modal.js
src/component/exchange-coupon-modal/exchange-coupon-modal.js
+1
-1
exchange-coupon-modal.wxml
...omponent/exchange-coupon-modal/exchange-coupon-modal.wxml
+1
-1
exchange-coupon-modal.wxss
...omponent/exchange-coupon-modal/exchange-coupon-modal.wxss
+11
-6
IntegralMall.js
src/pages/IntegralMall/IntegralMall.js
+8
-1
IntegralMall.json
src/pages/IntegralMall/IntegralMall.json
+3
-1
IntegralMall.wxml
src/pages/IntegralMall/IntegralMall.wxml
+2
-1
project.config.json
src/project.config.json
+7
-1
No files found.
src/component/exchange-coupon-modal/exchange-coupon-modal.js
View file @
37acb952
...
@@ -11,7 +11,7 @@ Component({
...
@@ -11,7 +11,7 @@ Component({
* 组件的初始数据
* 组件的初始数据
*/
*/
data
:
{
data
:
{
couponNum
:
'
2
'
couponNum
:
'
1
'
},
},
/**
/**
...
...
src/component/exchange-coupon-modal/exchange-coupon-modal.wxml
View file @
37acb952
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
</view>
</view>
<view class="modal-content">
<view class="modal-content">
<view class='modal-desc'>
<view class='modal-desc'>
<text>
500
积分</text>
<text>
<text class="num">500</text>
积分</text>
<view class='coupon-number'>
<view class='coupon-number'>
<view class="redus" catchtap="minusNum">-</view>
<view class="redus" catchtap="minusNum">-</view>
<input type="number" catchtap bindblur="blurNum" bindinput="inputNum" value="{{couponNum}}"></input>
<input type="number" catchtap bindblur="blurNum" bindinput="inputNum" value="{{couponNum}}"></input>
...
...
src/component/exchange-coupon-modal/exchange-coupon-modal.wxss
View file @
37acb952
...
@@ -16,22 +16,25 @@
...
@@ -16,22 +16,25 @@
background-color: rgba(0, 0, 0, 0.6);
background-color: rgba(0, 0, 0, 0.6);
opacity: 1;
opacity: 1;
z-index: 3;
z-index: 3;
}
}
.num {
color: rgb(255, 152, 0);
padding-right:10rpx;
}
.modal-container {
.modal-container {
position: fixed;
position: fixed;
left: 96rpx;
left: 96rpx;
top: 30%;
top: 30%;
background-color: #fff;
background-color: #fff;
width: 558rpx;
width: 558rpx;
height: 4
56
rpx;
height: 4
00
rpx;
z-index: 4;
z-index: 4;
border-radius: 20rpx;
border-radius: 20rpx;
}
}
.modal-header{
.modal-header{
padding: 38rpx 56rpx;
padding: 38rpx 56rpx;
border-radius: 20rpx;
background-color: rgb(227, 223, 223);
}
}
.modal-title{
.modal-title{
font-size: 32rpx;
font-size: 32rpx;
...
@@ -61,8 +64,10 @@
...
@@ -61,8 +64,10 @@
.cancel,.query{
.cancel,.query{
display: inline-block;
display: inline-block;
width: 200rpx;
width: 200rpx;
font-size: 28rpx;
font-size: 26rpx;
border-radius: 40rpx;
}
.query {
background: rgb(2, 187, 112)
}
}
.cancel{
.cancel{
margin-right: 30rpx;
margin-right: 30rpx;
...
...
src/pages/IntegralMall/IntegralMall.js
View file @
37acb952
...
@@ -14,7 +14,8 @@ wxService.page({
...
@@ -14,7 +14,8 @@ wxService.page({
query
:
''
,
query
:
''
,
totalPages
:
0
,
totalPages
:
0
,
integralCouponList
:
[],
// 积分兑换优惠券列表
integralCouponList
:
[],
// 积分兑换优惠券列表
noMore
:
false
noMore
:
false
,
isExchange
:
false
},
},
/**
/**
...
@@ -48,6 +49,12 @@ wxService.page({
...
@@ -48,6 +49,12 @@ wxService.page({
wx
.
hideLoading
();
wx
.
hideLoading
();
})
})
},
},
//立即兑换
exchange
(){
this
.
setData
({
isExchange
:
true
})
},
// 点击跳转至会员规则页
// 点击跳转至会员规则页
handleGoMemberRulesRules
()
{
handleGoMemberRulesRules
()
{
wxService
.
router
(
`/pages/memberRules/memberRules`
)
wxService
.
router
(
`/pages/memberRules/memberRules`
)
...
...
src/pages/IntegralMall/IntegralMall.json
View file @
37acb952
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
"enablePullDownRefresh"
:
true
,
"enablePullDownRefresh"
:
true
,
"navigationBarTitleText"
:
"积分商城"
,
"navigationBarTitleText"
:
"积分商城"
,
"usingComponents"
:
{
"usingComponents"
:
{
"no-more"
:
"/component/noMore/noMore"
"no-more"
:
"/component/noMore/noMore"
,
"exchange-coupon-modal"
:
"/component/exchange-coupon-modal/exchange-coupon-modal"
}
}
}
}
\ No newline at end of file
src/pages/IntegralMall/IntegralMall.wxml
View file @
37acb952
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<view class='coupon-time fs-24'>{{item.startTime}}</view>
<view class='coupon-time fs-24'>{{item.startTime}}</view>
<view class='coupon-desc fs-24' data-id="{{item.id}}" bindtap="goCouponDetail">查看详情</view>
<view class='coupon-desc fs-24' data-id="{{item.id}}" bindtap="goCouponDetail">查看详情</view>
</view>
</view>
<view class='coupon-code fs-24'>立即兑换</view>
<view class='coupon-code fs-24'
bindtap='exchange'
>立即兑换</view>
</view>
</view>
</view>
</view>
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
...
@@ -21,5 +21,6 @@
...
@@ -21,5 +21,6 @@
<view class='empty-text'>没有任何卡劵</view>
<view class='empty-text'>没有任何卡劵</view>
</view>
</view>
</view>
</view>
<exchange-coupon-modal isExchange='{{isExchange}}'/>
<no-more wx:if="{{noMore}}"/>
<no-more wx:if="{{noMore}}"/>
</view>
</view>
src/project.config.json
View file @
37acb952
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
"list"
:
[]
"list"
:
[]
},
},
"miniprogram"
:
{
"miniprogram"
:
{
"current"
:
-1
,
"current"
:
8
,
"list"
:
[
"list"
:
[
{
{
"id"
:
-1
,
"id"
:
-1
,
...
@@ -86,6 +86,12 @@
...
@@ -86,6 +86,12 @@
"name"
:
"welvcom"
,
"name"
:
"welvcom"
,
"pathName"
:
"pages/welcome/welcome"
,
"pathName"
:
"pages/welcome/welcome"
,
"query"
:
""
"query"
:
""
},
{
"id"
:
8
,
"name"
:
"我的卡券"
,
"pathName"
:
"pages/coupons/coupons"
,
"query"
:
""
}
}
]
]
}
}
...
...
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