剑鱼修改

core/src/web/staticres/swiper/swiper.animate.min.js

@@ -1,2 +0,0 @@
-//本插件由www.swiper.com.cn提供
-function swiperAnimateCache(){for(allBoxes=window.document.documentElement.querySelectorAll(".ani"),i=0;i<allBoxes.length;i++)allBoxes[i].attributes["style"]?allBoxes[i].setAttribute("swiper-animate-style-cache",allBoxes[i].attributes["style"].value):allBoxes[i].setAttribute("swiper-animate-style-cache"," "),allBoxes[i].style.visibility="hidden"}function swiperAnimate(a){clearSwiperAnimate();var b=a.slides[a.activeIndex].querySelectorAll(".ani");for(i=0;i<b.length;i++)b[i].style.visibility="visible",effect=b[i].attributes["swiper-animate-effect"]?b[i].attributes["swiper-animate-effect"].value:"",b[i].className=b[i].className+"  "+effect+" "+"animated",style=b[i].attributes["style"].value,duration=b[i].attributes["swiper-animate-duration"]?b[i].attributes["swiper-animate-duration"].value:"",duration&&(style=style+"animation-duration:"+duration+";-webkit-animation-duration:"+duration+";"),delay=b[i].attributes["swiper-animate-delay"]?b[i].attributes["swiper-animate-delay"].value:"",delay&&(style=style+"animation-delay:"+delay+";-webkit-animation-delay:"+delay+";"),b[i].setAttribute("style",style)}function clearSwiperAnimate(){for(allBoxes=window.document.documentElement.querySelectorAll(".ani"),i=0;i<allBoxes.length;i++)allBoxes[i].attributes["swiper-animate-style-cache"]&&allBoxes[i].setAttribute("style",allBoxes[i].attributes["swiper-animate-style-cache"].value),allBoxes[i].style.visibility="hidden",allBoxes[i].className=allBoxes[i].className.replace("animated"," "),allBoxes[i].attributes["swiper-animate-effect"]&&(effect=allBoxes[i].attributes["swiper-animate-effect"].value,allBoxes[i].className=allBoxes[i].className.replace(effect," "))}

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

@@ -289,21 +289,36 @@ img{
 }
 .swiper-slide{
 	text-align: center;
-	/*z-index: -1;
+	z-index: -1;
 	background: #ffffff;
-	position: absolute !important;*/
+	position: absolute !important;
 }
 .swiper-slide-active{
-	/*z-index: 0;*/
+	z-index: 2;
+}
+.slide-active{
+	z-index: 0;
 }
 .slide-down{
-	z-index: 1;
+	z-index: 2;
+	/* Firefox: */
+	-moz-animation-name:slidedown;
+	-moz-animation-duration:0.5s;
+	-moz-animation-timing-function:ease-in;
+	-moz-animation-iteration-count:1;
+	-moz-animation-play-state:running;
 	/* Safari and Chrome: */
 	-webkit-animation-name:slidedown;
-	-webkit-animation-duration:2s;
-	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-duration:0.5s;
+	-webkit-animation-timing-function:ease-in;
 	-webkit-animation-iteration-count:1;
 	-webkit-animation-play-state:running;
+	/* Opera: */
+	-o-animation-name:slidedown;
+	-o-animation-duration:0.5s;
+	-o-animation-timing-function:ease-in;
+	-o-animation-iteration-count:1;
+	-o-animation-play-state:running;
 }
 @-webkit-keyframes slidedown {
 	0%{
@@ -314,13 +329,25 @@ img{
 	}
 }
 .slide-up{
-	z-index: 1;
+	z-index: 2;
+	/* Firefox: */
+	-moz-animation-name:slideup;
+	-moz-animation-duration:0.5s;
+	-moz-animation-timing-function:ease-in;
+	-moz-animation-iteration-count:1;
+	-moz-animation-play-state:running;
 	/* Safari and Chrome: */
 	-webkit-animation-name:slideup;
-	-webkit-animation-duration:2s;
-	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-duration:0.5s;
+	-webkit-animation-timing-function:ease-in;
 	-webkit-animation-iteration-count:1;
 	-webkit-animation-play-state:running;
+	/* Opera: */
+	-o-animation-name:slideup;
+	-o-animation-duration:0.5s;
+	-o-animation-timing-function:ease-in;
+	-o-animation-iteration-count:1;
+	-o-animation-play-state:running;
 }
 
 @-webkit-keyframes slideup {
@@ -331,10 +358,6 @@ img{
 		top: 0px;
 	}
 }
-.swiper-slide>p{
-	height: inherit;
-	position: relative;
-}
 .swiper-slide img{
 	position: relative;
 	top: 50%;
@@ -355,7 +378,7 @@ img{
 	height: 15px;
 	position: absolute;
 	left: 50%;
-	margin-left: -25px;
+	margin-left: -12.5px;
 	animation-name:start;
 	animation-duration:2s;
 	animation-timing-function:ease-in-out;
@@ -423,7 +446,6 @@ img{
 .guide-bottom span{
 	float: right;
 	display: block;
-	font-size: 12px;
 	color: #D7D7D7;
 	margin-right: 10px;
 }

core/src/web/templates/common/memberleft.html

@@ -94,7 +94,7 @@
 		</div>
 	</a>
 	<a class="list-group-item" onclick="window.location.href = '/member/accountset/index'"><i class="glyphicon zhanghao"></i>账户设置</a>
-	<a class="list-group-item" onclick="window.location.href = '/member/swordfish'"><i class="glyphicon iconfontcolor71"></i>剑鱼（信息订阅）</a>
+	<a class="list-group-item" onclick="window.location.href = '/member/swordfish/rssset'"><i class="glyphicon iconfontcolor71"></i>剑鱼（信息订阅）</a>
 	<a class="list-group-item" onclick="window.location.href = '/member/msgcenter'" id="msgCenter"><i class="glyphicon xiaoxi"></i>消息中心</a>
 </div>
 <script type="text/javascript">

core/src/web/templates/common/swordfishhead.html

@@ -41,11 +41,11 @@ function reLoadTop(){
 				var msgCount = result.msgCount;
 				var hasMsgCount = msgCount > 0;
 				msgCount = msgCount>999?'...':msgCount;
-				var headImg = null;
-				if(headImg != ""){
-					headImg = result.headImg;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
 				}
-				var html = '<span><img class="img-circle headimg" src="'+headImg+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
 				if(hasMsgCount){
 					html += '<a class="round-dot"></a>';
 				}

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

@@ -237,7 +237,7 @@ $(function(){
 			return;
 		}
 		for(var i=0;i<keyword.length;i++){
-			appendKeyWord(type,keyword[i].replace(/\+/g," "));
+			appendKeyWord(type,keyword[i].replace(/\+/g," "),false);
 		}
 	}
 	var selectScope = function(type,scope){
@@ -279,10 +279,10 @@ $(function(){
 	});
 	//
 	$("#tender-addkeyword").click(function(){
-		appendKeyWord("tender");
+		appendKeyWord("tender","",true);
 	});
 	$("#bid-addkeyword").click(function(){
-		appendKeyWord("bid");
+		appendKeyWord("bid","",true);
 	});
 	//
 	$("#tender-scope-dialog").find("li .btn").click(function(){
@@ -342,13 +342,13 @@ function autoChecked(type,flag){
 	obj.find(".swordfish-uncheck").hide();
 	obj.find(".swordfish-checked").show();
 	if(obj.find(".swordfish-keywords").children(".swordfish-keyword").length == 0){
-		appendKeyWord(type,"");
+		appendKeyWord(type,"",false);
 	}
 	if(flag){
 		ajaxReq();
 	}
 }
-function appendKeyWord(type,value){
+function appendKeyWord(type,value,isFocus){
 	this.getHtml = function(index,value){
 		return '<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>：</lable>'
@@ -377,7 +377,7 @@ function appendKeyWord(type,value){
 		autoChecked(type,false);
 		ajaxReq();
 	});
-	if(typeof(value) == "undefined" || value == ""){
+	if(isFocus){
 		node.children("[type='text']").focus()
 	}
 	autoChecked(type,false);

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

@@ -4,10 +4,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <link href="/wxrssset/style.css" rel="stylesheet">
 <link href="/swiper/swiper.min.css" rel="stylesheet">
-<link href="/swiper/animate.min.css" rel="stylesheet">
 <script src="/js/jquery.js"></script>
 <script src="/swiper/swiper.min.js"></script>
-<script src="/swiper/swiper.animate.min.js"></script>
 </head>
 <body>
 <div class="swiper-container">
@@ -41,37 +39,28 @@ $(function(){
 	var mySwiper = new Swiper('.swiper-container', {
         pagination: '.swiper-pagination',
         paginationClickable: true,
-		loop: true,
         direction: 'vertical',
 		touchMoveStopPropagation: false,
-		virtualTranslate: false,
-		onSlideNextStart: function(swiper){
-			
-		},
-		onSlidePrevEnd: function(swiper){
-		},
-		onInit: function(swiper){ //Swiper2.x的初始化是onFirstInit
-		    //swiperAnimateCache(swiper); //隐藏动画元素 
-		    //swiperAnimate(swiper); //初始化完成开始动画
-			
-		}, 
+		virtualTranslate: true,
 		onSlideChangeStart: function(swiper){
-			/*console.info(currentIndex+"--------"+swiper.activeIndex);
+			var prevSlide = $(swiper.slides[swiper.previousIndex]);
+			prevSlide.addClass("slide-active");
+			var activeSlide = $(swiper.slides[swiper.activeIndex]);
 			if(currentIndex > swiper.activeIndex){
-				 $(swiper.slides[swiper.activeIndex]).addClass("slide-down");
+				activeSlide.addClass("slide-down");
 			}else if(currentIndex < swiper.activeIndex){
-				 $(swiper.slides[swiper.activeIndex]).addClass("slide-up");
+				activeSlide.addClass("slide-up");
 			}
-			currentIndex = swiper.activeIndex-1;
-			$(swiper.slides[currentIndex]).one("webkitAnimationEnd",function(){
-				//$(this).removeClass("slide-up").removeClass("slide-down");
-			});*/
+			currentIndex = swiper.activeIndex;
+			activeSlide.one("webkitAnimationEnd",function(){
+				$(this).removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			});
 		},
-	  	onSlideChangeEnd: function(swiper){ 
-	    	//swiperAnimate(swiper); //每个slide切换结束时也运行当前slide动画
-	  	},
 		onSliderMove: function(swiper, event){
-			
+			if(swiper.isEnd && (swiper.touches.currentX - swiper.touches.startX) > 20) {
+				window.location.href = "/swordfish/page";
+			}
 		}
     });
 	var imgHeight = 604;