Browse Source

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

chenjunkai 5 years ago
parent
commit
bda6e3af4e

+ 18 - 0
web/sku/.project

@@ -33,5 +33,23 @@
 				</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1574820142763</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1574820142765</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

+ 2 - 2
web/sku/css/commonality.css

@@ -30,7 +30,7 @@ body {
 .menu_list{
 	height: 80px;
 	width: 100%;
-	line-height: 80px;
+	/*line-height: 80px;*/
 	border-bottom: 1px solid #cec6c6;
 }
 .menu_ico{
@@ -48,7 +48,7 @@ body {
 	float: left;
 	width:70%;
 	height: 100%;
-	
+	padding-top: 27px;
 	font-size: 18px;
 }
 /*内容*/

+ 35 - 0
web/sku/css/find_sku.css

@@ -77,15 +77,50 @@
 .button_:hover{
 	background: #3b99d8;
 }
+
+.table-hover{
+	margin-top: 20px; 
+	text-align: center;
+}
+.sku_list{
+	margin-top: 20px; 
+	width: 100%;
+	margin-top: 40px;
+	color: #34373C;
+	font-size: 20px;
+}
+
+
 .table>thead>tr>th {
     border: 2px solid #e4e7e9;
     height: 50px;
     font-size: 16px;
     color: #333;
 }
+
 .table>tbody>tr>td {
     border: 2px solid #e4e7e9;
     height: 50px;
     font-size: 16px;
     color: #333;
+}
+
+.fedback_thall{
+	border-top: 2px solid #e4e7e9;
+}
+
+.tbody_th_1{
+	text-align: center;    
+	border-top: 2px solid #e4e7e9; 
+	width: 10%;
+}
+.tbody_th_2{
+	text-align: center;    
+	border-top: 2px solid #e4e7e9; 
+	width: 40%;
+}
+.tbody_th_3{
+	text-align: center;    
+	border-top: 2px solid #e4e7e9; 
+	width: 50%;
 }

+ 11 - 1
web/sku/css/sku_index.css

@@ -30,7 +30,6 @@
 	background: #d3e0e6;
 }
 
-
 .suit_title{
 	float: left;
 	font-weight:bold;
@@ -41,9 +40,14 @@
 	color: #34373c;
 }
 
+.suit_title:hover{
+	color: #40ace6
+}
+
 .suit_title_text{
 	float: left;
 }
+
 .suit_title_ico{
 	float: left;
 	margin-left: 20px;
@@ -55,6 +59,7 @@
 	height: 100%;
 	text-align: right;
 }
+
 .add_rule_a{
 	border-radius: 5px; 
 	width: 100px; 
@@ -63,10 +68,12 @@
 	margin-top: 30px;    
 	border: 1px solid #cecdd0;
 }
+
 .add_rule_title{
 	float: left;
 	margin-right: 5px;
 }
+
 .rule_{
 	width: 10%; 
 	height: 55px;
@@ -77,14 +84,17 @@
 	border-bottom: 1px solid #e4e7e9;
 	padding-top: 10px;
 }
+
 .rule_one{
 	float: left;
 	width: 100%;
     border-right: 1px solid #e4e7e9;
 }
+
 .rule_one:hover{
 	background: #f8f8f8;
 }
+
 .rule_one>.rule_>div>img{
 	display: none;
 }

+ 46 - 45
web/sku/find_sku.html

@@ -2,18 +2,20 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<title></title>
+		<title>查找SKU</title>
 	</head>
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=20191104");
-    	@import url("css/commonality.css?ver=20191104");
-    	@import url("css/find_sku.css?ver=20191104" );
+		@import url("css/bootstrap.min.css?ver=zb20191128");
+    	@import url("css/commonality.css?ver=zb20191128");
+    	@import url("css/find_sku.css?ver=zb20191128" );
     </style>
-    <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>
+    
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191128"></script>
+    <script type="text/javascript" src="js/bootstrap-paginator.js?ver=zb20191128" ></script>
+    <script type="text/javascript" src="js/find_sku.js?ver=zb20191128" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191128" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191128"></script>
+    
 	<body>
 		<!--头部-->
 		<div class='head'>
@@ -21,7 +23,7 @@
 		</div>
 		<!--菜单-->
 		<div class="col-sm-2 col-xs-12 menu">
-			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=20191104'" style="border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='sku_index.html?ver=zb20191128'" 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>
@@ -32,7 +34,6 @@
 		</div>
 		<!--内容-->
 		<div class="col-sm-10 col-xs-12 content" id="content" style="padding-left: 40px;">
-			
 			<!--<div  class="col-sm-12 col-xs-12"  style="margin-top: 25px; font-size: 20px; width: 100%; margin-bottom: 30px;">查找SKU</div>
 			<div  class="col-sm-12 col-xs-12 find_all" style="width: 100%;" >
 				<div style="float: left; width: 536px;">
@@ -52,12 +53,12 @@
 					<span style="margin-left: 8px; line-height: 40px; font-size: 14px;color: #8a8a8a;">条件筛选</span>
 				</div>
 			</div>-->
-			<div class="col-sm-12 col-xs-12" style="margin-top: 40px; width: 100%; color: #34373C;font-size: 20px;">
-				条件筛选
+			<div class="col-sm-12 col-xs-12 sku_list">
+				条件筛选
 			</div>
 			<div class="col-sm-12 col-xs-12 " style=" width: 100%;" >
-				<div style="float: left;width: 200px;  padding-left: 0px;" class="col-sm-2 col-xs-12 ">
-					<select class="select_div select_combo_val ">
+				<div class="col-sm-2 col-xs-12 ">
+					<select class="select_div select_combo_val " style="    width: 100%;">
 					</select>
 				</div>
 				
@@ -65,40 +66,40 @@
 					
 				</div>
 			</div>
-			<div class="col-sm-12 col-xs-12" style="margin-left: 220px; width: 300px;">
-				<div class="button_" id="ok_button" style="display: none;">查找</div>
-				<!--<div class="button_" style="margin-left: 10px;">取消</div>-->
+			
+			<div class="col-sm-12 col-xs-12">
+				<div class="col-sm-2 col-xs-12 "></div>
+				<div class="col-sm-10 col-xs-12 ">
+				 	<div class="button_" id="ok_button" style="display: none;">查找</div>
+				</div>
 			</div>
-			<div class="col-sm-12 col-xs-12" style="margin-top: 20px; width: 100%;margin-top: 40px;color: #34373C;font-size: 20px;">
+			<div class="col-sm-12 col-xs-12 sku_list">
 				SKU列表
 			</div>
 			<div class="col-sm-12 col-xs-12" style=" width: 100%;">
-				
-				 <table class="table table-striped table-hover "  style="margin-top: 20px; text-align: center;">
-                        <thead >
-                            <tr class="fedback_thall">
-                                <th  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 10%;" >编号</th>
-                                <th  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 40%">规格号</th>
-                                <th  style="text-align: center;    border-top: 2px solid #e4e7e9;width: 50%">名称</th>
-                            </tr>
-                        </thead>
-                        <tbody style="font-size: 13px;" id='Respond_to_feedback_tbody'>
-                        	 
-                        </tbody>
-                        <tfoot>
-                            <tr>
-                                <td colspan="15">
-                                    <ul class="pagination pull-left" style="font-size: 14px;">
-                                    	
-                                          <div id="example" style="float: left; text-align: center"> <ul id="pageLimit"></ul> </div>
-                                          <div style="width: 100px;float: left; margin: 29px 0; font-size: 12px;" id="all_num"></div>
-                                    </ul> 
-                                </td>
-                            </tr>
-                        </tfoot>
-                    </table>
+				 <table class="table table-striped table-hover ">
+                    <thead >
+                        <tr class="fedback_thall">
+                            <th class="tbody_th_1">编号</th>
+                            <th class="tbody_th_2">规格号</th>
+                            <th class="tbody_th_3">名称</th>
+                        </tr>
+                    </thead>
+                    <tbody style="font-size: 13px;" id='Respond_to_feedback_tbody'>
+                    	 
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="15">
+                                <ul class="pagination pull-left" style="font-size: 14px;">
+                                      <div id="example" style="float: left; text-align: center"> <ul id="pageLimit"></ul> </div>
+                                      <div style="width: 100px;float: left; margin: 29px 0; font-size: 12px;" id="all_num"></div>
+                                </ul> 
+                            </td>
+                        </tr>
+                    </tfoot>
+                </table>
 			</div>
 		</div>
-		
 	</body>
-</html>
+</html>

+ 61 - 99
web/sku/js/find_sku.js

@@ -3,12 +3,11 @@ $(function () {
 	if(token==undefined){
 		window.location.href = "login.html";
 	}
-	console.log(token)
-	
-	var data_list=[];
-	var res_leng=0;
-	var totalPages=1;
 	
+	var data_list=[]; //套餐的查询记录
+	var res_leng=0; // 记录规则的长度
+	var totalPages=1; //记录总页数
+	var counts;//记录总条数
 	
 	var url=http+"cku_suit/query"; 
     var data_string = JSON.stringify({token:token});
@@ -21,8 +20,8 @@ $(function () {
         success: function (data)
         {
         	if(data.code==0){
-        	 	var html_='<option>请选择套装名称</option>';
-    	 		for(var k=0;k<data.res.length;k++){
+        	 	let html_='<option>请选择套装名称</option>';
+    	 		for(let k=0;k<data.res.length;k++){
 	 				html_=html_+'<option value="'+data.res[k].id+'">'+data.res[k].suitName+'</option>'
     	 		}
     	 		$(".select_combo_val").html(html_);
@@ -37,10 +36,10 @@ $(function () {
 	$(document).on('change','.select_combo_val', function() {
 		$(".select_all_val").html('');
 		$("#Respond_to_feedback_tbody").html('');
-        var id = $(".select_combo_val option:selected").attr("value");
+        let id = $(".select_combo_val option:selected").attr("value");
 //      console.log(id);
-        var url=http+"cku_rule/query_all"; 
-	    var data_string = JSON.stringify({token:token,id:id});
+        let url=http+"cku_rule/query_all"; 
+	    let data_string = JSON.stringify({token:token,id:id});
 	//  首次获取
 	    $.ajax({
 	        url: url,
@@ -51,6 +50,7 @@ $(function () {
 	        {
 	        	console.log(data)
 	        	if(data.code==0){
+	        		data_list=[];
 	    	 		for(var k=0;k<data.res.length;k++){
 		 				var html_='<select class="select_div rule_name">'
 		        	 	+'<option value="'+data.res[k].cr_qs.length+'">请选择'+data.res[k].ruleName+'</option>';
@@ -62,13 +62,10 @@ $(function () {
 	    	 		}
 	    	 		if(data.res.length>0){
 	    	 			$("#ok_button").show();
-	    	 			$('#pageLimit').show();
-	    	 			$(".pagination").show();
 	    	 		}else{
-	    	 			$('#pageLimit').hide();
 	    	 			$("#ok_button").hide();
-	    	 			$(".pagination").hide();
 	    	 		}
+	    	 		$(".pagination").hide();
 	        	}
 	        },
 	        error:function (XMLHttpRequest) {
@@ -78,79 +75,50 @@ $(function () {
 		}); 
     });
 	
-	//  递归
-	var i;
-	function recursion(data_,num,num_,tj_,val_1,val_2){
-		if(tj_==""){
-			i=1;
+	//  递归 --根据套的规则去循环显示所有的条数
+	
+	function recursion(data_,num,num_,tj_){
+		if(num>15){
+			return;
 		}
-		var xa=num-1;//记录是否继续
-		for (var a=0;a<data_.res[res_leng-xa].cr_qs.length;a++) {
-			if(xa==0){
-				var num_all=num_;
-				var tj_all=tj_;
-				num_all=num_all+data_.res[res_leng-xa].cr_qs[a].numName;
-				tj_all=tj_all+data_.res[res_leng-xa].cr_qs[a].conditionName;
-//				console.log(num_all);
-				data_list.push({'num':i,'all_num':num_all,'all_tj':tj_all});
-				i=i+1;
+		let count=num-1;//记录是否继续
+		for (let a=0;a<data_.res[res_leng-count].cr_qs.length;a++) {
+			if(count==0){
+				let num_all=num_ ,tj_all=tj_;
+				num_all=num_all+data_.res[res_leng-count].cr_qs[a].numName;
+				tj_all=tj_all+data_.res[res_leng-count].cr_qs[a].conditionName;
+				data_list.push({'num':counts,'all_num':num_all,'all_tj':tj_all});
+				counts=counts+1;
 			}else{
-				var num_all=num_;
-				var tj_all=tj_;
-				if(val_1=="玲"){
-					if(res_leng-(xa+1)==0){
-						num_all=num_all+"-"
-					}
-				}
-				num_all=num_all+data_.res[res_leng-xa].cr_qs[a].numName;
-				tj_all=tj_all+data_.res[res_leng-xa].cr_qs[a].conditionName;
-				if(val_1!=""){
-					if(res_leng-xa==val_1){
-						num_all=num_all+"-"
-					}
-				}
-				
-				if(val_2!=""){
-					if(res_leng-xa==val_2){
-						num_all=num_all+"-"
-					}
-				}
-				
-				recursion(data_,xa,num_all,tj_all,val_1,val_2);
+				let num_all=num_ ,tj_all=tj_;
+				num_all=num_all+data_.res[res_leng-count].cr_qs[a].numName;
+				tj_all=tj_all+data_.res[res_leng-count].cr_qs[a].conditionName;
+				recursion(data_,count,num_all,tj_all);
 			}
 		}
 	}
 //	循环判断
-	function cr_qs(data_,num){
-		i=1;
-		data_list=[];
-		$('#pageLimit').html("");
-		$("#Respond_to_feedback_tbody").html("");
-		if(num==7){ //摄像机单机
-			recursion(data_,num,"","",1,4);
-		}else if(num==8){ //摄像机套装
-			recursion(data_,num,"","",1,4);
-		}else if(num==5){ //电源
-			recursion(data_,num,"","","玲",3);
-		}else{
-			recursion(data_,num,"","","","");
-		}
-		
+	function cr_qs(data_,num,package_name){
+		counts=1; //重置
+		$(".pagination").show();//重新显示
+		data_list=[];//重置
+	 
+		recursion(data_,num,"","");
 		console.log('一共有');
 		console.log(data_list.length); 
 	 	$("#all_num").html('共'+data_list.length+'条记录');
-		if(totalPages==0){
+		if(totalPages==0){ //计算页数
 			totalPages=1;
 		}else{
 			totalPages=parseInt((data_list.length+line-1)/line); //计算页 
 		}
-		$("#Respond_to_feedback_tbody").html('');
-        for(var i=0;i<data_list.length;i++){
+		$("#Respond_to_feedback_tbody").html(''); //重置
+        for(let i=0;i<data_list.length;i++){
         	if(i<line){
     			$("#Respond_to_feedback_tbody").append('<tr>'
-                    +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 10%;" >'+data_list[i].num+'</td>'
-                    +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 40%">'+data_list[i].all_num+'</td>'
-                    +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9;width: 50%">'+data_list[i].all_tj+'</td>'
+                    +'<td>'+data_list[i].num+'</td>'
+                    +'<td>'+data_list[i].all_num+'</td>'
+                    +'<td>'+data_list[i].all_tj+'</td>'
                 +'</tr>');
         	}
         } 
@@ -177,30 +145,28 @@ $(function () {
             },
             onPageClicked: function (event, originalEvent, type, page) {//给每个页眉绑定一个事件,其实就是ajax请求,其中page变量为当前点击的页上的数字。
                 $("#Respond_to_feedback_tbody").html('');
-                for(var i=0;i<data_list.length;i++){
+                //分页
+                for(let i=0;i<data_list.length;i++){
                 	if(line*(page-1)<=i && i<line*page){
             			$("#Respond_to_feedback_tbody").append('<tr>'
-			                                +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 10%;" >'+data_list[i].num+'</td>'
-			                                +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9; width: 40%">'+data_list[i].all_num+'</td>'
-			                                +'<td  style="text-align: center;    border-top: 2px solid #e4e7e9;width: 50%">'+data_list[i].all_tj+'</td>'
-			                            +'</tr>');
+                            +'<td>'+data_list[i].num+'</td>'
+                            +'<td>'+data_list[i].all_num+'</td>'
+                            +'<td>'+data_list[i].all_tj+'</td>'
+                        	+'</tr>');
                 	}
-                } 
-                console.log('ok');
-			           
+                }
             }
         }); 
 	}
 	
-	
-	
 //	点击确认
 	$("#ok_button").on('click',function(){
 		var id = $(".select_combo_val option:selected").attr("value");
-//      console.log(id);
+		var package_name = $(".select_combo_val option:selected").text();
+//      console.log(package_name);
         var url=http+"cku_rule/query_all"; 
 	    var data_string = JSON.stringify({token:token,id:id});
-		 $.ajax({
+		$.ajax({
 	        url: url,
 	        type: "post",
 	        dataType:"JSON",
@@ -209,15 +175,15 @@ $(function () {
 	        {
 	        	if(data.code==0){
 //	        		console.log(data);
-					for (var i=0;i<$(".select_all_val").children().length;i++) {
-						var ff=$(".select_all_val").children().eq(i).val();
+					for (let i=0;i<$(".select_all_val").children().length;i++) {
+						let ff=$(".select_all_val").children().eq(i).val();
 					    if(ff<data.res[i].cr_qs.length){
 					    	data.res[i].cr_qs= [data.res[i].cr_qs[ff]]
 					    }
 					}
 					try{
 						res_leng=data.res.length-1;
-						cr_qs(data,data.res.length);
+						cr_qs(data,data.res.length,package_name);
 					}catch(e){
 						//TODO handle the exception
 					}
@@ -225,19 +191,15 @@ $(function () {
 	        },
 	        error:function (XMLHttpRequest) {
 	            console.log("失败!");
-	            
 	    	}
-		}); 
-		
-		
-		
-		
+		});
 	});
 
-	$(".ipt_find").on('focus',function(){
-		$(".find_img").addClass("find_img_hover");
-	});
-	$(".ipt_find").on('blur',function(){
-		$(".find_img").removeClass("find_img_hover");
-	});
+//	$(".ipt_find").on('focus',function(){
+//		$(".find_img").addClass("find_img_hover");
+//	});
+//	$(".ipt_find").on('blur',function(){
+//		$(".find_img").removeClass("find_img_hover");
+//	});
+
 });

+ 2 - 0
web/sku/js/ip.js

@@ -8,6 +8,8 @@ var http = convertTemp()+ "/";
 		console.log(http);
 	}
 
+
+
 // 获取访问路径
 function convertTemp(){
    var the_url = document.location.toString();

+ 92 - 88
web/sku/js/sku_index.js

@@ -17,13 +17,13 @@ $(function () {
         {
             console.log(data);
             if(data.code==0){
-         		for(var k=0;k<data.res.length;k++){
-					var suit_html='<div class="suit_" >'
-										+   '<div style="height: 80px;width: 100%;">'
-					suit_html=suit_html +		 '<div class="suit_title ">'
-					suit_html=suit_html +		 '<div class="suit_title_text">'+data.res[k].suitName+'</div>'
-					suit_html=suit_html +		 '<div class="suit_title_ico"><img src="img/spread.png"></div>'
-					suit_html=suit_html +		 '</div>'
+         		for(let k=0;k<data.res.length;k++){
+					let suit_html='<div class="suit_" >'
+										+   '<div style="height: 80px;width: 100%;">';
+					suit_html=suit_html +		 '<div class="suit_title ">';
+					suit_html=suit_html +		 '<div class="suit_title_text">'+data.res[k].suitName+'</div>';
+					suit_html=suit_html +		 '<div class="suit_title_ico"><img src="img/spread.png"></div>';
+					suit_html=suit_html +		 '</div>';
 					
 					suit_html=suit_html +		 '<div class="add_rule" >'
 										+		 	'<div class="add_rule_a" rid="'+data.res[k].id+'">'
@@ -35,17 +35,17 @@ $(function () {
 										+		'</div>'
 										+	'</div>';
 				 
-						suit_html=suit_html +	'<div class="rule_all_list" >'
-					var num=8;
+						suit_html=suit_html +	'<div class="rule_all_list" >';
+					let num=8;
 					for(var i=0;i<data.res[k].sr_qs.length;i++){
 						
 						if(i==0){
-							suit_html=suit_html +	'<div class="rule_one" style="border-top: 1px solid #e4e7e9;">'
+							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_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>'
+						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){
 							num=8
@@ -56,7 +56,7 @@ $(function () {
 						if(data.res[k].sr_qs[i].cr_qs.length>18){
 							num=26
 						}
-						for(var j=0;j<num;j++){
+						for(let j=0;j<num;j++){
 							
 							if(j==9){
 								suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
@@ -70,12 +70,12 @@ $(function () {
 								
 							}else if(j==18){
 								suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
-								suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>'
+								suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>';
 							}else{
 								if(j<data.res[k].sr_qs[i].cr_qs.length){
-									suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>'
+									suit_html=suit_html+		'<div class="rule_"><span class="rule_term">'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'</span> <input class="rule_input" rid="'+data.res[k].sr_qs[i].cr_qs[j].id+'" value="'+data.res[k].sr_qs[i].cr_qs[j].numName+':'+data.res[k].sr_qs[i].cr_qs[j].conditionName+'"></div>';
 								}else{
-									suit_html=suit_html+		'<div class="rule_"></div>'
+									suit_html=suit_html+		'<div class="rule_"></div>';
 								}
 							}
 						}
@@ -90,6 +90,15 @@ $(function () {
 				  
 				    suit_html=suit_html+	'</div>';
 					$("#suit_html").append(suit_html);
+					
+				}
+         		for(let k=0;k<data.res.length;k++){
+         			if(k>1){
+         				$('.suit_title').eq(k).parent().parent().children().eq(1).hide();
+						$('.suit_title').eq(k).parent().children().eq(1).children().hide();
+						$('.suit_title').eq(k).children().eq(1).children().attr('src','img/pack_up.png');
+         			}
+					
 				}
             }else{
              
@@ -117,9 +126,9 @@ $(function () {
 	
 //	保存套装
 	$(document).on('click','#suit_exit_value', function() {
-		var suit_name = $("#suit_name").val();	
-		var url=http+"cku_suit/add"; 
-	    var data_string = JSON.stringify({token:token,name:suit_name});
+		let suit_name = $("#suit_name").val();	
+		let url=http+"cku_suit/add"; 
+	    let data_string = JSON.stringify({token:token,name:suit_name});
 	    $.ajax({
 	        url: url,
 	        type: "post",
@@ -130,13 +139,13 @@ $(function () {
 	        {
 	            if(data.code==0){
 	             	console.log(data);
-	             	var id = data.res[0].id;
-				              var suit_html='					<div class="suit_" >'
-						suit_html=suit_html +		 	'<div style="height: 80px;width: 100%;">'
-						suit_html=suit_html +		 	'<div class="suit_title ">'
-						suit_html=suit_html +		  		'<div class="suit_title_text">'+suit_name+'</div>'
-						suit_html=suit_html +		 		'<div class="suit_title_ico"><img src="img/spread.png"></div>'
-						suit_html=suit_html +		 	'</div>'
+	             	let id = data.res[0].id;
+				              var suit_html='					<div class="suit_" >';
+						suit_html=suit_html +		 	'<div style="height: 80px;width: 100%;">';
+						suit_html=suit_html +		 	'<div class="suit_title ">';
+						suit_html=suit_html +		  		'<div class="suit_title_text">'+suit_name+'</div>';
+						suit_html=suit_html +		 		'<div class="suit_title_ico"><img src="img/spread.png"></div>';
+						suit_html=suit_html +		 	'</div>';
 					 
 					suit_html=suit_html+		 '<div class="add_rule">'
 					+		 	'<div class="add_rule_a" rid="'+id+'">'
@@ -147,8 +156,8 @@ $(function () {
 					+			'</div>'
 					+		'</div>'
 					+	'</div>';
-					suit_html=suit_html +	'<div class="rule_all_list">'
-					suit_html=suit_html +	'</div>'
+					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());	
 					suit_exit_value.parent().parent().parent().children().eq(0).append(suit_html);
@@ -162,7 +171,6 @@ $(function () {
 	    	}
 		});
 		
-		
 		$('#suit_add_id').fadeOut(100);
 		$('#suit_add').slideUp(200);
 	});
@@ -195,13 +203,13 @@ $(function () {
 	
 //	编辑
 	$(document).on('click','.compile', function() {
-		console.log('编辑');
-		var a = $(this).parent().parent().parent().children().length;
+//		console.log('编辑');
+		let a = $(this).parent().parent().parent().children().length;
 		$(this).parent().parent().children().eq(0).hide();
 		$(this).parent().parent().children().eq(1).hide();
 		$(this).parent().parent().children().eq(2).show();
 		console.log(a);
-		for(var i=0;i<a-1;i++){
+		for(let i=0;i<a-1;i++){
 			if(i.toString().indexOf('10') !=-1 || i==0){
 				$(this).parent().parent().parent().children().eq(i).children().eq(0).show();
 				$(this).parent().parent().parent().children().eq(i).children().eq(1).hide();
@@ -215,13 +223,15 @@ $(function () {
 		
 //	保存
 	$(document).on('click','.rule_save', function() {
-		console.log('编辑');
-		var a = $(this).parent().parent().parent().children().length;
+//		console.log('编辑');
+		//获取保存的长度
+		let a = $(this).parent().parent().parent().children().length;
+//		显示和隐藏
 		$(this).parent().parent().children().eq(0).show();
 		$(this).parent().parent().children().eq(1).show();
 		$(this).parent().parent().children().eq(2).hide();
-		console.log(a);
-		for(var i=0;i<a-1;i++){
+//		console.log(a);
+		for(let i=0;i<a-1;i++){ //循环请求添加
 			if(i.toString().indexOf('10') !=-1 || i==0){
 				$(this).parent().parent().parent().children().eq(i).children().eq(0).hide();
 				$(this).parent().parent().parent().children().eq(i).children().eq(1).show();
@@ -229,16 +239,16 @@ $(function () {
 				if($(this).parent().parent().parent().children().eq(i).children().eq(1).val()==undefined){
 					
 				}else{
-					var id=$(this).parent().parent().parent().children().eq(i).children().eq(1).attr("rid");
-					var num_name=$(this).parent().parent().parent().children().eq(i).children().eq(1).val().split(/:/);
+					let id=$(this).parent().parent().parent().children().eq(i).children().eq(1).attr("rid");
+					let num_name=$(this).parent().parent().parent().children().eq(i).children().eq(1).val().split(/:/);
 					if(num_name.length!=2){
 						num_name=$(this).parent().parent().parent().children().eq(i).children().eq(1).val().split(/:/);
 					}
 					$(this).parent().parent().parent().children().eq(i).children().eq(0).html(num_name[0]+":"+num_name[1]);
 //					console.log(id);
 //					console.log(num_name);
-					var url=http+"sku_condition/update"; 
-				    var data_string = JSON.stringify({token:token,numName:num_name[0],name:num_name[1],id:id});
+					let url=http+"sku_condition/update"; 
+				    let data_string = JSON.stringify({token:token,numName:num_name[0],name:num_name[1],id:id});
 				    $.ajax({
 				        url: url,
 				        type: "post",
@@ -259,7 +269,7 @@ $(function () {
 					});
 						
 				}
-				
+//				显示隐藏
 				$(this).parent().parent().parent().children().eq(i).children().eq(1).hide();
 				$(this).parent().parent().parent().children().eq(i).children().eq(0).show();
 				 
@@ -275,7 +285,7 @@ $(function () {
 	
 //	添加一行的条件
 	$(document).on('click','.add_role_div', function() {
-		
+//		添加一行条件并显示到页面
 		var html_ = '<div>'
 	            +'        		 <div class="condition_one">'
 	            +'       		 	 <input class="ipt_condition" id="condition_number_'+add_i+'" type="text" placeholder="输入条件编号,例如:1"> :'
@@ -290,14 +300,11 @@ $(function () {
 	
 //	保存添加的规则和条件
 	$(document).on('click','#role_add_value', function() {
-		
-		console.log(suit_rid);
-		 
-		var role_edit_name = $("#role_edit_name").val();
-		
-		var condition_number=[];
-		var condition_that=[];
-		var condition_id=[];
+//		console.log(suit_rid);
+		let role_edit_name = $("#role_edit_name").val();
+		let condition_number=[];
+		let condition_that=[];
+		let condition_id=[];
 		if(role_edit_name==""){
 			add_i=0;
 			add_i=add_i+1;
@@ -307,9 +314,9 @@ $(function () {
 			$('#rule_add_id').fadeOut(100);
 			$('#rule_add').slideUp(200);
 		}
-		var url=http+"cku_rule/add"; 
-		var rule_id="";
-	    var data_string = JSON.stringify({token:token,name:role_edit_name,id:suit_rid});
+		let url=http+"cku_rule/add"; 
+		let rule_id="";
+	    let data_string = JSON.stringify({token:token,name:role_edit_name,id:suit_rid});
 	    $.ajax({
 	        url: url,
 	        type: "post",
@@ -332,17 +339,17 @@ $(function () {
 	    	}
 		});
 		
-		for(var i=0;i<add_i;i++){
-			var number = $("#condition_number_"+i).val();
+		for(let i=0;i<add_i;i++){
+			let number = $("#condition_number_"+i).val();
 			if(number!="" && number!=undefined){
 				condition_number.push([number]); 
 			}
-			var that = $("#condition_that_"+i).val();
+			let that = $("#condition_that_"+i).val();
 			if(that!="" && that!=undefined){
 				condition_that.push([that]);
 			}
-			var url=http+"sku_condition/add"; 
-		    var data_string = JSON.stringify({token:token,numName:number,name:that,id:rule_id});
+			let url=http+"sku_condition/add"; 
+		    let data_string = JSON.stringify({token:token,numName:number,name:that,id:rule_id});
 		    $.ajax({
 		        url: url,
 		        type: "post",
@@ -364,38 +371,34 @@ $(function () {
 		    	}
 			});
 				
-			
 		}
-		console.log(condition_number);
-		console.log(condition_that)
-		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>'
+//		console.log(condition_number);
+//		console.log(condition_that)
+		let suit_html='';
+		let num=8;
+		for(let 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
 			}
 			if (condition_that.length>18){
 				num=26
 			}
-			for(var j=0;j<num;j++){
+			for(let j=0;j<num;j++){
 				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>'
+						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>';
 					}catch(e){
 						//TODO handle the exception
 						suit_html=suit_html+		'<div class="rule_ rule_hr"></div>';
 					}
 				}else{
 					if(j<condition_number.length){
-						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>'
+						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_"></div>'
+						suit_html=suit_html+		'<div class="rule_"></div>';
 					}
 				}
 			}
@@ -407,35 +410,37 @@ $(function () {
 			 				+	'</div>';
 		}
 		add_rule.append(suit_html);
-		add_i=0;
-		
+		add_i=0; //重置为0
 	});
 	
 //	套装的显示隐藏
+	
 	$(document).on('click','.suit_title', function() {
-		console.log($(this).parent().parent().children().eq(1).is(':hidden'))
+//		console.log($(this).parent().parent().children().eq(1).is(':hidden'))
 		if($(this).parent().parent().children().eq(1).is(':hidden')){
 			$(this).parent().parent().children().eq(1).show();
 			$(this).parent().children().eq(1).children().show();
-			
-			$(this).children().eq(1).children().attr('src','img/spread.png')
+//			切换图标
+			$(this).children().eq(1).children().attr('src','img/spread.png');
 			
 		}else{
 			$(this).parent().parent().children().eq(1).hide();
 			$(this).parent().children().eq(1).children().hide();
-			$(this).children().eq(1).children().attr('src','img/pack_up.png')
+//			切换图标
+			$(this).children().eq(1).children().attr('src','img/pack_up.png');
 			
 		}
 	});
+	
 //	删除
 	$(document).on('click','.remove', function() {
-	var html__=$(this).parent().parent().parent().children().eq(0).html();
-		var r = confirm("你确定删除"+html__+"吗?");
+	let html__=$(this).parent().parent().parent().children().eq(0).html();
+		let r = confirm("你确定删除"+html__+"吗?");
 		if (r == true) {
-		   var id=$(this).parent().parent().parent().children().eq(0).attr("rid");
-			console.log(id)
-			var url=http+"cku_rule/delete"; 
-		    var data_string = JSON.stringify({token:token,id:id});
+		   let id=$(this).parent().parent().parent().children().eq(0).attr("rid");
+//			console.log(id);
+			let url=http+"cku_rule/delete"; 
+		    let data_string = JSON.stringify({token:token,id:id});
 		    $.ajax({
 		        url: url,
 		        type: "post",
@@ -445,7 +450,7 @@ $(function () {
 		        success: function (data)
 		        {
 		            if(data.code==0){
-	//				   console.log(data);
+					   console.log("删除成功!");
 		            }else{
 		             	return;
 		            }
@@ -454,14 +459,13 @@ $(function () {
 		            console.log("失败!");
 		    	}
 			});
-			$(this).parent().parent().parent().hide()
+			$(this).parent().parent().parent().hide();
 		} else {
 		   return;
 		}
 		
 	});
 	
-
 	//取消
 	$('.closes').click(function(){
 		$('#suit_add_id').fadeOut(100);

+ 37 - 163
web/sku/login.html

@@ -4,147 +4,18 @@
     <meta charset="UTF-8">
     <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>
+    <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=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;
-            background: linear-gradient(to right, #7AB6B6 50%, #E5CFAA 50%);
-        }
-
-        .form-horizontal {
-            background-color: #fff;
-            font-family: 'Arimo', sans-serif;
-            text-align: center;
-            padding: 50px 30px 50px;
-            box-shadow: 12px 12px 0 0 rgba(0, 0, 0, 0.3);
-        }
-
-        .form-horizontal .heading {
-            color: #555;
-            font-size: 30px;
-            font-weight: 600;
-            letter-spacing: 1px;
-            text-transform: capitalize;
-            margin: 0 0 50px 0;
-        }
-
-        .form-horizontal .form-group {
-            margin: 0 auto 30px;
-            position: relative;
-        }
-
-        .form-horizontal .form-group:nth-last-child(2) {
-            margin-bottom: 20px;
-        }
-
-        .form-horizontal .form-group:last-child {
-            margin: 0;
-        }
-
-        .form-horizontal .form-group > i {
-            color: #999;
-            transform: translateY(-50%);
-            position: absolute;
-            left: 5px;
-            top: 50%;
-        }
-
-        .form-horizontal .form-control {
-            color: #7AB6B6;
-            background-color: #fff;
-            font-size: 17px;
-            letter-spacing: 1px;
-            height: 40px;
-            padding: 5px 10px 2px 25px;
-            box-shadow: 0 0 0 0 transparent;
-            border: none;
-            border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-            border-radius: 0;
-            display: inline-block;
-        }
-
-        .form-control::placeholder {
-            color: rgba(0, 0, 0, 0.2);
-            font-size: 16px;
-        }
-
-        .form-horizontal .form-control:focus {
-            border-bottom: 1px solid #7AB6B6;
-            box-shadow: none;
-        }
-
-        .form-horizontal .btn {
-            color: #7AB6B6;
-            background-color: #EDF6F5;
-            font-size: 18px;
-            font-weight: 700;
-            letter-spacing: 1px;
-            border-radius: 5px;
-            width: 50%;
-            height: 45px;
-            padding: 7px 30px;
-            margin: 0 auto 25px;
-            border: none;
-            display: block;
-            position: relative;
-            transition: all 0.3s ease;
-        }
-
-        .form-horizontal .btn:focus,
-        .form-horizontal .btn:hover {
-            color: #fff;
-            background-color: #7AB6B6;
-        }
-
-        .form-horizontal .btn:before,
-        .form-horizontal .btn:after {
-            content: '';
-            background-color: #7AB6B6;
-            height: 50%;
-            width: 2px;
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            z-index: 1;
-            transition: all 0.3s;
-        }
-
-        .form-horizontal .btn:after {
-            bottom: auto;
-            top: 0;
-            left: auto;
-            right: 0;
-        }
-
-        .form-horizontal .btn:hover:before,
-        .form-horizontal .btn:hover:after {
-            height: 100%;
-            width: 50%;
-            opacity: 0;
-        }
-
-        .form-horizontal .create_account {
-            color: #D6BC8B;
-            font-size: 16px;
-            font-weight: 600;
-            display: inline-block;
-        }
-
-        .form-horizontal .create_account:hover {
-            color: #7AB6B6;
-            text-decoration: none;
-        }
+    	@import url("css/bootstrap-grid.css?ver=zb20191128");
+    	@import url("css/htmleaf-demo.css?ver=zb20191128" );
+    	@import url("css/login.css?ver=zb20191128" );
     </style>
+    
+    <script src="js/jquery-2.1.1.min.js?ver=zb20191128"></script>
+    <script src="js/jquery_cookie_min.js?ver=zb20191128"></script>
+    <script src="js/ip.js?ver=zb20191128"></script>
+     
 </head>
 <body>
 <div class="htmleaf-container">
@@ -154,19 +25,20 @@
     </header>
     <div class="demo form-bg">
         <div class="container">
-
             <div class="row">
                 <div class="col-md-4"></div>
                 <div class="col-md-4">
                     <form class="form-horizontal">
                         <div class="heading">Login form</div>
                         <div class="form-group">
-                            <i class="fa fa-user"></i><input required name="login[username]" type="text"
+                            <i class="fa fa-user"></i>
+                            <input required name="login[username]" type="text"
                                                              class="form-control" placeholder="Username"
                                                              id="InputUsername">
                         </div>
                         <div class="form-group">
-                            <i class="fa fa-lock"></i><input required name="login[password]" type="password"
+                            <i class="fa fa-lock"></i>
+                            <input required autocomplete="on" name="login[password]" type="password"
                                                              class="form-control" placeholder="Password"
                                                              id="InputPassword"/>
                         </div>
@@ -191,30 +63,32 @@
             'username': username,
             'password': password
         };
-        
         var url= http+"user/login"; 
     	var data_string = JSON.stringify(post_data);
-//  首次获取
-    $.ajax({
-        url: url,
-        type: "post",
-        dataType:"JSON",
-        data: data_string,
-        success: function (data)
-        {
-            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?ver=20191104";
-            } else {
-                alert(data['msg'])
-            }
-        },
-        error:function (XMLHttpRequest) {
-            console.log("失败!");
-            
-    	}
-	}); 
+	//  登录请求
+	    $.ajax({
+	        url: url,
+	        type: "post",
+	        dataType:"JSON",
+	        data: data_string,
+	        success: function (data)
+	        {
+	            if (data['code'] == 0) {
+	                if (username == 'admin' || RegExp(/sku/).test(username)==true) {
+	                	$.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?ver=zb20191128";
+	                }else{
+	                	alert("该用户没有权限,请联系管理员!");
+	                }
+	            } else {
+	                alert(data['msg'])
+	            }
+	        },
+	        error:function (XMLHttpRequest) {
+	            console.log("失败!");
+	    	}
+		});
 	}
 </script>
 </html>

+ 12 - 14
web/sku/sku_index.html

@@ -2,18 +2,20 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
-		<title></title>
+		<title>SKU命名规则</title>
 	</head>
 	
 	<style type="text/css">  
-		@import url("css/bootstrap.min.css?ver=20191104");
-		@import url("css/commonality.css?ver=20191104");
-    	@import url("css/sku_index.css?ver=20191104");
+		@import url("css/bootstrap.min.css?ver=zb20191128");
+		@import url("css/commonality.css?ver=zb20191128");
+    	@import url("css/sku_index.css?ver=zb20191128");
     </style>
-    <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>
+    
+    <script type="text/javascript" src="js/jquery-2.1.1.min.js?ver=zb20191128"></script>
+    <script type="text/javascript" src="js/sku_index.js?ver=zb20191128" ></script>
+    <script type="text/javascript" src="js/ip.js?ver=zb20191128" ></script>
+    <script type="text/javascript" src="js/jquery_cookie_min.js?ver=zb20191128"></script>
+    
 	<body>
 		<!--头部-->
 		<div class='head'>
@@ -25,7 +27,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=20191104'" style=" border-left: 3px solid #efefef;"> 
+			<div class="menu_list" onclick="javascript:window.location.href='find_sku.html?ver=zb20191128'" 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>
@@ -48,8 +50,6 @@
 			</div>
 		</div>
 		
-		
-		
 		<!--新增套装-->
 		<div class="theme-popover" style="display: none;" id="suit_add"> 
              <div class="theme-poptit">
@@ -116,7 +116,5 @@
             </div>
 	    </div>
 		<div class="theme-popover-mask" id="rule_add_id" style="display: none;"></div>
-		
-		
 	</body>
-</html>
+</html>