Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
20b97ec8
Commit
20b97ec8
authored
Nov 16, 2018
by
Junling Bu
Browse files
chore[litemall-wx]: 使用微信开发者工具的格式化代码
parent
822d5075
Changes
102
Hide whitespace changes
Inline
Side-by-side
litemall-wx/utils/user.js
View file @
20b97ec8
...
...
@@ -9,12 +9,12 @@ const api = require('../config/api.js');
* Promise封装wx.checkSession
*/
function
checkSession
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
wx
.
checkSession
({
success
:
function
()
{
success
:
function
()
{
resolve
(
true
);
},
fail
:
function
()
{
fail
:
function
()
{
reject
(
false
);
}
})
...
...
@@ -25,16 +25,16 @@ function checkSession() {
* Promise封装wx.login
*/
function
login
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
wx
.
login
({
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
code
)
{
resolve
(
res
);
}
else
{
reject
(
res
);
}
},
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
reject
(
err
);
}
});
...
...
@@ -46,10 +46,13 @@ function login() {
*/
function
loginByWeixin
(
userInfo
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
login
().
then
((
res
)
=>
{
//登录远程服务器
util
.
request
(
api
.
AuthLoginByWeixin
,
{
code
:
res
.
code
,
userInfo
:
userInfo
},
'
POST
'
).
then
(
res
=>
{
util
.
request
(
api
.
AuthLoginByWeixin
,
{
code
:
res
.
code
,
userInfo
:
userInfo
},
'
POST
'
).
then
(
res
=>
{
if
(
res
.
errno
===
0
)
{
//存储用户信息
wx
.
setStorageSync
(
'
userInfo
'
,
res
.
data
.
userInfo
);
...
...
@@ -72,7 +75,7 @@ function loginByWeixin(userInfo) {
* 判断用户是否登录
*/
function
checkLogin
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
if
(
wx
.
getStorageSync
(
'
userInfo
'
)
&&
wx
.
getStorageSync
(
'
token
'
))
{
checkSession
().
then
(()
=>
{
resolve
(
true
);
...
...
litemall-wx/utils/util.js
View file @
20b97ec8
...
...
@@ -23,7 +23,7 @@ function formatNumber(n) {
* 封封微信的的request
*/
function
request
(
url
,
data
=
{},
method
=
"
GET
"
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
wx
.
request
({
url
:
url
,
data
:
data
,
...
...
@@ -32,7 +32,7 @@ function request(url, data = {}, method = "GET") {
'
Content-Type
'
:
'
application/json
'
,
'
X-Litemall-Token
'
:
wx
.
getStorageSync
(
'
token
'
)
},
success
:
function
(
res
)
{
success
:
function
(
res
)
{
if
(
res
.
statusCode
==
200
)
{
...
...
@@ -56,7 +56,7 @@ function request(url, data = {}, method = "GET") {
}
},
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
reject
(
err
)
}
})
...
...
@@ -90,6 +90,4 @@ module.exports = {
request
,
redirect
,
showErrorToast
}
}
\ No newline at end of file
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
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