Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
6aeef5b6
Commit
6aeef5b6
authored
Jun 29, 2023
by
hxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
协议 fix
parent
3fdc1595
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
24 deletions
+46
-24
src/pages/login/index.vue
+46
-24
No files found.
src/pages/login/index.vue
View file @
6aeef5b6
...
...
@@ -164,6 +164,8 @@ export default {
userAgreement
:
{},
privacyPolicy
:
{},
tempData
:
null
,
registerFlag
:
false
,
// 是否注册
onceFlag
:
false
,
};
},
computed
:
{
...
...
@@ -465,17 +467,22 @@ export default {
title
:
'登录中...'
,
mask
:
true
})
if
(
this
.
tempData
)
{
if
(
this
.
content
&&!
this
.
checked
)
{
if
(
this
.
content
&&!
this
.
checked
&&
this
.
onceFlag
)
{
wx
.
hideLoading
()
if
(
this
.
registerFlag
)
{
this
.
showRegisterProtocol
();
}
else
{
wx
.
showToast
({
title
:
'您还未同意协议'
,
icon
:
"none"
});
return
;
}
this
.
handleSuccess
();
return
}
if
(
this
.
userInfo
)
{
if
(
this
.
tempData
)
return
this
.
handleSuccess
()
return
this
.
initUserInfo
();
}
// 推荐使用wx.getUserProfile获取用户信息,开发者每次通过该接口获取用户个人信息均需用户确认
// 开发者妥善保管用户快速填写的头像昵称,避免重复弹窗
wx
.
getUserProfile
({
...
...
@@ -493,6 +500,7 @@ export default {
})
},
async
initUserInfo
()
{
this
.
onceFlag
=
true
;
this
.
initUser
().
then
(
res
=>
{
wx
.
hideLoading
();
//存入openid
...
...
@@ -510,9 +518,32 @@ export default {
this
.
unionId
=
res
.
data
.
data
.
unionId
||
''
;
this
.
sessionId
=
res
.
data
.
data
.
sessionId
||
''
;
this
.
tempData
=
res
.
data
.
data
;
if
(
this
.
content
&&!
this
.
checked
)
{
// 第一次注册
if
(
!
res
.
data
.
data
.
isHaveUnion
)
{
if
(
this
.
content
&&!
this
.
checked
)
{
if
(
this
.
registerFlag
)
{
this
.
showRegisterProtocol
();
}
else
{
wx
.
showToast
({
title
:
'您还未同意协议'
,
icon
:
"none"
});
}
return
;
}
this
.
handleSuccess
();
}).
catch
(
err
=>
{
wx
.
hideLoading
();
if
(
err
==
'请勾选用户协议'
)
{
this
.
showRegisterProtocol
();
}
else
{
log
.
info
(
"err"
,
err
);
wx
.
showToast
({
title
:
err
,
icon
:
"none"
});
}
});
},
showRegisterProtocol
()
{
let
text
=
''
;
if
(
this
.
userAgreement
&&
this
.
privacyPolicy
)
{
text
=
`《
${
this
.
userAgreement
.
agreementName
}
》和《
${
this
.
privacyPolicy
.
agreementName
}
》`
;
...
...
@@ -528,28 +559,19 @@ export default {
cancelText
:
"再想想"
,
confirmText
:
"查看协议"
,
success
:
(
res
)
=>
{
if
(
!
this
.
registerFlag
)
{
wx
.
login
({
success
:
res
=>
{
this
.
code
=
res
.
code
;
this
.
registerFlag
=
true
;
}
})
}
if
(
res
.
confirm
)
{
this
.
handleDetail
(
0
);
}
}
})
}
else
{
wx
.
showToast
({
title
:
'您还未同意协议'
,
icon
:
"none"
});
}
return
;
}
this
.
handleSuccess
();
}).
catch
(
err
=>
{
wx
.
hideLoading
();
log
.
info
(
"err"
,
err
);
wx
.
showToast
({
title
:
err
,
icon
:
"none"
});
});
},
handleSuccess
()
{
if
(
this
.
tempData
.
isHaveUnion
==
"true"
||
this
.
mpApp
.
globalData
.
shopInfo
.
haveBindUserPhone
==
'1'
)
{
...
...
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