Startseite Erkunden Hilfe
Registrieren Anmelden
locky
/
ASJLanguageSys
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/langer

chenjunkai vor 5 Jahren
Ursprung
5297daac11 ff66477145
Commit
c4f7205c50
5 geänderte Dateien mit 36 neuen und 36 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 9 9
      web/sku/find_sku.html
  2. 4 4
      web/sku/js/find_sku.js
  3. 5 5
      web/sku/js/sku_index.js
  4. 10 10
      web/sku/login.html
  5. 8 8
      web/sku/sku_index.html

+ 9 - 9
web/sku/find_sku.html
Datei anzeigen 

@@ -5,16 +5,16 @@
 
 		<title>查找SKU</title>
 
 	</head>
 
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb20191130");
 
-    	@import url("css/commonality.css?ver=zb20191130");
 
-    	@import url("css/find_sku.css?ver=zb20191130" );
 
+		@import url("css/bootstrap.min.css?ver=zb2019113016");
 
+    	@import url("css/commonality.css?ver=zb2019113016");
 
+    	@import url("css/find_sku.css?ver=zb2019113016" );
 
     </style>
 
     
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191130"></script>
 
-    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb20191130" ></script>
 
-    <script type="text/javascript" src="js/find_sku.js?ver=zb20191130" ></script>
 
-    <script type="text/javascript" src="js/ip.js?ver=zb20191130" ></script>
 
-    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191130"></script>
 
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb2019113016"></script>
 
+    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb2019113016" ></script>
 
+    <script type="text/javascript" src="js/find_sku.js?ver=zb2019113016" ></script>
 
+    <script type="text/javascript" src="js/ip.js?ver=zb2019113016" ></script>
 
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb2019113016"></script>
 
     
 	<body>
 
 		<!--头部-->
 
@@ -24,7 +24,7 @@
 
 		</div>
 
 		<!--菜单-->
 
 		<div class="col-sm-2 col-xs-12 menu">
 
-			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb20191130'" style="border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb2019113016'" style="border-left: 3px solid #efefef;"> 
 				<div class="menu_ico"><img src="img/SKUnaming_rule@2x.png" class="menu_img"></div>
 
 				<div class="menu_text">SKU命名规则</div>
 
 			</div>

+ 4 - 4
web/sku/js/find_sku.js
Datei anzeigen 

@@ -1,5 +1,5 @@
 
 $(function () { 
-	var token=$.cookie('access_token');
 
+	var token=$.cookie('sku_access_token');
 
 	if(token==undefined){
 
 		window.location.href = "login.html";
 
 	}
 
@@ -205,9 +205,9 @@ $(function () {
 
 //	注销登录
 
 	$("#logout").on('click',function(){
 
 	//清空cookie
 
-		$.cookie("access_token", "", {expires: -1});
 
-		$.cookie("refresh_token", "", {expires: -1});
 
-		$.cookie("role_id", "", {expires: -1});
 
+		$.cookie("sku_access_token", "", {expires: -1});
 
+		$.cookie("sku_refresh_token", "", {expires: -1});
 
+		$.cookie("sku_role_id", "", {expires: -1});
 
 	//回到首页
 
 		window.location.href = "login.html";
 
 	});

+ 5 - 5
web/sku/js/sku_index.js
Datei anzeigen 

@@ -1,8 +1,8 @@
 
 $(function () {
 
 	$(".new_suit").show(400);
 
 	
-	var token=$.cookie('access_token');
 
-	var role_id=$.cookie('role_id');
 
+	var token=$.cookie('sku_access_token');
 
+	var role_id=$.cookie('sku_role_id');
 
 	if(token==undefined){
 
 		window.location.href = "login.html";
 
 	}
 
@@ -510,9 +510,9 @@ $(function () {
 
 //	注销登录
 
 	$("#logout").on('click',function(){
 
 	//清空cookie
 
-		$.cookie("access_token", "", {expires: -1});
 
-		$.cookie("refresh_token", "", {expires: -1});
 
-		$.cookie("role_id", "", {expires: -1});
 
+		$.cookie("sku_access_token", "", {expires: -1});
 
+		$.cookie("sku_refresh_token", "", {expires: -1});
 
+		$.cookie("sku_role_id", "", {expires: -1});
 
 	//回到首页
 
 		window.location.href = "login.html";
 
 	});

+ 10 - 10
web/sku/login.html
Datei anzeigen 

@@ -7,14 +7,14 @@
 
     <title>sku_login</title>
 
     <style type="text/css">  
 		@import url("http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css");
 
-    	@import url("css/bootstrap-grid.css?ver=zb20191130");
 
-    	@import url("css/htmleaf-demo.css?ver=zb20191130" );
 
-    	@import url("css/login.css?ver=zb20191130" );
 
+    	@import url("css/bootstrap-grid.css?ver=zb2019113016");
 
+    	@import url("css/htmleaf-demo.css?ver=zb2019113016" );
 
+    	@import url("css/login.css?ver=zb2019113016" );
 
     </style>
 
     
-    <script src="js/jquery-2.1.1.min.js?ver=zb20191130"></script>
 
-    <script src="js/jquery_cookie_min.js?ver=zb20191130"></script>
 
-    <script src="js/ip.js?ver=zb20191130"></script>
 
+    <script src="js/jquery-2.1.1.min.js?ver=zb2019113016"></script>
 
+    <script src="js/jquery_cookie_min.js?ver=zb2019113016"></script>
 
+    <script src="js/ip.js?ver=zb2019113016"></script>
 
      
 </head>
 
 <body>
 
@@ -75,10 +75,10 @@
 
 	        {
 
 	            if (data['code'] == 0) {
 
 	                console.log(data);
 
-                	$.cookie('access_token', data.res.access_token, data.res.access_expire);
 
-                	$.cookie('refresh_token', data.res.refresh_token, data.res.refresh_expire);
 
-                	$.cookie('role_id', data.res.role_id, data.res.access_expire);
 
-                	window.location.href = "sku_index.html?ver=zb20191130";
 
+                	$.cookie('sku_access_token', data.res.access_token, data.res.access_expire);
 
+                	$.cookie('sku_refresh_token', data.res.refresh_token, data.res.refresh_expire);
 
+                	$.cookie('sku_role_id', data.res.role_id, data.res.access_expire);
 
+                	window.location.href = "sku_index.html?ver=zb2019113016";
 
 	            } else {
 
 	                alert(data['msg'])
 
 	            }

+ 8 - 8
web/sku/sku_index.html
Datei anzeigen 

@@ -6,15 +6,15 @@
 
 	</head>
 
 	
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb20191130");
 
-		@import url("css/commonality.css?ver=zb20191130");
 
-    	@import url("css/sku_index.css?ver=zb20191130");
 
+		@import url("css/bootstrap.min.css?ver=zb2019113016");
 
+		@import url("css/commonality.css?ver=zb2019113016");
 
+    	@import url("css/sku_index.css?ver=zb2019113016");
 
     </style>
 
     
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191130"></script>
 
-    <script type="text/javascript" src="js/sku_index.js?ver=zb20191130" ></script>
 
-    <script type="text/javascript" src="js/ip.js?ver=zb20191130" ></script>
 
-    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191130"></script>
 
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb2019113016"></script>
 
+    <script type="text/javascript" src="js/sku_index.js?ver=zb2019113016" ></script>
 
+    <script type="text/javascript" src="js/ip.js?ver=zb2019113016" ></script>
 
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb2019113016"></script>
 
     
 	<body>
 
 		<!--头部-->
 
@@ -28,7 +28,7 @@
 
 				<div class="menu_ico"><img src="img/SKUNaming_rules_select@2x.png" class="menu_img"></div>
 
 				<div class="menu_text" style="color: #40ace6;">SKU命名规则</div>
 
 			</div>
 
-			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb20191130'" style=" border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb2019113016'" style=" border-left: 3px solid #efefef;"> 
 				<div class="menu_ico"><img src="img/findSKU@2x.png" class="menu_img"></div>
 
 				<div class="menu_text">查找SKU</div>
 
 			</div>