Selaa lähdekoodia

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

chenjunkai 5 vuotta sitten
vanhempi
commit
659875afde
5 muutettua tiedostoa jossa 49 lisäystä ja 44 poistoa
  1. 1 1
      web/js/jqhttpsdk.js
  2. 9 9
      web/sku/find_sku.html
  3. 18 13
      web/sku/js/sku_index.js
  4. 10 9
      web/sku/login.html
  5. 11 12
      web/sku/sku_index.html

+ 1 - 1
web/js/jqhttpsdk.js

@@ -10,7 +10,7 @@ let domain = document.domain;
 // let http_ip_prot = 'http://47.107.129.126:7724/';
 
 var http_ip_prot = convertTemp()+ "/";
-	if( http_ip_prot.indexOf("zositech")==-1 ){
+	if( http_ip_prot.indexOf("zositech")==-1 ||  http_ip_prot.indexOf("47.107.129.126")==-1){
 		http_ip_prot="http://192.168.136.39:8000/";
 //		http_ip_prot="http://www.zositech.xyz:7724/";
 		console.log(http_ip_prot);

+ 9 - 9
web/sku/find_sku.html

@@ -5,16 +5,16 @@
 		<title>查找SKU</title>
 	</head>
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb2019113016");
-    	@import url("css/commonality.css?ver=zb2019113016");
-    	@import url("css/find_sku.css?ver=zb2019113016" );
+		@import url("css/bootstrap.min.css?ver=zb20191202");
+    	@import url("css/commonality.css?ver=zb20191202");
+    	@import url("css/find_sku.css?ver=zb20191202" );
     </style>
     
-    <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>
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
+    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb20191202" ></script>
+    <script type="text/javascript" src="js/find_sku.js?ver=zb20191202" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191202" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191202"></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=zb2019113016'" style="border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb20191202'" 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>

+ 18 - 13
web/sku/js/sku_index.js

@@ -150,7 +150,12 @@ $(function () {
 	
 //	保存套装
 	$(document).on('click','#suit_exit_value', function() {
-		let suit_name = $("#suit_name").val();	
+		let suit_name = $("#suit_name").val().trim();	
+		if(suit_name==""){
+			alert("套装名称不可以为空!");
+			return;
+		}
+		
 		let url=http+"cku_suit/add"; 
 	    let data_string = JSON.stringify({token:token,name:suit_name});
 	    $.ajax({
@@ -277,7 +282,7 @@ $(function () {
 //					console.log(id);
 //					console.log(num_name);
 					let url=http+"sku_condition/update"; 
-				    let data_string = JSON.stringify({token:token,numName:num_name[0],name:num_name[1],id:id});
+				    let data_string = JSON.stringify({token:token,numName:num_name[0].trim(),name:num_name[1].trim(),id:id});
 				    $.ajax({
 				        url: url,
 				        type: "post",
@@ -305,12 +310,10 @@ $(function () {
 			
 		}
 		
-		
 	});
 	
 	
 	
-	
 //	添加一行的条件
 	$(document).on('click','.add_role_div', function() {
 //		添加一行条件并显示到页面
@@ -329,7 +332,7 @@ $(function () {
 //	保存添加的规则和条件
 	$(document).on('click','#role_add_value', function() {
 //		console.log(suit_rid);
-		let role_edit_name = $("#role_edit_name").val();
+		let role_edit_name = $("#role_edit_name").val().trim();
 		let condition_number=[];
 		let condition_that=[];
 		let condition_id=[];
@@ -358,11 +361,11 @@ $(function () {
 //	             	console.log(data);
 					rule_id = data.res[0].id;
 					for(let i=0;i<add_i;i++){
-						let number = $("#condition_number_"+i).val();
+						let number = $("#condition_number_"+i).val().trim();
 						if(number!="" && number!=undefined){
 							condition_number.push([number]); 
 						}
-						let that = $("#condition_that_"+i).val();
+						let that = $("#condition_that_"+i).val().trim();
 						if(that!="" && that!=undefined){
 							condition_that.push([that]);
 						}
@@ -385,7 +388,6 @@ $(function () {
 					        },
 					        error:function (XMLHttpRequest) {
 					            console.log("失败!");
-					            
 					    	}
 						});
 							
@@ -407,7 +409,11 @@ $(function () {
 							if(j==9){
 								suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
 								try{
-									suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+condition_number[j]+':'+condition_that[j]+'</span> <input class="rule_input" rid="'+condition_id[j]+'" value="'+condition_number[j]+':'+condition_that[j]+'"></div>';
+									if(condition_number[j]!=undefined){
+										suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+condition_number[j]+':'+condition_that[j]+'</span> <input class="rule_input" rid="'+condition_id[j]+'" value="'+condition_number[j]+':'+condition_that[j]+'"></div>';
+									}else{
+										suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
+									}
 								}catch(e){
 									//TODO handle the exception
 									suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
@@ -516,8 +522,7 @@ $(function () {
 	//回到首页
 		window.location.href = "login.html";
 	});
+	
+//	var dele = http+'cku_suit/delete?token='+$.cookie('sku_access_token')+'&id=';
+//	console.log(dele);
 });
-
-
-
-

+ 10 - 9
web/sku/login.html

@@ -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=zb2019113016");
-    	@import url("css/htmleaf-demo.css?ver=zb2019113016" );
-    	@import url("css/login.css?ver=zb2019113016" );
+    	@import url("css/bootstrap-grid.css?ver=zb20191202");
+    	@import url("css/htmleaf-demo.css?ver=zb20191202" );
+    	@import url("css/login.css?ver=zb20191202" );
     </style>
     
-    <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>
+    <script src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
+    <script src="js/jquery_cookie_min.js?ver=zb20191202"></script>
+    <script src="js/ip.js?ver=zb20191202"></script>
      
 </head>
 <body>
@@ -78,7 +78,7 @@
                 	$.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";
+                	window.location.href = "sku_index.html?ver=zb20191202";
 	            } else {
 	                alert(data['msg'])
 	            }
@@ -88,6 +88,7 @@
 	    	}
 		});
 	}
-    //http://www.zositech.xyz:7724/cku_suit/delete?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOjE4LCJleHAiOjE1NzU1MzQwNjB9.345rdh34fmEsQ6dX225BQgXbSnbrOh3vGwxqERr2Kr4&id=2
-</script>
+    
+   
+   </script>
 </html>

+ 11 - 12
web/sku/sku_index.html

@@ -6,15 +6,15 @@
 	</head>
 	
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=zb2019113016");
-		@import url("css/commonality.css?ver=zb2019113016");
-    	@import url("css/sku_index.css?ver=zb2019113016");
+		@import url("css/bootstrap.min.css?ver=zb20191202");
+		@import url("css/commonality.css?ver=zb20191202");
+    	@import url("css/sku_index.css?ver=zb20191202");
     </style>
     
-    <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>
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191202"></script>
+    <script type="text/javascript" src="js/sku_index.js?ver=zb20191202" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191202" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191202"></script>
     
 	<body>
 		<!--头部-->
@@ -24,11 +24,11 @@
 		</div>
 		<!--菜单-->
 		<div class="col-sm-2 col-xs-12 menu">
-			<div class="menu_list" style="background: white; color: #40ace6; border-left: 3px solid #40ace6;"> 
+			<div class="menu_list" style="background: white; color: #40ace6; border-left: 3px solid #40ace6;">
 				<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=zb2019113016'" style=" border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb20191202'" 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>
@@ -67,7 +67,7 @@
                     		套装名称:
                     	</div>
                     	 <div style="float: left; width: 65%;">
-                    		<input class="ipt" style="border-color: #ecdddd;" id="suit_name" type="text" name="suit_name" value=""></li>
+                    		<input class="ipt" style="border-color: #ecdddd;" id="suit_name" maxlength="64" type="text" name="suit_name" value=""></li>
                     	</div>
                     	</div>
             		<div>
@@ -97,13 +97,12 @@
                     		<div style="float: right; line-height: 30px;">规则名称:</div>
                     	</div>
                     	<div style="float: left; width: 65%;    height: 40px;">
-                    		<input class="ipt" style="border-color: #ecdddd;margin-left: 10px;" id="role_edit_name" type="text" name="role_edit_name" placeholder="输入规则名称,例如:颜色" value="">
+                    		<input class="ipt" style="border-color: #ecdddd;margin-left: 10px;" id="role_edit_name" maxlength="64" type="text" name="role_edit_name" placeholder="输入规则名称,例如:颜色" value="">
                     	</div>
                     	<div style="height:400px;width:110%;overflow-y:auto">
                     		<div class="condition_list" >
 	                    		
 	                    	</div>
-                    	
                     		<div class="add_role_div"><a style="height: 30px;width: 50px; margin-bottom: 20px; height: 40px;">添加一行</a></div>
                     	</div>
                     </div>