Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/web/staticres/wxswordfish/style.css

@@ -613,4 +613,47 @@ img{
 .no-result{
 	text-align:center;
 	color:#999;
+}
+.toolbar-list{
+	position: relative;
+}
+.toolbar-popover{
+	position: absolute;
+	width: 90px;
+	height: 100px;
+	border: 1px solid #CCCCCC;
+	background-color: #F8F8F8;
+	bottom: 65px;
+	left: 50%;
+	margin-left: -45px;
+	z-index: 1;
+	display: none;
+}
+.popover-ul li{
+	line-height: 30px;
+}
+.toolbar-popover .popover-arrow{
+	bottom: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-width: 11px;
+	border-bottom-width: 0;
+	position: absolute;
+	border-color: transparent;
+	border-style: solid;
+	border-top-color: #CCCCCC;
+}
+.toolbar-popover .popover-arrow:after{
+	position: absolute;
+	bottom: -9px;
+	margin-left: -10px;
+	content: " ";
+	border-color: transparent;
+	border-top-color: #F8F8F8;
+	border-bottom-width: 0;
+	border-width: 10px;
+	border-style: solid;
+}
+.popover-ul li.active{
+	background-color: #EAEAEA;
 }

core/src/web/templates/swordfish/wxtoolbar.html

@@ -1,15 +1,23 @@
 <ul class="bottom-toolbar">
-	<li class="parent-node" id="goToGuide">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/demo.png">
-		查看演示
+	<li class="parent-node">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/sousuo.png">
+		搜索
 	</li>
-	<li class="parent-node" id="feedback">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/fankui.png">
-		意见反馈
+	<li class="parent-node">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/dingyue.png">
+		我得订阅
 	</li>
-	<li class="parent-node" id="goToShare">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share.png">
-		分享
+	<li class="parent-node toolbar-list" id="toolbar-list">
+		<div class="toolbar-popover">
+			<ul class="popover-ul">
+				<li>查看演示</li>
+				<li>分享</li>
+				<li>意见反馈</li>
+			</ul>
+			<div class="popover-arrow"></div>
+		</div>
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/liebiao.png">
+		列表
 	</li>
 </ul>
 <div class="dialog share-dialog">
@@ -75,15 +83,34 @@
 //意见反馈
 var feedback = null;
 $(function(){
-	$("#goToGuide").click(function(){
-		window.location.href = "/swordfish/guide/other";
-	});
-	$("#feedback").click(function(){
-		if(feedback == null){
-			feedback = new Feedback();
+	$(".bottom-toolbar>li").click(function(){
+		if($(this).index() == 0){
+			alert("搜索");
+		}else if($(this).index() == 1){
+			alert("我得订阅");
+		}else if($(this).index() == 2){
+			$(this).children(".toolbar-popover").show();
 		}
-		feedback.show();
-		$("#feedback-textarea").focus().parent().removeClass("red-border");
+	});
+	$(".popover-ul>li").click(function(event){
+		event.stopPropagation(); 
+		var obj = $(this);
+		obj.addClass("active");
+		setTimeout(function(){
+			if(obj.index() == 0){
+				window.location.href = "/swordfish/guide/other";
+			}else if(obj.index() == 1){
+				window.location.href = "/swordfish/guide/share";
+			}else if(obj.index() == 2){
+				if(feedback == null){
+					feedback = new Feedback();
+				}
+				feedback.show();
+				$("#feedback-textarea").focus().parent().removeClass("red-border");
+			}
+			obj.parents(".toolbar-popover").hide();
+			obj.removeClass("active");
+		},100);
 	});
 	$("[id='goToShare']").click(function(){
 		window.location.href = "/swordfish/guide/share";