shuzheng 9 anos atrás
pai
commit
692625ddc3

+ 2 - 2
zheng-upms/zheng-upms-server/src/main/webapp/resources/css/admin.css

@@ -112,7 +112,7 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;}
 
 /* 选项卡 */
 .content_tab{width:100%;height:48px;overflow:hidden;}
-.content_tab>ul{padding:0;font-size:0;display:block;white-space:nowrap;overflow:auto;}
+.content_tab>ul{padding:0;font-size:0;display:block;white-space:nowrap;-webkit-overflow-scrolling:touch;overflow-x:scroll;}
 .scroll>ul{margin:0 40px;}
 .scroll>.tab_left,.scroll>.tab_right{display:block;}
 .tab_left,.tab_right{width:40px;height:48px;line-height:48px;color:#fff;text-align:center;display:none;}
@@ -128,7 +128,7 @@ a, a:hover, a:active, a:focus {text-decoration: none; -webkit-user-drag: none;}
 .content_tab>ul>li>a:after{content:"";position:absolute;bottom:0;left:50%;right:50%;width:0;border-bottom:3px solid #FFEB3B;transition:all linear .2s}
 .content_tab>ul>.cur>a:after{left:0;bottom:1px;width:100%;opacity:1;transition:all linear .2s}
 
-.content_main{height: calc(100% - 48px);}
+.content_main{height:calc(100% - 48px);-webkit-overflow-scrolling:touch;overflow-y:scroll;}
 .content_main>.cur{display:block;}
 .iframe{height:100%;display:none;}
 

+ 1 - 0
zheng-upms/zheng-upms-server/src/main/webapp/resources/index.html

@@ -217,6 +217,7 @@
 <script src="plugins/waves-0.7.5/waves.min.js"></script>
 <script src="plugins/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
 <script src="plugins/BootstrapMenu.min.js"></script>
+<script src="plugins/device.min.js"></script>
 
 <script src="js/admin.js"></script>
 </body>

+ 10 - 7
zheng-upms/zheng-upms-server/src/main/webapp/resources/js/admin.js

@@ -1,16 +1,17 @@
+var click = device.mobile() ? 'touchstart' : 'click';
 $(function() {
 	// 侧边栏操作按钮
-	$('#guide').click(function() {
+	$(document).on(click, '#guide', function() {
 		$(this).toggleClass('toggled');
 		$('#sidebar').toggleClass('toggled');
 	});
 	// 侧边栏二级菜单
-	$('.sub-menu a').click(function() {
+	$(document).on('click', '.sub-menu a', function() {
 		$(this).next().slideToggle(200);
 		$(this).parent().toggleClass('toggled');
 	});
 	// 个人资料
-	$('.s-profile a').click(function() {
+	$(document).on('click', '.s-profile a', function() {
 		$(this).next().slideToggle(200);
 		$(this).parent().toggleClass('toggled');
 	});
@@ -69,13 +70,13 @@ $(function() {
 		}
 	});
 	// 控制选项卡滚动位置 
-	$('.tab_left>a').click(function() {
+	$(document).on('click', '.tab_left>a', function() {
 		$('.content_tab>ul').animate({scrollLeft: $('.content_tab>ul').scrollLeft() - 300}, 200, function() {
 			initScrollState();
 		});
 	});
 	// 向右箭头
-	$('.tab_right>a').click(function() {
+	$(document).on('click', '.tab_right>a', function() {
 		$('.content_tab>ul').animate({scrollLeft: $('.content_tab>ul').scrollLeft() + 300}, 200, function() {
 			initScrollState();
 		});
@@ -180,15 +181,17 @@ var Tab = {
 				initScrollState();
 			});
 		} else {
-			$('#tab_' + index).click();
+			$('#tab_' + index).trigger('click');
 		}
+		// 关闭侧边栏
+		$('#guide').trigger(click);
 	},
 	closeTab: function($item) {
 		var closeable = $item.data('closeable');
 		if (closeable != false) {
 			// 如果当前时激活状态则关闭后激活左边选项卡
 			if($item.hasClass('cur')) {
-				$item.prev().click();
+				$item.prev().trigger('click');
 			}
 			// 关闭当前选项卡
 			var index = $item.data('index');

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 0
zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/device.min.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
zheng-upms/zheng-upms-server/src/main/webapp/resources/plugins/fastclick.min.js


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff