|
@@ -36,7 +36,7 @@ export function loadScript(url, callback) {
|
|
|
* @param {function} next
|
|
|
* @returns
|
|
|
*/
|
|
|
-export function getUser(next) {
|
|
|
+export function getUser(next, isNotToLogin) {
|
|
|
window.$shanshipin = {};
|
|
|
// 判断闪视频登录状态
|
|
|
if (isWindows || isMac || isWechat) return next && next();
|
|
@@ -44,7 +44,7 @@ export function getUser(next) {
|
|
|
if (isIpad || isIpod || isIphone) {
|
|
|
if (!window.webkit || !window.webkit.messageHandlers) return next && next();
|
|
|
window.setUser = user => {
|
|
|
- if (user == "{}")
|
|
|
+ if (user == "{}" && !isNotToLogin)
|
|
|
return window.webkit.messageHandlers.iosJumpLogin.postMessage([]);
|
|
|
const u1 = JSON.parse(user || "{}");
|
|
|
window.webkit.messageHandlers.getAppInfo.postMessage([]);
|
|
@@ -62,7 +62,7 @@ export function getUser(next) {
|
|
|
} else {
|
|
|
if (!window.TideApp) return next && next();
|
|
|
const u1 = JSON.parse(window.TideApp.getUser() || "{}");
|
|
|
- if (!u1.UserId) window.TideApp.login();
|
|
|
+ if (!u1.UserId && !isNotToLogin) window.TideApp.login();
|
|
|
const u2 = JSON.parse(window.TideApp.getAppInfo() || "{}");
|
|
|
window.$shanshipin = {
|
|
|
...u1,
|