Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share.git

display-server/web/res/js/ui/wm-navbar.js

@@ -100,8 +100,7 @@ define(['util'], function(){
	};
	/*绑定TabItem事件*/
	WmNavBar.prototype.bindTabItemAction = function(index,action){
		var tapAction = function(e){
			var ele = e.target;
		var tapAction = function(ele){
			var oldEle = $(ele.parentNode).find('div.tab li.on');
			if(oldEle[0] == ele){
				//选中后再次点击
@@ -119,7 +118,7 @@ define(['util'], function(){
			}
		};
		var liEle = this.bar.find('div.tab li');
		$(liEle[index]).tap(tapAction);
		$(liEle[index]).tap(tapAction,liEle[index]);
	};
	/*选中标签页*/
	WmNavBar.prototype.activeTabItem = function(index){
@@ -166,9 +165,9 @@ define(['util'], function(){
	WmNavBar.prototype.initTabGroup = function(){
		var tip = this.bar.find('div.buttonList div.tip');
		for(var i=0;i<tip.length;i++){
			$(tip[i]).tap(function(e){
				var fold = $(e.target).find('span');
				var option = $(e.target).parent().find('div.option');
			$(tip[i]).tap(function(ele){
				var fold = $(ele).find('span');
				var option = $(ele).parent().find('div.option');
				if($(option[0]).css("display")=="block"){
					$(fold[0]).removeClass("e_ico-fold").addClass("e_ico-unfold");
					$(option[0]).css("display","none");
@@ -176,7 +175,7 @@ define(['util'], function(){
					$(fold[0]).removeClass("e_ico-unfold").addClass("e_ico-fold");
					$(option[0]).css("display","block");
				}
			});
			},tip[i]);
		}
	};
	/*设置TabGroupItem事件*/

display-server/web/template/webapp/More.html

@@ -1,18 +1,18 @@
<ul id="plugin-menu">
	<li action="Syntax">
		<div class="pic"><span class="e_ico-net"></span></div>
		<div class="pic"><span class="e_ico-net1" style="background:url(res/img/icon-template.png) no-repeat center;width:109px;height:108px;background-size:contain;"></span></div>
		<div class="text">模板语法</div>
	</li>
	<li action="Push">
		<div class="pic"><span class="e_ico-position"></span></div>
		<div class="pic"><span class="e_ico-position1" style="background:url(res/img/icon-push.png) no-repeat center;width:109px;height:108px;background-size:contain;"></span></div>
		<div class="text">推送展示</div>
	</li>
	<li action="Push">
		<div class="pic"><span class="e_ico-position"></span></div>
		<div class="pic"><span class="e_ico-position1" style="background:url(res/img/icon-show.png) no-repeat center;width:109px;height:108px;background-size:contain;"></span></div>
		<div class="text">场景展示</div>
	</li>
    <li action="ChartIndex">
		<div class="pic"><span class="e_ico-position"></span></div>
		<div class="pic"><span class="e_ico-position1" style="background:url(res/img/icon-chart.png) no-repeat center;width:109px;height:108px;background-size:contain;"></span></div>
		<div class="text">图表展示</div>
	</li>
</ul>