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

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 10:41:42"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 10:41:42"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 16:45:52"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 16:45:52"}},"marketisstart":true,"marketrate":300}

core/src/web/templates/active/luckdraw.html

@@ -19,9 +19,12 @@
 <style>
 *{padding:0; margin:0;}
 .lotteryMain{ width:100%;}
-.lotteryBg{ width:100%; height:100%; margin:0 auto; background:url(/images/activeimages/lotteryBg.jpg) no-repeat center center; position:relative; overflow:hidden;background-size: 375px 603px;}
+.lotteryBg{ width:100%; height:608px; margin:0 auto; background:url(/images/activeimages/lotteryBg.jpg) no-repeat top center; position:relative; overflow:hidden;background-size: 375px 508px;}
 #run{ width:145px; height:145px; position:absolute; left:50%; top:50%;  margin-left:-73px; margin-top:-53px; z-index:1; transform:rotate(0deg); -ms-transform:rotate(0deg); }
 #btn_run{ width:80px; height:80px; background:url(/images/activeimages/btn_start.png) no-repeat; border:none; outline:none; position:absolute; left:50%; top:50%; margin-left:-40px; margin-top:-22px; z-index:2;cursor:pointer;background-position:0px 0px;background-size: 100% 100%;}
+.col-xs-12 p{
+	margin:0px 0px 5px;
+}
 </style>
 </head>
 
@@ -58,7 +61,16 @@
     	<img id="run" src="/images/activeimages/start.png" />
         <input id="btn_run" type="button" value="" />
     </div>
-</section>  
+</section> 
+<div class="col-xs-12" style="color:#fff; margin-top:-135px;font-weight:600;">
+<h3 style="font-weight:600;">活动规则</h3>
+<p>1、企明星所有粉丝用户均可以参与幸运抽奖；</p>
+<p>2、每位用户每天有一次抽奖机会；</p>
+<p>3、活动页面转发分享后获得第二天的抽奖资格；</p>
+<p>4、中奖用户请通过企明星微信与客服联系，告知联系方式；</p>
+<p>5、活动时间截止到2016年2月15日；</p>
+<p>6、iPadmini、书籍和U盘会在活动截止后统一邮寄发出。请注意查收。</p>
+</div> 
 <script>
 
 $(function(){