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
bd458e35
Commit
bd458e35
authored
Oct 23, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code
parent
6ac43b1e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
14 deletions
+32
-14
userCenter.js
src/pages/userCenter/userCenter.js
+2
-2
userCenter.wxml
src/pages/userCenter/userCenter.wxml
+2
-2
util.js
src/utils/util.js
+7
-1
wxService.js
src/utils/wxService.js
+21
-9
No files found.
src/pages/userCenter/userCenter.js
View file @
bd458e35
...
...
@@ -69,10 +69,10 @@ wxService.page({
},
startmessage
(
e
){
console
.
log
(
'startmessage'
,
e
)
//
console.log('startmessage', e)
},
completemessage
(
e
){
console
.
log
(
'completemessage'
,
e
)
//
console.log('completemessage', e)
},
// 获取邀请奖励图片
getShareImg
()
{
...
...
src/pages/userCenter/userCenter.wxml
View file @
bd458e35
...
...
@@ -37,4 +37,4 @@
<!-- 底部补充高度 防止被遮盖 -->
<view class="bottom-fixed" style="padding-bottom:{{paddingBottom}}"></view>
<!--联系我 客服ID-->
<cell bind:startmessage='startmessage' bind:completemessage="completemessage" plugid='plugid' />
\ No newline at end of file
<cell bind:startmessage='startmessage' bind:completemessage="completemessage" plugid='c9918b9af349c100b285d1b9a4d19ec6' />
\ No newline at end of file
src/utils/util.js
View file @
bd458e35
...
...
@@ -278,9 +278,11 @@ function getUserInfoByBtn(userInfo) {
return
wxService
.
Promise
.
reject
(
userInfo
.
errMsg
)
}
return
wxService
.
login
().
then
((
res
)
=>
{
console
.
log
(
'code'
,
res
)
logger
.
log
(
' wx getUserInfoByBtn success res --->'
,
res
)
return
Promise
.
all
([
Promise
.
resolve
(
userInfo
),
Promise
.
resolve
(
res
)])
}).
then
((
res
)
=>
{
logger
.
log
(
' wx _userInfo success res --->'
,
res
)
wx
.
setStorageSync
(
'_userInfo'
,
res
[
0
].
userInfo
)
wx
.
setStorageSync
(
'_wechatInfo'
,
res
[
0
])
...
...
@@ -290,7 +292,11 @@ function getUserInfoByBtn(userInfo) {
icon
:
'none'
,
mask
:
true
})
return
wxService
.
post
(
`/member/minaLogin`
,
{
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
)
let
currentLoginUrl
=
currentEnv
?
`/member/qiyeweixin/minaLogin`
:
`/member/minaLogin`
console
.
log
(
'登陆'
,
currentLoginUrl
)
return
wxService
.
post
(
`
${
currentLoginUrl
}
`
,
{
code
:
res
[
1
].
code
,
wechatInfo
:
res
[
0
],
brandId
:
app
.
globalData
.
brandId
,
...
...
src/utils/wxService.js
View file @
bd458e35
...
...
@@ -164,15 +164,27 @@ class WXService extends Http {
console
.
log
(
'全局'
,
currentEnv
)
return
new
Promise
((
resolve
,
reject
)
=>
{
// 企业 wx.qy.login
currentEnv
?
wx
.
qy
.
login
:
wx
.
login
({
success
:
(
res
)
=>
{
resolve
(
res
)
wx
.
setStorageSync
(
'_loginCode'
,
res
.
code
)
},
fail
:
(
res
)
=>
{
reject
(
res
)
}
})
if
(
currentEnv
)
{
wx
.
qy
.
login
({
success
:
(
res
)
=>
{
resolve
(
res
)
wx
.
setStorageSync
(
'_loginCode'
,
res
.
code
)
},
fail
:
(
res
)
=>
{
reject
(
res
)
}
})
}
else
{
wx
.
login
({
success
:
(
res
)
=>
{
resolve
(
res
)
wx
.
setStorageSync
(
'_loginCode'
,
res
.
code
)
},
fail
:
(
res
)
=>
{
reject
(
res
)
}
})
}
})
}
...
...
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