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
57f6ff1d
Commit
57f6ff1d
authored
Jun 05, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
积分规则
parent
48151cef
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
75 additions
and
86 deletions
+75
-86
seven-bg.png
src/assets/imgs/seven-bg.png
+0
-0
authorization-modal.js
src/component/authorization-modal/authorization-modal.js
+1
-1
personCenter.js
src/component/personCenter/personCenter.js
+9
-1
personCenter.wxml
src/component/personCenter/personCenter.wxml
+1
-1
IntegralMall.js
src/pages/IntegralMall/IntegralMall.js
+1
-1
integralWater.js
src/pages/integralWater/integralWater.js
+1
-1
integralWater.wxml
src/pages/integralWater/integralWater.wxml
+1
-1
memberOfOwn.js
src/pages/memberOfOwn/memberOfOwn.js
+19
-0
memberOfOwn.wxml
src/pages/memberOfOwn/memberOfOwn.wxml
+3
-3
memberOfOwn.wxss
src/pages/memberOfOwn/memberOfOwn.wxss
+6
-0
memberRules.js
src/pages/memberRules/memberRules.js
+22
-58
memberRules.wxml
src/pages/memberRules/memberRules.wxml
+1
-8
memberRules.wxss
src/pages/memberRules/memberRules.wxss
+10
-11
No files found.
src/assets/imgs/
3x-21
.png
→
src/assets/imgs/
seven-bg
.png
View file @
57f6ff1d
File moved
src/component/authorization-modal/authorization-modal.js
View file @
57f6ff1d
...
@@ -32,7 +32,7 @@ Component({
...
@@ -32,7 +32,7 @@ Component({
})
})
},
},
handelToMemberRules
()
{
handelToMemberRules
()
{
wxService
.
router
(
'/pages/memberRules/memberRules'
)
wxService
.
router
(
'/pages/memberRules/memberRules
?type=2
'
)
},
},
//再想想
//再想想
close
()
{
close
()
{
...
...
src/component/personCenter/personCenter.js
View file @
57f6ff1d
...
@@ -18,7 +18,8 @@ Component({
...
@@ -18,7 +18,8 @@ Component({
memberCardNo
:
""
,
memberCardNo
:
""
,
memberActivateStatus
:
false
,
memberActivateStatus
:
false
,
integralNum
:
0
,
integralNum
:
0
,
couponNum
:
0
couponNum
:
0
,
baseUrl
:
'/assets/imgs/user-bg.png'
},
},
attached
()
{
attached
()
{
this
.
setData
({
this
.
setData
({
...
@@ -35,6 +36,13 @@ Component({
...
@@ -35,6 +36,13 @@ Component({
this
.
getMemberPointInfo
()
this
.
getMemberPointInfo
()
// 优惠券数量
// 优惠券数量
this
.
getMemberCouponInfo
()
this
.
getMemberCouponInfo
()
let
base64
=
wx
.
getFileSystemManager
().
readFileSync
(
this
.
data
.
baseUrl
,
"base64"
);
console
.
log
(
base64
);
this
.
setData
({
baseUrl
:
"data:image/png;base64,"
+
base64
})
console
.
log
(
this
.
data
.
baseUrl
);
},
},
methods
:
{
methods
:
{
// 查询积分信息
// 查询积分信息
...
...
src/component/personCenter/personCenter.wxml
View file @
57f6ff1d
<!--component/personCenter/personCenter.wxml-->
<!--component/personCenter/personCenter.wxml-->
<view class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(
../../assets/imgs/user-bg.png
);'}}">
<view class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(
' + baseUrl + '
);'}}">
<button type="primary" plain='false' wx:if='{{!memberActivateStatus}}' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
<button type="primary" plain='false' wx:if='{{!memberActivateStatus}}' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
<view class='user-info' wx:if='{{memberActivateStatus}}'>
<view class='user-info' wx:if='{{memberActivateStatus}}'>
<view class="user-avatar">
<view class="user-avatar">
...
...
src/pages/IntegralMall/IntegralMall.js
View file @
57f6ff1d
...
@@ -62,7 +62,7 @@ wxService.page({
...
@@ -62,7 +62,7 @@ wxService.page({
},
},
// 点击跳转至会员规则页
// 点击跳转至会员规则页
handleGoMemberRulesRules
()
{
handleGoMemberRulesRules
()
{
wxService
.
router
(
`/pages/memberRules/memberRules`
)
wxService
.
router
(
`/pages/memberRules/memberRules
?type=2
`
)
},
},
goCouponDetail
(
e
)
{
goCouponDetail
(
e
)
{
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
...
...
src/pages/integralWater/integralWater.js
View file @
57f6ff1d
...
@@ -68,7 +68,7 @@ wxService.page({
...
@@ -68,7 +68,7 @@ wxService.page({
},
},
// 点击跳转至会员规则页
// 点击跳转至会员规则页
handleGoMemberRulesRules
()
{
handleGoMemberRulesRules
()
{
wxService
.
router
(
`/pages/memberRules/memberRules`
)
wxService
.
router
(
`/pages/memberRules/memberRules
?type=1
`
)
},
},
// 去积分商城
// 去积分商城
handleGoIntegralMall
()
{
handleGoIntegralMall
()
{
...
...
src/pages/integralWater/integralWater.wxml
View file @
57f6ff1d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<view class="num-current">{{integralNum}}</view>
<view class="num-current">{{integralNum}}</view>
<view class="num-title">当前积分</view>
<view class="num-title">当前积分</view>
</view>
</view>
<view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">
会员
规则</view>
<view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">
积分
规则</view>
</view>
</view>
<view wx:if="{{!integralList.length}}" class="detail-list-no">还没有任何积分记录</view>
<view wx:if="{{!integralList.length}}" class="detail-list-no">还没有任何积分记录</view>
...
...
src/pages/memberOfOwn/memberOfOwn.js
View file @
57f6ff1d
...
@@ -3,6 +3,7 @@ const app = getApp()
...
@@ -3,6 +3,7 @@ const app = getApp()
const
wxService
=
require
(
'../../utils/wxService'
)
const
wxService
=
require
(
'../../utils/wxService'
)
const
utils
=
require
(
'../../utils/util'
)
const
utils
=
require
(
'../../utils/util'
)
const
envInfo
=
require
(
'../../config/index'
).
envInfo
const
envInfo
=
require
(
'../../config/index'
).
envInfo
var
wxbarcode
=
require
(
'../../codeUtils/index.js'
);
wxService
.
page
({
wxService
.
page
({
/**
/**
...
@@ -44,6 +45,8 @@ wxService.page({
...
@@ -44,6 +45,8 @@ wxService.page({
memberId
memberId
})
})
this
.
getMemberFind
()
this
.
getMemberFind
()
// 条形码
wxbarcode
.
barcode
(
'barcode'
,
memberCardNo
,
500
,
60
);
},
},
formSubmit
(
e
)
{
formSubmit
(
e
)
{
...
@@ -120,4 +123,19 @@ wxService.page({
...
@@ -120,4 +123,19 @@ wxService.page({
date
:
e
.
detail
.
value
date
:
e
.
detail
.
value
})
})
},
},
handleGoWxCard
()
{
console
.
log
(
'kabao'
)
// wechatCardId wechatCode
const
{
wechatCardId
,
wechatCode
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
wx
.
openCard
({
cardList
:
[{
cardId
:
wechatCardId
,
code
:
wechatCode
}],
success
(
res
)
{
console
.
log
(
'查看微信卡包中的卡券'
,
res
)
}
})
}
})
})
\ No newline at end of file
src/pages/memberOfOwn/memberOfOwn.wxml
View file @
57f6ff1d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<view class='page-memberOfOwn'>
<view class='page-memberOfOwn'>
<view class='own-content'>
<view class='own-content'>
<view class='user-info'>
<view class='user-info'>
<image class='own-bg' src='/assets/imgs/
3X-21
.png'></image>
<image class='own-bg' src='/assets/imgs/
seven-bg
.png'></image>
<view class="user-avatar">
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
<open-data type="userAvatarUrl"></open-data>
</view>
</view>
...
@@ -13,11 +13,11 @@
...
@@ -13,11 +13,11 @@
<view class='user-id'>{{memberCardNo}}</view>
<view class='user-id'>{{memberCardNo}}</view>
</view>
</view>
<view class='qr-code pr'>
<view class='qr-code pr'>
<image src='/assets/imgs/qr-code.png'></image>
<image src='/assets/imgs/qr-code.png'
bindtap='handleGoWxCard'
></image>
</view>
</view>
</view>
</view>
<view class='user-qr-code'>
<view class='user-qr-code'>
<
image src='/assets/imgs/3X-21.png'></image
>
<
canvas canvas-id="barcode" /
>
</view>
</view>
</view>
</view>
<view class='form-info'>
<view class='form-info'>
...
...
src/pages/memberOfOwn/memberOfOwn.wxss
View file @
57f6ff1d
...
@@ -137,6 +137,7 @@ textarea {
...
@@ -137,6 +137,7 @@ textarea {
.page-section{
.page-section{
width: 100%;
width: 100%;
margin-bottom: 60rpx;
margin-bottom: 60rpx;
line-height: 100rpx;
}
}
.page-section:last-child{
.page-section:last-child{
...
@@ -150,3 +151,8 @@ textarea {
...
@@ -150,3 +151,8 @@ textarea {
padding-left: 30rpx;
padding-left: 30rpx;
padding-right: 30rpx;
padding-right: 30rpx;
}
}
canvas{
top: 20rpx;
left: 70rpx;
}
src/pages/memberRules/memberRules.js
View file @
57f6ff1d
...
@@ -9,33 +9,20 @@ wxService.page({
...
@@ -9,33 +9,20 @@ wxService.page({
* 页面的初始数据
* 页面的初始数据
*/
*/
data
:
{
data
:
{
memberRules
:[
ruleImg
:
''
,
{
type
:
''
rule
:
'注册会员赠送200积分'
},
{
rule
:
'消费1元积1分'
},
{
rule
:
'生日当月消费双倍积分'
},
{
rule
:
'积分可全场当现金抵用,每100积分抵1元'
}
]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
},
},
/**
onLoad
:
function
(
options
){
* 生命周期函数--监听页面初次渲染完成
if
(
options
.
type
==
1
){
*/
wx
.
setNavigationBarTitle
({
onReady
:
function
()
{
title
:
'积分规则'
,
})
}
this
.
setData
({
type
:
options
.
type
})
this
.
getRule
(
options
.
type
)
},
},
...
@@ -46,38 +33,14 @@ wxService.page({
...
@@ -46,38 +33,14 @@ wxService.page({
},
},
/**
//获取规则
* 生命周期函数--监听页面隐藏
getRule
(
TYPE
){
*/
wxService
.
get
(
`/merchant/brandRuleDescSet/get?type=
${
TYPE
}
`
).
then
(
res
=>
{
onHide
:
function
()
{
console
.
log
(
res
)
this
.
setData
({
},
ruleImg
:
res
.
data
.
data
.
content
})
/**
})
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
}
}
})
})
\ No newline at end of file
src/pages/memberRules/memberRules.wxml
View file @
57f6ff1d
<!--pages/memberRules.wxml-->
<!--pages/memberRules.wxml-->
<view class="memberRules">
<view class="memberRules">
<view class="rules-title">会员积分规则</view>
<image class='rule-img' src='{{ruleImg}}'></image>
<view class="rules-list">
<ul wx:for="{{memberRules}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}" >
<li class="rules-item">
<view>{{item.rule}}</view>
</li>
</ul>
</view>
</view>
</view>
src/pages/memberRules/memberRules.wxss
View file @
57f6ff1d
/* pages/memberRules.wxss */
/* pages/memberRules.wxss */
.memberRules{
padding: 20rpx 30rpx;
page{
}
height: 100%;
.rules-title {
font-size: 30rpx;
font-weight: 700;
margin-bottom: 40rpx;
}
}
.rules-list{
.memberRules{
padding-left: 40rpx;
width: 750rpx;
height: 100%;
margin: 0 auto;
}
}
.rules-item {
.rule-img{
font-size: 28rpx;
width: 100%;
height: 100%;
}
}
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