Merge branch 'master' of ssh://192.168.136.45:10022/SERVER/langer

web/ansjer_answer/index.html

@@ -11,8 +11,7 @@
 <script src="http://www.jq22.com/jquery/jquery-1.10.2.js"></script>
 <script src="lottery/js/jquery_cookie_min.js"></script>   
 <style>
-	 
-	
+
 </style>
 <script>
 	/*不同分辨率手机加载*/

web/ansjer_answer/js/status.js

@@ -1,2 +1,15 @@
-
+
 $.cookie("rmbUser", "true", {expires: 7}); //存储一个带7天期限的cookie
+
+function dq(){
+	var danqian=new Date()/1000;
+	if((new Date("2019-10-1"))/1000<danqian && (new Date("2019-10-8"))/1000>danqian){
+	}else if((new Date("2019-10-1"))/1000>danqian){
+		alert("活动时间是10月1日到7日的");
+		window.location.href="../index.html"
+	}else{
+		window.location.href="../index.html"
+		alert("活动时间已经结束");
+	}
+}
+

web/ansjer_answer/lottery/index.html

@@ -180,6 +180,7 @@
 
 </script>
 <script type="text/javascript">
+	dq();
     setTimeout('$("#drawTab").fadeIn(1500);', 10);
     let draw_status = 0; //中奖状态
 

web/ansjer_answer/style/css.css

@@ -51,22 +51,22 @@ a:hover { /*color:#0064ab; */
 
 header .title{ padding-top:164px;}
 .hm_icon a img { position:absolute; right:30px; top:30px; border:0px;}
-header .f100{ padding-top:164px; margin:0 auto;  background:url("../images/100f.png")/*tpa=images/100f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f90{ padding-top:164px; margin:0 auto;  background:url("../images/90f.png")/*tpa=images/90f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f80{ padding-top:164px; margin:0 auto;  background:url("../images/80f.png")/*tpa=images/80f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f70{ padding-top:164px; margin:0 auto;  background:url("../images/70f.png")/*tpa=images/70f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f60{ padding-top:164px; margin:0 auto;  background:url("../images/60f.png")/*tpa=images/60f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f50{ padding-top:164px; margin:0 auto;  background:url("../images/50f.png")/*tpa=images/50f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f40{ padding-top:164px; margin:0 auto;  background:url("../images/40f.png")/*tpa=images/40f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f30{ padding-top:164px; margin:0 auto;  background:url("../images/30f.png")/*tpa=images/30f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f20{ padding-top:164px; margin:0 auto;  background:url("../images/20f.png")/*tpa=images/20f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f10{ padding-top:164px; margin:0 auto;  background:url("../images/10f.png")/*tpa=images/10f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
-header .f0{ padding-top:164px; margin:0 auto;  background:url("../images/0f.png")/*tpa=images/0f.png*/ no-repeat 0 168px;  width:587px; height:217px; }
+header .f100{ padding-top:164px; margin:0 auto;  background:url("../images/100f.png")/*tpa=images/100f.png*/ no-repeat 0 168px; height:217px; }
+header .f90{ padding-top:164px; margin:0 auto;  background:url("../images/90f.png")/*tpa=images/90f.png*/ no-repeat 0 168px; height:217px; }
+header .f80{ padding-top:164px; margin:0 auto;  background:url("../images/80f.png")/*tpa=images/80f.png*/ no-repeat 0 168px; height:217px; }
+header .f70{ padding-top:164px; margin:0 auto;  background:url("../images/70f.png")/*tpa=images/70f.png*/ no-repeat 0 168px; height:217px; }
+header .f60{ padding-top:164px; margin:0 auto;  background:url("../images/60f.png")/*tpa=images/60f.png*/ no-repeat 0 168px; height:217px; }
+header .f50{ padding-top:164px; margin:0 auto;  background:url("../images/50f.png")/*tpa=images/50f.png*/ no-repeat 0 168px; height:217px; }
+header .f40{ padding-top:164px; margin:0 auto;  background:url("../images/40f.png")/*tpa=images/40f.png*/ no-repeat 0 168px; height:217px; }
+header .f30{ padding-top:164px; margin:0 auto;  background:url("../images/30f.png")/*tpa=images/30f.png*/ no-repeat 0 168px; height:217px; }
+header .f20{ padding-top:164px; margin:0 auto;  background:url("../images/20f.png")/*tpa=images/20f.png*/ no-repeat 0 168px; height:217px; }
+header .f10{ padding-top:164px; margin:0 auto;  background:url("../images/10f.png")/*tpa=images/10f.png*/ no-repeat 0 168px; height:217px; }
+header .f0{ padding-top:164px; margin:0 auto;  background:url("../images/0f.png")/*tpa=images/0f.png*/ no-repeat 0 168px; height:217px; }
 
 .hm_text { padding-top:36px; line-height:36px; font-size:28px; color:#540506; width:548px; margin:0 auto;}
 .hm_text01 { padding-top:60px;}
 .hm_text02 { padding-top:80px;}
-.btn_bg a { background:url("../images/btn_bg.png")/*tpa=images/btn_bg.png*/ no-repeat; width:387px; height:106px; margin-bottom:8px; line-height:96px; font-size:30px; color:#fff; padding-left:106px;  display:block;}
+.btn_bg a { background:url("../images/btn_bg.png")/*tpa=images/btn_bg.png*/ no-repeat; height:106px; margin-bottom:8px; line-height:96px; text-align: center; font-size:30px; color:#fff; display:block;}
 .btn_bg1 a {margin: 0 auto; background: #f39c4c; width:300px;  border-radius: 10px; height:75px; text-align: center; margin-bottom:8px; line-height:75px; font-size:30px; color:#fff; display:block;}
 
 .hm_btn { width:493px; height:106px; margin:0 auto; margin-top:50px;  }