zhashaonan 6 سال پیش
والد
کامیت
49e967578e
24فایلهای تغییر یافته به همراه128 افزوده شده و 10 حذف شده
  1. 113 0
      data/resource/mobile/festival/newYear/css/style.css
  2. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_bg.png
  3. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_btn.png
  4. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_qian.png
  5. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_sang.png
  6. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_share.png
  7. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_song.png
  8. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_xia.png
  9. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_xiao.png
  10. BIN
      data/resource/mobile/festival/newYear/image/page3/bad_year.png
  11. BIN
      data/resource/mobile/festival/newYear/image/page3/sang/content1.png
  12. BIN
      data/resource/mobile/festival/newYear/image/page3/sang/content2.png
  13. BIN
      data/resource/mobile/festival/newYear/image/page3/sang/content3.png
  14. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaosong/content1.png
  15. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaosong/content2.png
  16. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaosong/content3.png
  17. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaxia/content1.png
  18. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaxia/content2.png
  19. BIN
      data/resource/mobile/festival/newYear/image/page3/xiaxia/content3.png
  20. BIN
      data/resource/mobile/festival/newYear/image/share.jpg
  21. 7 2
      data/resource/mobile/festival/newYear/js/newYear.js
  22. 2 2
      mobile/control/control.php
  23. 1 1
      mobile/control/festval.php
  24. 5 5
      mobile/templates/default/festival/newYear/index.php

+ 113 - 0
data/resource/mobile/festival/newYear/css/style.css

@@ -392,6 +392,38 @@ img {
     background: url(../image/page3/bg.png) no-repeat;
     background-size: 100% 100%;
 }
+.page3 .content.xiaosong,
+.page3 .content.xiaxia,
+.page3 .content.sang
+{
+    background: url(../image/page3/bad_bg.png) no-repeat;
+    background-size: 100% 100%;
+}
+.page3 .content.xiaosong .share,
+.page3 .content.xiaxia .share,
+.page3 .content.sang .share {
+    background: url(../image/page3/bad_share.png) no-repeat;
+    background-size: 100% 100%;
+}
+.page3 .content.xiaosong .text-bg3,
+.page3 .content.xiaxia .text-bg3,
+.page3 .content.sang .text-bg3 {
+    background: url(../image/page3/bad_qian.png) no-repeat;
+    background-size: 100% 100%;
+}
+.page3 .content.xiaosong .year-bg,
+.page3 .content.xiaxia .year-bg,
+.page3 .content.sang .year-bg {
+    background: url(../image/page3/bad_year.png) no-repeat;
+    background-size: 100% 100%;
+}
+.page3 .content.xiaosong .btn,
+.page3 .content.xiaxia .btn,
+.page3 .content.sang .btn {
+    background: url(../image/page3/bad_btn.png) no-repeat;
+    background-size: 100% 100%;
+}
+
 .page3 .share {
     z-index: 2;
     right: 30px;
@@ -615,6 +647,87 @@ img {
     background: url(../image/page3/shangshang/content3.png) no-repeat;
     background-size: 100% 100%;
 }
+/*小怂*/
+.xiaosong .text-bg1 {
+    background: url(../image/page3/bad_xiao.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaosong .text-bg2 {
+    background: url(../image/page3/bad_song.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaosong .wish1 {
+    width: 150px;
+    height: 162px;
+    background: url(../image/page3/xiaosong/content1.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaosong .wish2 {
+    width: 152px;
+    height: 184px;
+    background: url(../image/page3/xiaosong/content2.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaosong .wish3 {
+    width: 142px;
+    height: 212px;
+    background: url(../image/page3/xiaosong/content3.png) no-repeat;
+    background-size: 100% 100%;
+}
+/*吓吓*/
+.xiaxia .text-bg1 {
+    background: url(../image/page3/bad_xia.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaxia .text-bg2 {
+    background: url(../image/page3/bad_xia.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaxia .wish1 {
+    width: 148px;
+    height: 224px;
+    background: url(../image/page3/xiaxia/content1.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaxia .wish2 {
+    width: 152px;
+    height: 206px;
+    background: url(../image/page3/xiaxia/content2.png) no-repeat;
+    background-size: 100% 100%;
+}
+.xiaxia .wish3 {
+    width: 142px;
+    height: 188px;
+    background: url(../image/page3/xiaxia/content3.png) no-repeat;
+    background-size: 100% 100%;
+}
+/*丧丧*/
+.sang .text-bg1 {
+    background: url(../image/page3/bad_sang.png) no-repeat;
+    background-size: 100% 100%;
+}
+.sang .text-bg2 {
+    background: url(../image/page3/bad_sang.png) no-repeat;
+    background-size: 100% 100%;
+}
+.sang .wish1 {
+    width: 150px;
+    height: 212px;
+    background: url(../image/page3/sang/content1.png) no-repeat;
+    background-size: 100% 100%;
+}
+.sang .wish2 {
+    width: 152px;
+    height: 182px;
+    background: url(../image/page3/sang/content2.png) no-repeat;
+    background-size: 100% 100%;
+}
+.sang .wish3 {
+    width: 142px;
+    height: 300px;
+    background: url(../image/page3/sang/content3.png) no-repeat;
+    background-size: 100% 100%;
+}
 
 .page3 .user-info {
     position: absolute;

BIN
data/resource/mobile/festival/newYear/image/page3/bad_bg.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_btn.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_qian.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_sang.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_share.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_song.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_xia.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_xiao.png


BIN
data/resource/mobile/festival/newYear/image/page3/bad_year.png


BIN
data/resource/mobile/festival/newYear/image/page3/sang/content1.png


BIN
data/resource/mobile/festival/newYear/image/page3/sang/content2.png


BIN
data/resource/mobile/festival/newYear/image/page3/sang/content3.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaosong/content1.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaosong/content2.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaosong/content3.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaxia/content1.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaxia/content2.png


BIN
data/resource/mobile/festival/newYear/image/page3/xiaxia/content3.png


BIN
data/resource/mobile/festival/newYear/image/share.jpg


+ 7 - 2
data/resource/mobile/festival/newYear/js/newYear.js

@@ -9,7 +9,7 @@ function Page(url,from_app, member_id, bridge, loadImages) {
     this.soundWish = $('.sound-wish')[0];
     this.nickname = '';
     this.bestWish = 0;
-    this.result = ['none','toucai','ruyi','daxi','shangji','daji','shangshang', 'other1', 'other2']
+    this.result = ['none','toucai','ruyi','daxi','shangji','daji','shangshang', 'xiaosong', 'xiaxia', 'sang']
 }
 
 Page.prototype = {
@@ -153,6 +153,11 @@ Page.prototype = {
         var classname = this.result[this.bestWish];
         $('.page3 .user-name').text(self.nickname);
         $('.page3 .content').addClass(classname);
+
+        //test
+        // $('.page3 .content').addClass(this.result[this.randomResult()]);
+        //test
+
         $('.page3 .user-name, .page3 .year-bg').addClass('animation');
         $('.page3').on('click', '.bonus-up.animation' ,function () {
             location.href = 'https://a.lrlz.com/mobile/index.php?act=bonusex&op=open&client_type=wap&type_sn=44261545875786320384'
@@ -167,7 +172,7 @@ Page.prototype = {
         $('.page3 .bonus-up').addClass('animation');
     },
     randomResult: function () {
-        var index = Math.round(Math.random() * 7) + 1;
+        var index = Math.round(Math.random() * 8) + 1;
         return index;
     },
     resultAjax: function (bestWish) {

+ 2 - 2
mobile/control/control.php

@@ -331,9 +331,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018122705";
+    return "v=2018122706";
 }
 function shop_version()
 {
-    return "v=2018122705";
+    return "v=2018122706";
 }

+ 1 - 1
mobile/control/festval.php

@@ -419,7 +419,7 @@ class festvalControl extends mobileControl
     public function bestWishOp()
     {
         $val = intval($_GET["bestWish"]);
-        if($val <= 0 || $val > 8) {
+        if($val <= 0 || $val > 9) {
             return self::outerr(errcode::ErrParamter,"错误的请求参数");
         }
 

+ 5 - 5
mobile/templates/default/festival/newYear/index.php

@@ -98,7 +98,7 @@ $info = $output['info'];
 
         <div class="item page3">
             <div class="place-wrap">
-<!--                toucai ruyi daxi shangji daji shangshang-->
+<!--                toucai ruyi daxi shangji daji shangshang xiaosong xiaxia sang-->
                 <div class="content">
                     <div class="share positon-abs"></div>
                     <div class="text-bg text-bg1 positon-abs"></div>
@@ -139,13 +139,13 @@ $info = $output['info'];
         };
         document.body.addEventListener('touchmove', removeDefault, { passive: false }); //passive 参数不能省略,用来兼容ios和android
 
-        var title = '新年运势title';
-        var desc = '新年运势desc';
+        var title = '2019锦鲤神签';
+        var desc = '2019年运势怎么样?快来求支签看看吧!';
         weiXinShare.init({
             title: title,
             desc: desc,
             link: "<?php echo BASE_SITE_URL ?>/mobile/index.php?act=festval&op=new_year",
-            imgUrl: "<?php echo RESOURCE_SITE_URL; ?>/mobile/qixi/images/share.jpg"
+            imgUrl: "<?php echo RESOURCE_SITE_URL; ?>/mobile/festival/newYear/image/share.jpg"
         });
 
         var jsInit = {
@@ -154,7 +154,7 @@ $info = $output['info'];
                 can_share: true,
                 title: title,
                 sub_title: desc,
-                img_url: "<?php echo RESOURCE_SITE_URL; ?>/mobile/qixi/images/share.jpg",
+                img_url: "<?php echo RESOURCE_SITE_URL; ?>/mobile/festival/newYear/image/share.jpg",
                 url: "<?php echo BASE_SITE_URL ?>/mobile/index.php?act=festval&op=new_year"
             }
         };