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

core/src/qfw/swordfish/swordfishmanage.go

@@ -21,7 +21,7 @@ func (s *SwordFish) Swordfish() error {
 			s.T["data"] = r
 		}
 		content, _ := s.Render4Cache("/swordfish/index.html", &s.T)
-		redis.Put("other", "swordfish", string(content), 30*60*1000) //缓存半个小时
+		redis.Put("other", "swordfish", string(content), 30*60) //缓存半个小时
 		return s.SetBody(content)
 	}
 }
@@ -158,7 +158,7 @@ func getNewest() (list []interface{}) {
 		now := time.Now()
 		unix := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-2, now.Minute(), now.Second(), now.Nanosecond(), time.Local).Unix()
 		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
-		redis.Put("other", "swordfish_newest_list", *r, 30*60*1000) //缓存半个小时
+		redis.Put("other", "swordfish_newest_list", *r, 30*60) //缓存半个小时
 		for _, v := range *r {
 			list = append(list, v)
 		}

core/src/web/staticres/css/dev-qfw.css

@@ -2268,7 +2268,6 @@ style="color:#D03102;margin-right:5px;"
 .b-top{
 	height: 25px;
 	line-height: 25px;
-	padding-right: 87px;
 	background-color: #464645;
 	font-size: 12px;
 	font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
@@ -2373,7 +2372,7 @@ style="color:#D03102;margin-right:5px;"
 	margin-right: 5px;
 }
 .b-head .b-loginStatus{
-	padding: 0px 15px;
+	padding-left: 15px;
 	position: relative;
 	cursor: pointer;
 }

core/src/web/staticres/css/index-new.css

@@ -209,7 +209,7 @@ a:focus, a:hover{
     color: #A0A0A0;
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-content{
-	height:40px;
+	height:45px;
 	width:200px;
     font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
     font-size: 12px;

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

@@ -28,7 +28,7 @@
 			<img src="/wxswordfish/images/guide-5.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="/wxswordfish/images/guide-6.png">
+			<img src="/wxswordfish/images/guide-1.png">
 		</div>
     </div>
     <!-- 如果需要分页器 -->
@@ -51,6 +51,9 @@ $(function(){
         direction: 'vertical',
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
+		onInit: function(swiper){
+			$(swiper.slides[5]).children("img").attr("src","/wxswordfish/images/guide-6.png");
+		},
 		onSlideChangeStart: function(swiper){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");

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

@@ -28,7 +28,7 @@
 			<img src="/wxswordfish/images/guide-5.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="/wxswordfish/images/guide-6.png">
+			<img src="/wxswordfish/images/share-cj.jpg">
 		</div>
     </div>
     <!-- 如果需要分页器 -->
@@ -65,6 +65,9 @@ $(function(){
         direction: 'vertical',
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
+		onInit: function(swiper){
+			$("[data-swiper-slide-index='5']>img").attr("src","/wxswordfish/images/guide-6.png");
+		},
 		onSlideChangeStart: function(swiper){
 			if(flag){
 				flag = false;
@@ -73,26 +76,28 @@ $(function(){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");
 			var activeSlide = $(swiper.slides[swiper.activeIndex]);
-			if(currentIndex > swiper.activeIndex){
+			if(currentIndex == 0 && swiper.activeIndex == 0){
 				activeSlide.addClass("slide-down");
-			}else if(currentIndex < swiper.activeIndex){
-				activeSlide.addClass("slide-up");
+			}else{
+				if(currentIndex > swiper.activeIndex){
+					activeSlide.addClass("slide-down");
+				}else if(currentIndex < swiper.activeIndex){
+					activeSlide.addClass("slide-up");
+				}
 			}
 			currentIndex = swiper.activeIndex;
-			activeSlide.one("webkitAnimationEnd",function(){
-				$(this).removeClass("slide-up").removeClass("slide-down");
-				prevSlide.removeClass("slide-active");
-			});
-		},
-		onSliderMove: function(swiper, event){
-			if(swiper.isBeginning){
+			if(currentIndex == 7){
+				currentIndex = 0;
+			}
+			if(swiper.isEnd || swiper.activeIndex == 1){
 				$("#QRcode").show();
 			}else{
 				$("#QRcode").hide();
 			}
-			if(swiper.isEnd) {
-				currentIndex = 0;
-			}
+			activeSlide.one("webkitAnimationEnd",function(){
+				$(this).removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			});
 		}
     });
 	/*