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
e2c67f2a
Commit
e2c67f2a
authored
Jun 04, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开卡
parent
9ecca829
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
authorization-modal.js
src/component/authorization-modal/authorization-modal.js
+19
-19
personCenter.wxml
src/component/personCenter/personCenter.wxml
+5
-5
No files found.
src/component/authorization-modal/authorization-modal.js
View file @
e2c67f2a
...
...
@@ -74,26 +74,26 @@ Component({
},
setUserInfo
:
function
(
e
)
{
console
.
log
(
'开卡'
)
//
if (!app.globalData.openCard) { // 没有开卡并且需要开卡
//
wxService.openCard()
//
return false
//
}
if
(
!
app
.
globalData
.
openCard
)
{
// 没有开卡并且需要开卡
wxService
.
openCard
()
return
false
}
// 跳转
const
urls
=
getCurrentPages
()
setTimeout
(()
=>
{
const
item
=
urls
[
0
].
options
console
.
log
(
'----'
,
item
.
route
)
if
(
item
.
route
)
{
try
{
const
options
=
JSON
.
parse
(
item
.
options
)
wxService
.
router
(
`/
${
item
.
route
}
`
).
search
(
options
).
replace
()
}
catch
(
e
)
{
wxService
.
router
(
'/pages/userCenter/userCenter'
)
}
}
else
{
wxService
.
router
(
'/pages/userCenter/userCenter'
)
}
},
200
)
//
const urls = getCurrentPages()
//
setTimeout(() => {
//
const item = urls[0].options
//
console.log('----', item.route)
//
if (item.route) {
//
try {
//
const options = JSON.parse(item.options)
//
wxService.router(`/${item.route}`).search(options).replace()
//
} catch (e) {
//
wxService.router('/pages/userCenter/userCenter')
//
}
//
} else {
//
wxService.router('/pages/userCenter/userCenter')
//
}
//
}, 200)
}
}
...
...
src/component/personCenter/personCenter.wxml
View file @
e2c67f2a
<!--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(../../assets/imgs/user-bg.png);'}}">
<button type="primary" plain='false' wx:if='{{!memberActivateStatus}}' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
<view class='user-info' wx:if='{{memberActivateStatus}}'>
<view class="user-avatar">
...
...
@@ -28,9 +28,9 @@
<view class='point-number' style="color:{{personCenter.fontColor}};">{{personCenter.coupon}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">优惠券</view>
</view>
</view>
-->
</view>
<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(../../assets/imgs/user-bg.png);'}}">
<view class='user-info'>
<view class="user-avatar">
<open-data type="userAvatarUrl"></open-data>
...
...
@@ -58,4 +58,4 @@
<view class='point-number' style="color:{{personCenter.fontColor}};">{{couponNum}}</view>
<view class='point-desc' style="color:{{personCenter.fontColor}};">优惠券</view>
</view>
</view>
\ No newline at end of file
</view>-->
\ No newline at end of file
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