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
751dd803
Commit
751dd803
authored
Apr 30, 2020
by
程南
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
5985997f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
6 deletions
+40
-6
personCenter.wxml
src/component/personCenter/personCenter.wxml
+5
-5
couponCenter.js
src/subPackage/page/pages/couponCenter/couponCenter.js
+17
-0
couponCenterInfo.js
...ubPackage/page/pages/couponCenterInfo/couponCenterInfo.js
+17
-0
util.js
src/utils/util.js
+1
-1
No files found.
src/component/personCenter/personCenter.wxml
View file @
751dd803
<!--component/personCenter/personCenter.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" />
<view class="person-center-p">
<view wx:if='{{!
currentMobile
}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<view wx:if='{{!
memberActivateStatus
}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<image
wx:if="{{currentHasUserInfo}}"
src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}"
...
...
@@ -21,12 +21,12 @@
</button>
</view>
<view
wx:if='{{
currentMobile
}}'
wx:if='{{
memberActivateStatus
}}'
catchtap="handleToMemberOfOwn"
class="activation-content activation-bg {{true ? 'user-content' : ''}}"
style="{{personData.backgroundImageUrl ? 'background-image: url('+ utils.formateUrl(personData.backgroundImageUrl,baseImgUrl) +');' : 'background-color: ' + baseUrl + ';'}}"
>
<view class='user-info' wx:if='{{
currentMobile
}}'>
<view class='user-info' wx:if='{{
memberActivateStatus
}}'>
<view class="user-avatar">
<view class="avator">
<open-data type="userAvatarUrl" />
...
...
@@ -53,7 +53,7 @@
</view>
</view>
</view>
<view class='df tc person-num' wx:if='{{
currentMobile
}}'>
<view class='df tc person-num' wx:if='{{
memberActivateStatus
}}'>
<view class='df-1 point person-right' bindtap="toBonusDetails" wx:if="{{personCenter.bonus == 0}}">
<view class='point-number' style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">积分</view>
...
...
@@ -69,7 +69,7 @@
</view>
</view>
<!--plus-->
<!-- <view class='df tc person-num' wx:if='{{
currentMobile
}}'>
<!-- <view class='df tc person-num' wx:if='{{
memberActivateStatus
}}'>
<image class="" src='{{currentPlusStyle.imageUrl}}' data-row="{{currentPlusStyle.row}}" mode="widthFix" bindtap="toPlusPay"/>
</view> -->
src/subPackage/page/pages/couponCenter/couponCenter.js
View file @
751dd803
...
...
@@ -49,6 +49,23 @@ wxService.page({
},
//立即兑换优惠券
exchange
(
e
)
{
const
{
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
if
(
!
member
)
{
wx
.
showToast
({
title
:
'请先去登录'
,
icon
:
'none'
})
return
;
}
if
(
!
member
.
cardNoWeixin
){
wx
.
showToast
({
title
:
'请先开卡后购买'
,
});
wxService
.
openCard
()
return
;
}
wx
.
showLoading
({
title
:
'领取中..'
,
});
...
...
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
View file @
751dd803
...
...
@@ -46,6 +46,23 @@ wxService.page({
//领取优惠券
onTapGetCoupon
(){
const
{
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
if
(
!
member
)
{
wx
.
showToast
({
title
:
'请先去登录'
,
icon
:
'none'
})
return
;
}
if
(
!
member
.
cardNoWeixin
){
wx
.
showToast
({
title
:
'请先开卡后购买'
,
});
wxService
.
openCard
()
return
;
}
wx
.
showLoading
({
title
:
'领取中..'
,
});
...
...
src/utils/util.js
View file @
751dd803
...
...
@@ -384,7 +384,7 @@ function _getUserInfo(ev) {
function
setUserInfo
()
{
const
userInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
// 新用户去激活领卡
if
(
userInfo
&&
userInfo
.
member
&&
!
userInfo
.
member
.
mobile
)
{
if
(
userInfo
&&
userInfo
.
member
&&
!
userInfo
.
member
.
cardNoWeixin
)
{
wxService
.
openCard
()
return
false
}
else
{
...
...
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