Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
X
XiTianSenMall
Project
Project
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
leiqingsong
XiTianSenMall
Commits
98cb3c21
Commit
98cb3c21
authored
Mar 15, 2021
by
leiqingsong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
6dc5cd87
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
110 deletions
+3
-110
App.vue
H5/src/App.vue
+0
-7
bridgeToAppFun.js
H5/src/utils/bridgeToAppFun.js
+0
-7
bridgeToAppFun_bak.js
H5/src/utils/bridgeToAppFun_bak.js
+0
-95
settings.vue
H5/src/views/settings.vue
+3
-1
No files found.
H5/src/App.vue
View file @
98cb3c21
...
...
@@ -23,12 +23,7 @@ export default {
}
},
created
()
{
// const user = {
// userId: "1313123232"
// }
// localStorage.setItem('user', JSON.stringify(user));
console
.
log
(
"和App开始交互"
);
// showBottomBar(false);
this
.
$bridgeToAppFun
.
getAuthToken
()
.
then
(
res
=>
{
...
...
@@ -44,8 +39,6 @@ export default {
if
(
data
)
{
getUserInfo
().
then
(
res
=>
{
console
.
log
(
"存用户信息"
);
console
.
log
(
res
);
console
.
log
(
"----"
);
if
(
res
.
code
==
0
)
{
localStorage
.
setItem
(
"user"
,
JSON
.
stringify
(
res
.
data
));
}
...
...
H5/src/utils/bridgeToAppFun.js
View file @
98cb3c21
...
...
@@ -18,10 +18,8 @@ class bridgeToAppFun {
}
// 获取Token
getAuthToken
()
{
console
.
log
(
"ua"
,
this
.
userAgent
);
if
(
this
.
userAgent
===
"android"
)
{
// android
console
.
log
(
"android, 和安卓交互"
);
let
token
=
null
;
try
{
token
=
window
.
android
.
getAuthToken
();
...
...
@@ -29,7 +27,6 @@ class bridgeToAppFun {
}
catch
{
console
.
log
(
"token获取失败"
);
}
console
.
log
(
"an-token"
,
token
);
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
token
)
{
resolve
(
token
);
...
...
@@ -39,13 +36,9 @@ class bridgeToAppFun {
});
}
else
if
(
this
.
userAgent
===
"ios"
)
{
// ios
console
.
log
(
"ios"
);
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
"调用1"
);
jsBridge
.
callhandler
(
"getAuthToken"
,
null
,
data
=>
{
console
.
log
(
"调用2"
);
localStorage
.
setItem
(
"token"
,
data
);
console
.
log
(
"--------------"
);
if
(
data
)
{
resolve
(
data
);
}
else
{
...
...
H5/src/utils/bridgeToAppFun_bak.js
deleted
100644 → 0
View file @
6dc5cd87
// H5 去调用App的方法
import
jsBridge
from
"./bridge"
;
import
{
getUserInfo
}
from
"@/api/user"
;
function
saveUser
(
data
)
{
localStorage
.
setItem
(
"token"
,
data
);
if
(
data
)
{
getUserInfo
().
then
(
res
=>
{
console
.
log
(
"存用户信息"
);
console
.
log
(
res
);
console
.
log
(
"----"
);
if
(
res
.
code
==
0
)
{
localStorage
.
setItem
(
"user"
,
JSON
.
stringify
(
res
.
data
));
}
});
}
else
{
console
.
log
(
"调用失败"
);
}
}
// 获取Token
export
function
getAuthToken
()
{
const
userAgent
=
navigator
.
userAgent
;
console
.
log
(
"ua"
,
userAgent
);
if
(
userAgent
.
indexOf
(
"Android"
)
>
-
1
||
userAgent
.
indexOf
(
"Adr"
)
>
-
1
)
{
// android
console
.
log
(
"android, 和安卓交互"
);
const
token
=
window
.
android
.
getAuthToken
();
console
.
log
(
"an-token"
,
token
);
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
token
)
{
saveUser
(
token
);
resolve
(
token
);
}
else
{
reject
(
"失败"
);
}
});
}
else
if
(
userAgent
.
match
(
/
\(
i
[^
;
]
+;
(
U;
)?
CPU.+Mac OS X/
))
{
// ios
console
.
log
(
"ios"
);
return
new
Promise
((
resolve
,
reject
)
=>
{
console
.
log
(
"调用1"
);
jsBridge
.
callhandler
(
"getAuthToken"
,
null
,
data
=>
{
console
.
log
(
"调用2"
);
localStorage
.
setItem
(
"token"
,
data
);
console
.
log
(
"--------------"
);
if
(
data
)
{
resolve
(
data
);
getUserInfo
().
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
localStorage
.
setItem
(
"user"
,
JSON
.
stringify
(
res
.
data
));
}
});
}
else
{
console
.
log
(
"调用失败"
);
reject
(
"getAuthToken"
,
data
);
}
});
});
}
}
// 退出
export
function
logoutToApp
()
{
console
.
log
(
"退出登录"
);
const
userAgent
=
navigator
.
userAgent
;
if
(
userAgent
.
indexOf
(
"Android"
)
>
-
1
||
userAgent
.
indexOf
(
"Adr"
)
>
-
1
)
{
console
.
log
(
"an"
);
window
.
android
.
logout
();
}
else
{
jsBridge
.
callhandler
(
"logout"
);
}
}
export
function
navigateBack
()
{
console
.
log
(
"返回"
);
const
userAgent
=
navigator
.
userAgent
;
if
(
userAgent
.
indexOf
(
"Android"
)
>
-
1
||
userAgent
.
indexOf
(
"Adr"
)
>
-
1
)
{
console
.
log
(
"an"
);
window
.
android
.
navigateBack
();
}
else
{
jsBridge
.
callhandler
(
"navigateBack"
);
}
}
export
function
showBottomBar
(
params
)
{
console
.
log
(
"隐藏底部"
);
const
userAgent
=
navigator
.
userAgent
;
if
(
userAgent
.
indexOf
(
"Android"
)
>
-
1
||
userAgent
.
indexOf
(
"Adr"
)
>
-
1
)
{
console
.
log
(
"an"
);
window
.
android
.
showBottomBar
(
params
);
}
else
{
jsBridge
.
callhandler
(
"showBottomBar"
,
params
);
}
}
H5/src/views/settings.vue
View file @
98cb3c21
...
...
@@ -5,7 +5,7 @@
<van-cell
is-link
center
title=
"头像"
@
click=
"onModefy"
>
<img
class=
"avatar-img"
:src=
"
process.env.VUE_APP_BASE_URL
+ avatar"
:src=
"
imgBaseUrl
+ avatar"
alt=
"头像"
/>
</van-cell>
...
...
@@ -59,6 +59,7 @@ export default {
name
:
"Settings"
,
data
()
{
return
{
imgBaseUrl
:
''
,
avatar
:
""
,
fileList
:
[],
fillCode
:
""
,
...
...
@@ -67,6 +68,7 @@ export default {
};
},
mounted
()
{
this
.
imgBaseUrl
=
process
.
env
.
VUE_APP_BASE_URL
;
this
.
getUser
();
},
methods
:
{
...
...
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