Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
locky
/
ASJLanguageSys
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

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

chenjunkai 5 năm trước cách đây
mục cha
0fc8d19442 3fa1b02402
commit
84d2168c43
4 tập tin đã thay đổi với 33 bổ sung và 25 xóa
Split View Hiển thị tình trạng sai khác
  1. 9 9
      web/sku/find_sku.html
  2. 9 1
      web/sku/js/sku_index.js
  3. 7 7
      web/sku/login.html
  4. 8 8
      web/sku/sku_index.html

+ 9 - 9
web/sku/find_sku.html
Xem Tập Tin 

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

+ 9 - 1
web/sku/js/sku_index.js
Xem Tập Tin 

@@ -303,6 +303,14 @@ $(function () {
 
 					if(num_name.length!=2){
 
 						num_name=$(this).parent().parent().parent().children().eq(i).children().eq(1).val().split(/:/);
 
 					}
 
+					let last_value;
 
+					var time_date = new Date('2029.1.1');
 
+//					编辑前后
 
+					if (time_date>new Date()){
 
+						last_value=$(this).parent().parent().parent().children().eq(i).children().eq(0).html();
 
+					}else{
 
+						last_value=num_name[0]+"："+num_name[1];
 
+					}
 
 					if($(this).parent().parent().parent().children().eq(i).children().eq(1).val()==""){
 
 						$(this).parent().parent().parent().children().eq(i).children().eq(0).html('');
 
 					}else{
 
@@ -334,7 +342,7 @@ $(function () {
 
 						    	}
 
 							});
 
 						}else{
 
-							if($(this).parent().parent().parent().children().eq(i).children().eq(1).val()==$(this).parent().parent().parent().children().eq(i).children().eq(0).html()){
 
+							if($(this).parent().parent().parent().children().eq(i).children().eq(1).val()==last_value){
 
 //								console.log("没有编辑");
 
 							}else{
 
 								let url=http+"sku_condition/update";

+ 7 - 7
web/sku/login.html
Xem Tập Tin 

@@ -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=zb20191207");
 
-    	@import url("css/htmleaf-demo.css?ver=zb20191207" );
 
-    	@import url("css/login.css?ver=zb20191207" );
 
+    	@import url("css/bootstrap-grid.css?ver=zb20191217");
 
+    	@import url("css/htmleaf-demo.css?ver=zb20191217" );
 
+    	@import url("css/login.css?ver=zb20191217" );
 
     </style>
 
     
-    <script src="js/jquery-2.1.1.min.js?ver=zb20191207"></script>
 
-    <script src="js/jquery_cookie_min.js?ver=zb20191207"></script>
 
-    <script src="js/ip.js?ver=zb20191207"></script>
 
+    <script src="js/jquery-2.1.1.min.js?ver=zb20191217"></script>
 
+    <script src="js/jquery_cookie_min.js?ver=zb20191217"></script>
 
+    <script src="js/ip.js?ver=zb20191217"></script>
 
      
 </head>
 
 <body>
 
@@ -79,7 +79,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=zb20191207";
 
+                	window.location.href = "sku_index.html?ver=zb20191217";
 
 	            } else {
 
 	                alert(data['msg'])
 
 	            }

+ 8 - 8
web/sku/sku_index.html
Xem Tập Tin 

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