Home Explore Help
Register Sign In
locky
/
ASJLanguageSys
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

chenjunkai 5 years ago
parent
ed5bbb7e35 93d9577212
commit
f299a0219b
6 changed files with 60 additions and 36 deletions
Split View Show Diff Stats
  1. 3 3
      web/sku/css/sku_index.css
  2. 9 10
      web/sku/find_sku.html
  3. 17 4
      web/sku/js/ip.js
  4. 12 3
      web/sku/js/sku_index.js
  5. 11 8
      web/sku/login.html
  6. 8 8
      web/sku/sku_index.html

+ 3 - 3
web/sku/css/sku_index.css
View File 

@@ -69,13 +69,13 @@
 
 }
 
 .rule_{
 
 	width: 10%; 
-	height: 50px; 
-	text-align: center; 
-	line-height: 50px;
 
+	height: 55px;
 
+	text-align: center;
 
 	border-left: 1px solid #e4e7e9;
 
 	float: left;
 
 	font-size: 90%;
 
 	border-bottom: 1px solid #e4e7e9;
 
+	padding-top: 10px;
 
 }
 
 .rule_one{
 
 	float: left;

+ 9 - 10
web/sku/find_sku.html
View File 

@@ -5,16 +5,15 @@
 
 		<title></title>
 
 	</head>
 
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css");
 
-    	@import url("css/commonality.css");
 
-    	@import url("css/find_sku.css" );
 
-    	
+		@import url("css/bootstrap.min.css?ver=20191104");
 
+    	@import url("css/commonality.css?ver=20191104");
 
+    	@import url("css/find_sku.css?ver=20191104" );
 
     </style>
 
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 
-    <script type="text/javascript" src="js/bootstrap-paginator.js" ></script>
 
-    <script type="text/javascript" src="js/find_sku.js" ></script>
 
-    <script type="text/javascript" src="js/ip.js" ></script>
 
-    <script type="text/javascript" src="js/jquery_cookie_min.js"></script>
 
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=20191104"></script>
 
+    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=20191104" ></script>
 
+    <script type="text/javascript" src="js/find_sku.js?ver=20191104" ></script>
 
+    <script type="text/javascript" src="js/ip.js?ver=20191104" ></script>
 
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=20191104"></script>
 
 	<body>
 
 		<!--头部-->
 
 		<div class='head'>
 
@@ -22,7 +21,7 @@
 
 		</div>
 
 		<!--菜单-->
 
 		<div class="col-sm-2 col-xs-12 menu">
 
-			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html'" style="    border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=20191104'" 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>

+ 17 - 4
web/sku/js/ip.js
View File 

@@ -1,6 +1,19 @@
 
-var http="http://192.168.136.39:8000/";
 
-
 
-var http = 'http://47.107.129.126:7724/';
 
 var line=5;  //分页的条数
 
+var http = convertTemp()+ "/";
 
+	if( http.indexOf("zositech")==-1 ){
 
+		http="http://192.168.136.39:8000/";
 
+//		http="http://www.zositech.xyz:7724/";
 
+		console.log(http);
 
+	}else{
 
+		console.log(http);
 
+	}
 
 
-
 
+// 获取访问路径
 
+function convertTemp(){
 
+   var the_url = document.location.toString();
 
+   var first_split = the_url.split("//");
 
+   var without_resource = first_split[1];
 
+   var second_split = without_resource.split("/");
 
+   var domain = second_split[0];
 
+   return first_split[0] +'//'+ domain;
 
+}

+ 12 - 3
web/sku/js/sku_index.js
View File 

@@ -34,10 +34,17 @@ $(function () {
 
 										+			'</div>'
 
 										+		'</div>'
 
 										+	'</div>';
 
-					suit_html=suit_html +	'<div class="rule_all_list" style="border-bottom: 1px solid #e4e7e9;">'
 
+				 
+						suit_html=suit_html +	'<div class="rule_all_list" >'
 
 					var num=8;
 
 					for(var i=0;i<data.res[k].sr_qs.length;i++){
 
-						suit_html=suit_html +	'<div class="rule_one">'
 
+						
+						if(i==0){
 
+							suit_html=suit_html +	'<div class="rule_one" style="border-top: 1px solid #e4e7e9;">'
 
+						}else{
 
+							suit_html=suit_html +	'<div class="rule_one">'
 
+						}
 
+						
 						suit_html=suit_html+		'<div class="rule_ rule_hr" rid="'+data.res[k].sr_qs[i].id+'">'+data.res[k].sr_qs[i].ruleName+'</div>'
 
 //					 
 						if(data.res[k].sr_qs[i].cr_qs.length<8){
 
@@ -140,7 +147,7 @@ $(function () {
 
 					+			'</div>'
 
 					+		'</div>'
 
 					+	'</div>';
 
-					suit_html=suit_html +	'<div class="rule_all_list" style="border-bottom: 1px solid #e4e7e9;">'
 
+					suit_html=suit_html +	'<div class="rule_all_list">'
 
 					suit_html=suit_html +	'</div>'
 
 					suit_html=suit_html+'</div>';
 
 					console.log(suit_exit_value.parent());	
@@ -364,7 +371,9 @@ $(function () {
 
 		var suit_html='';
 
 		var num=8;
 
 		for(var i=0;i<1;i++){
 
+			 
 			suit_html=suit_html +	'<div class="rule_one">'
 
+			 
 			suit_html=suit_html+		'<div class="rule_ rule_hr" rid="'+rule_id+'">'+role_edit_name+'</div>'
 
 			if (condition_that.length>8){
 
 				num=17

+ 11 - 8
web/sku/login.html
View File 

@@ -5,12 +5,16 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>login</title>
 
-    <link rel="stylesheet" type="text/css" href="css/bootstrap-grid.css"/><!--CSS RESET-->
 
-    <link href="http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 
-    <link rel="stylesheet" type="text/css" href="css/htmleaf-demo.css"><!--演示页面样式，使用时可以不引用-->
 
-    <script src="js/jquery-2.1.1.min.js"></script>
 
-    <script src="js/jquery_cookie_min.js"></script>
 
-    <script src="js/ip.js"></script>
 
+    <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=20191104");
 
+    	@import url("css/htmleaf-demo.css?ver=20191104" );
 
+    </style>	
+    	
+    	
+    <script src="js/jquery-2.1.1.min.js?ver=20191104"></script>
 
+    <script src="js/jquery_cookie_min.js?ver=20191104"></script>
 
+    <script src="js/ip.js?ver=20191104"></script>
 
     <style>
 
         .demo {
 
             padding: 20px 0;
 
@@ -201,8 +205,7 @@
 
             if (data['code'] == 0) {
 
                 $.cookie('access_token', data.res.access_token, data.res.access_expire)
 
                 $.cookie('refresh_token', data.res.refresh_token, data.res.refresh_expire)
 
-                window.location.href = "sku_index.html";
 
-
 
+                window.location.href = "sku_index.html?ver=20191104";
 
             } else {
 
                 alert(data['msg'])
 
             }

+ 8 - 8
web/sku/sku_index.html
View File 

@@ -6,14 +6,14 @@
 
 	</head>
 
 	
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css");
 
-		@import url("css/commonality.css");
 
-    	@import url("css/sku_index.css");
 
+		@import url("css/bootstrap.min.css?ver=20191104");
 
+		@import url("css/commonality.css?ver=20191104");
 
+    	@import url("css/sku_index.css?ver=20191104");
 
     </style>
 
-    <script type="text/javascript" src="js/jquery-2.1.1.min.js"></script>
 
-    <script type="text/javascript" src="js/sku_index.js" ></script>
 
-    <script type="text/javascript" src="js/ip.js" ></script>
 
-    <script type="text/javascript" src="js/jquery_cookie_min.js"></script>
 
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=20191104"></script>
 
+    <script type="text/javascript" src="js/sku_index.js?ver=20191104" ></script>
 
+    <script type="text/javascript" src="js/ip.js?ver=20191104" ></script>
 
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=20191104"></script>
 
 	<body>
 
 		<!--头部-->
 
 		<div class='head'>
 
@@ -25,7 +25,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'" style=" border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=20191104'" 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>