App外需要登录检测优化~

王强
1 parent 4d5cf991
Showing 2 changed files with 23 additions and 19 deletions
index.html
src/pages/common/common.vue
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
-    <link rel="Shortcut Icon" href="static/img/favicon.png" />
-    <!-- HTTP 1.1 -->
+	<head>
+		<meta charset="utf-8">
+    	<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
+		<link rel="Shortcut Icon" href="static/img/favicon.png" />
+		<!-- HTTP 1.1 -->
 		<meta http-equiv="pragma" content="no-cache">
 		<!-- HTTP 1.0 -->
 		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
 		<!-- Prevent caching at the proxy server -->
 		<meta http-equiv="expires" content="0">
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
-    <title>&nbsp;</title>
+		<title>&nbsp;</title>
-    <!-- Crypto.js AES加密 CDN引用方式 -->
+		<!-- Crypto.js AES加密 CDN引用方式 -->
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/core.min.js"></script>
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/enc-base64.min.js"></script>
 		<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/md5.min.js"></script> -->
@@ -30,10 +30,10 @@
 		<script type="text/javascript" charset="UTF-8" src="https://wjj.ys1.cnliveimg.com/769/h5/js/jquery.min.js"></script>
 		<script type="text/javascript" charset="UTF-8" src="//res.cdn.openinstall.io/openinstall.js"></script>
 		<script type="text/javascript" src="static/js/cnLive_openinstall.js"></script>
-  </head>
-  <body>
-    <div class="warpper">
-      <div id="app"></div>
-    </div>
-  </body>
-</html>
+	</head>
+	<body>
+		<div class="warpper">
+			<div id="app"></div>
+		</div>
+	</body>
+</html>
 \ No newline at end of file
@@ -116,7 +116,7 @@
                     }, 100);
                 }
             },
-            
+
             /**
              * 设置访问设备
              */
@@ -285,11 +285,15 @@
 				// 如果不在App内，未登录，调用mall项目登录页面
 				} else {
-					// 设置跳转登录域名
-					let loginUrl = (this.mode == "prod") ? "https://managemall.cnlive.com/html/mall/1/#/pages/users/login/login" : "https://wjjshop.cnlive.com/html/mall/1/#/pages/users/login/login";
+                    // 判断是否要调用App内登录，默认调用
+                    if (doLogin) {
-					// 跳转mall项目登录
-					window.location.href = loginUrl + "?processing=redirect&pages=" + encodeURIComponent(window.location.href);
+                        // 设置跳转登录域名
+                        let loginUrl = (this.mode == "prod") ? "https://managemall.cnlive.com/html/mall/1/#/pages/users/login/login" : "https://wjjshop.cnlive.com/html/mall/1/#/pages/users/login/login";
+
+                        // 跳转mall项目登录
+                        window.location.href = loginUrl + "?processing=redirect&pages=" + encodeURIComponent(window.location.href);
+                    }
 					return false;
 				}