浏览代码

剑鱼修改

wangchuanjin 9 年之前
父节点
当前提交
5a73598462

+ 1 - 0
core/src/qfw/mobile/mobile.go

@@ -10,6 +10,7 @@ type Mobile struct {
 	search     xweb.Mapper `xweb:"/ent/(.*)/search"`
 	detail     xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
 	pageerror  xweb.Mapper `xweb:"/ent/(.*)/505"`
+	guide      xweb.Mapper `xweb:"/swordfish/guide"`
 	wxrssset   xweb.Mapper `xweb:"/swordfish/page"`
 	msgSet     xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
 	ajaxReq    xweb.Mapper `xweb:"/swordfish/ajaxReq"`

+ 12 - 0
core/src/qfw/mobile/wxmenu.go

@@ -18,6 +18,10 @@ func init() {
 	se = util.SimpleEncrypt{Key: "topnet"}
 }
 
+func (m *Mobile) Guide() error {
+	return m.Render("/swordfish/wxindex.html")
+}
+
 func (m *Mobile) Wxrssset() error {
 	defer func() {
 		if r := recover(); r != nil {
@@ -33,6 +37,14 @@ func (m *Mobile) Wxrssset() error {
 	}()
 	if m.Session().Get("userId") != nil {
 		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
+		if i_m_guide := (*userInfo)["i_m_guide"]; util.IntAll(i_m_guide) == 0 {
+			mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
+				"$set": map[string]interface{}{
+					"i_m_guide": 1,
+				},
+			}, false, false)
+			return m.Redirect("/swordfish/guide")
+		}
 		m.T["msgset"] = (*userInfo)["o_msgset"]
 		entid := util.ObjToString((*userInfo)["s_enterpriseid"])
 		if entid != "" {

文件差异内容过多而无法显示
+ 0 - 14
core/src/web/staticres/microwebsite/swiper/swiper.min.js


文件差异内容过多而无法显示
+ 5 - 0
core/src/web/staticres/swiper/animate.min.css


+ 0 - 0
core/src/web/staticres/microwebsite/swiper/maps/swiper.jquery.min.js.map → core/src/web/staticres/swiper/maps/swiper.jquery.min.js.map


+ 0 - 0
core/src/web/staticres/microwebsite/swiper/maps/swiper.min.js.map → core/src/web/staticres/swiper/maps/swiper.min.js.map


+ 2 - 0
core/src/web/staticres/swiper/swiper.animate.min.js

@@ -0,0 +1,2 @@
+//本插件由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," "))}

+ 0 - 0
core/src/web/staticres/microwebsite/swiper/swiper.min.css → core/src/web/staticres/swiper/swiper.min.css


文件差异内容过多而无法显示
+ 14 - 0
core/src/web/staticres/swiper/swiper.min.js


二进制
core/src/web/staticres/wxrssset/images/up.png


+ 147 - 0
core/src/web/staticres/wxrssset/style.css

@@ -279,4 +279,151 @@ img{
 	color: #ccc;
 	text-align: right;
 	padding-right: 5px;
+}
+/**引导页**/
+.swiper-pagination{
+	top: 80px !important;
+}
+.swiper-pagination-bullet{
+	margin-bottom: 15px !important;
+}
+.swiper-slide{
+	text-align: center;
+	/*z-index: -1;
+	background: #ffffff;
+	position: absolute !important;*/
+}
+.swiper-slide-active{
+	/*z-index: 0;*/
+}
+.slide-down{
+	z-index: 1;
+	/* Safari and Chrome: */
+	-webkit-animation-name:slidedown;
+	-webkit-animation-duration:2s;
+	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-iteration-count:1;
+	-webkit-animation-play-state:running;
+}
+@-webkit-keyframes slidedown {
+	0%{
+		top: -100%;
+	}
+	100% {
+		top: 0px;
+	}
+}
+.slide-up{
+	z-index: 1;
+	/* Safari and Chrome: */
+	-webkit-animation-name:slideup;
+	-webkit-animation-duration:2s;
+	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-iteration-count:1;
+	-webkit-animation-play-state:running;
+}
+
+@-webkit-keyframes slideup {
+	0%{
+		top: 100%;
+	}
+	100% {
+		top: 0px;
+	}
+}
+.swiper-slide>p{
+	height: inherit;
+	position: relative;
+}
+.swiper-slide img{
+	position: relative;
+	top: 50%;
+	margin-top: -302px;
+}
+.swiper-pagination-bullet-active{
+	background-color: #37C6DA;
+}
+.guide-bottom{
+	position: absolute;
+	bottom: 10px;
+	text-align: center;
+	width: 100%;
+	z-index: 99999;
+}
+.guide-bottom img{
+	width: 25px;
+	height: 15px;
+	position: absolute;
+	left: 50%;
+	margin-left: -25px;
+	animation-name:start;
+	animation-duration:2s;
+	animation-timing-function:ease-in-out;
+	animation-iteration-count:infinite;
+	animation-play-state:running;
+	/* Firefox: */
+	-moz-animation-name:start;
+	-moz-animation-duration:2s;
+	-moz-animation-timing-function:ease-in-out;
+	-moz-animation-iteration-count:infinite;
+	-moz-animation-play-state:running;
+	/* Safari and Chrome: */
+	-webkit-animation-name:start;
+	-webkit-animation-duration:2s;
+	-webkit-animation-timing-function:ease-in-out;
+	-webkit-animation-iteration-count:infinite;
+	-webkit-animation-play-state:running;
+	/* Opera: */
+	-o-animation-name:start;
+	-o-animation-duration:2s;
+	-o-animation-timing-function:ease-in-out;
+	-o-animation-iteration-count:infinite;
+	-o-animation-play-state:running;
+}
+
+@-webkit-keyframes start {
+	0%{
+		opacity:0;
+		bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		bottom: 25px;
+	}
+}
+@-moz-keyframes start {
+	0%{
+		opacity:0;
+		bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		bottom: 25px;
+	}
+}
+@keyframes start {
+		0% {
+		opacity:0;
+		bottom: 0px;
+	}
+	60% {
+		opacity:1;
+	}
+	100% {
+		opacity:0;
+		bottom: 25px;
+	}
+}
+.guide-bottom span{
+	float: right;
+	display: block;
+	font-size: 12px;
+	color: #D7D7D7;
+	margin-right: 10px;
 }

+ 2 - 2
core/src/web/templates/microwebsite/blue/index.html

@@ -4,11 +4,11 @@
 <meta content="telephone=no" name="format-detection">
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 <title>{{.T.EntName}}</title>
-<link rel="stylesheet" href="/microwebsite/swiper/swiper.min.css">
+<link rel="stylesheet" href="/swiper/swiper.min.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/style.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/blue.css">
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/microwebsite/swiper/swiper.min.js"></script>
+<script type="text/javascript" src="/swiper/swiper.min.js"></script>
 <script type="text/javascript" src="/microwebsite/mobile/js/index.js"></script>
 <script type="text/javascript">
 $(function(){

+ 2 - 2
core/src/web/templates/microwebsite/colorful/index.html

@@ -4,11 +4,11 @@
 <meta content="telephone=no" name="format-detection">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <title>{{.T.EntName}}</title>
-<link rel="stylesheet" href="/microwebsite/swiper/swiper.min.css">
+<link rel="stylesheet" href="/swiper/swiper.min.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/style.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/colorful.css">
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/microwebsite/swiper/swiper.min.js"></script>
+<script type="text/javascript" src="/swiper/swiper.min.js"></script>
 <script type="text/javascript" src="/microwebsite/mobile/js/index.js"></script>
 </head>
 <body class="content-bg">

+ 2 - 2
core/src/web/templates/microwebsite/geenleaf/index.html

@@ -4,11 +4,11 @@
 <meta content="telephone=no" name="format-detection">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <title>{{.T.EntName}}</title>
-<link rel="stylesheet" href="/microwebsite/swiper/swiper.min.css">
+<link rel="stylesheet" href="/swiper/swiper.min.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/style.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/geenleaf.css">
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/microwebsite/swiper/swiper.min.js"></script>
+<script type="text/javascript" src="/swiper/swiper.min.js"></script>
 <script type="text/javascript" src="/microwebsite/mobile/js/index.js"></script>
 </head>
 <body class="content-bg">

+ 2 - 2
core/src/web/templates/microwebsite/universe/index.html

@@ -4,11 +4,11 @@
 <meta content="telephone=no" name="format-detection">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <title>{{.T.EntName}}</title>
-<link rel="stylesheet" href="/microwebsite/swiper/swiper.min.css">
+<link rel="stylesheet" href="/swiper/swiper.min.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/style.css">
 <link rel="stylesheet" href="/microwebsite/mobile/css/universe.css">
 <script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/microwebsite/swiper/swiper.min.js"></script>
+<script type="text/javascript" src="/swiper/swiper.min.js"></script>
 <script type="text/javascript" src="/microwebsite/mobile/js/index.js"></script>
 </head>
 <body class="content-bg">

+ 90 - 0
core/src/web/templates/swordfish/wxindex.html

@@ -0,0 +1,90 @@
+<html>
+<head>
+<title>剑鱼</title>
+<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">
+    <div class="swiper-wrapper">
+        <div class="swiper-slide">
+				<img id="guide-firstImg" src="/images/swordfish/guide-1.png">
+		</div>
+       	<div class="swiper-slide">
+				<img src="/images/swordfish/guide-2.png">
+		</div>
+       	<div class="swiper-slide">
+				<img src="/images/swordfish/guide-3.png">
+		</div>
+		<div class="swiper-slide">
+				<img src="/images/swordfish/guide-4.png">
+		</div>
+		<div class="swiper-slide">
+				<img src="/images/swordfish/guide-5.png">
+		</div>
+    </div>
+    <!-- 如果需要分页器 -->
+   	<div class="swiper-pagination"></div>
+	<div class="guide-bottom">
+		<img src="/wxrssset/images/up.png">
+		<span onclick="window.location.href='/swordfish/page'">跳过引导>></span>
+	</div>
+</div>
+<script type="text/javascript">
+$(function(){
+	var currentIndex = 0;
+	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); //初始化完成开始动画
+			
+		}, 
+		onSlideChangeStart: function(swiper){
+			/*console.info(currentIndex+"--------"+swiper.activeIndex);
+			if(currentIndex > swiper.activeIndex){
+				 $(swiper.slides[swiper.activeIndex]).addClass("slide-down");
+			}else if(currentIndex < swiper.activeIndex){
+				 $(swiper.slides[swiper.activeIndex]).addClass("slide-up");
+			}
+			currentIndex = swiper.activeIndex-1;
+			$(swiper.slides[currentIndex]).one("webkitAnimationEnd",function(){
+				//$(this).removeClass("slide-up").removeClass("slide-down");
+			});*/
+		},
+	  	onSlideChangeEnd: function(swiper){ 
+	    	//swiperAnimate(swiper); //每个slide切换结束时也运行当前slide动画
+	  	},
+		onSliderMove: function(swiper, event){
+			
+		}
+    });
+	var imgHeight = 604;
+	var imgWidth = 813;
+	var width = document.body.clientWidth;
+	var height = document.body.clientHeight;
+	if(imgWidth > width){
+		var h = width / imgWidth * imgHeight;
+		$(".swiper-slide img").css({width: width,height: h,marginTop: -(h / 2)});
+	}else if(imgHeight > height){
+		$(".swiper-slide img").css({width: height / imgHeight * imgWidth,height: height,marginTop: -(height / 2)});
+	}
+});
+</script>
+</body>
+</html>

部分文件因为文件数量过多而无法显示