Home Explore Help
Sign In
other
/
onepage_mrhi
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

edit

dever 6 years ago
parent
7963f58554
commit
46861882c3
64 changed files with 869 additions and 48 deletions
Split View Show Diff Stats
  1. 35 5
      kissy/haili/active.html
  2. 0 0
      kissy/haili/css/active.css
  3. 1 1
      kissy/haili/css/active.css.map
  4. 1 1
      kissy/haili/css/comment.css
  5. 1 1
      kissy/haili/css/comment.css.map
  6. 1 1
      kissy/haili/css/detail.css
  7. 1 1
      kissy/haili/css/detail.css.map
  8. 0 0
      kissy/haili/css/global.css
  9. 1 1
      kissy/haili/css/global.css.map
  10. 0 0
      kissy/haili/css/index.css
  11. 1 1
      kissy/haili/css/index.css.map
  12. 2 0
      kissy/haili/css/my.css
  13. 1 0
      kissy/haili/css/my.css.map
  14. 1 1
      kissy/haili/css/prizelist.css
  15. 1 1
      kissy/haili/css/prizelist.css.map
  16. 2 0
      kissy/haili/css/setting.css
  17. 1 0
      kissy/haili/css/setting.css.map
  18. BIN
      kissy/haili/images/6445340f.ico-gift.png
  19. BIN
      kissy/haili/images/965c961d.ico-arrow.png
  20. BIN
      kissy/haili/images/cf37e41f.ico-star.png
  21. BIN
      kissy/haili/images/d205afc3.ico-setting.png
  22. BIN
      kissy/haili/images/e4d6c691.prbg.jpg
  23. BIN
      kissy/haili/images/f96cf6ce.btn-back.png
  24. 2 2
      kissy/haili/js/active.js
  25. 1 1
      kissy/haili/js/active.js.map
  26. 0 0
      kissy/haili/js/comment.js
  27. 0 0
      kissy/haili/js/comment.js.map
  28. 2 2
      kissy/haili/js/detail.js
  29. 1 1
      kissy/haili/js/detail.js.map
  30. 0 0
      kissy/haili/js/global.js
  31. 0 0
      kissy/haili/js/global.js.map
  32. 0 0
      kissy/haili/js/index.js
  33. 0 0
      kissy/haili/js/index.js.map
  34. 2 2
      kissy/haili/js/list.js
  35. 1 1
      kissy/haili/js/list.js.map
  36. 2 0
      kissy/haili/js/my.js
  37. 1 0
      kissy/haili/js/my.js.map
  38. 2 2
      kissy/haili/js/prizelist.js
  39. 1 1
      kissy/haili/js/prizelist.js.map
  40. 2 0
      kissy/haili/js/setting.js
  41. 1 0
      kissy/haili/js/setting.js.map
  42. 46 0
      kissy/haili/my.html
  43. 34 0
      kissy/haili/setting.html
  44. 3 0
      tm/lib/Controller/Admin/Activity/SetPage.class.php
  45. 3 4
      tm/lib/Controller/Admin/Activity/UserHelp.class.php
  46. 11 1
      tm/lib/Controller/Admin/Controller.class.php
  47. 42 1
      tm/lib/Controller/EventsController.class.php
  48. 1 1
      tm/lib/Controller/EventsTry.class.php
  49. 8 1
      tm/lib/Controller/Express.class.php
  50. 229 0
      tm/lib/Controller/Member.class.php
  51. 12 2
      tm/lib/Dao/LotteryDeliveryChannels.class.php
  52. 1 0
      tm/lib/Dao/LotteryUserExpress.class.php
  53. 3 0
      tm/template_dir/admin/activity/delivery_channels_list.html
  54. 9 0
      tm/template_dir/admin/activity/setPage_event.html
  55. 3 3
      tm/template_dir/admin/platform/edit.html
  56. 4 4
      tm/template_dir/admin/platform/list.html
  57. 25 3
      tm/template_dir/ajax_events.html
  58. 26 0
      tm/template_dir/ajax_my_act.html
  59. 2 0
      tm/template_dir/bottom.html
  60. 90 2
      tm/template_dir/events_infos.html
  61. 4 0
      tm/template_dir/events_top.html
  62. 39 0
      tm/template_dir/my.html
  63. 112 0
      tm/template_dir/my_act.html
  64. 94 0
      tm/template_dir/my_set.html

+ 35 - 5
kissy/haili/active.html
View File 

@@ -10,7 +10,7 @@
 
     <title>首页</title>
 
     <meta name="Keywords" content="" />
 
     <meta name="Description" content="" />
 
-<link href="css/global.css?v=4c79619c" rel="stylesheet"><link href="css/active.css?v=4c79619c" rel="stylesheet"></head>
 
+<link href="css/global.css?v=76e6ae63" rel="stylesheet"><link href="css/active.css?v=76e6ae63" rel="stylesheet"></head>
 
 
 <body>
 
     <header>海狸福利社</header>
 
@@ -24,6 +24,7 @@
 
                 <li class="cur"><a href="#tab1">活动详情</a></li>
 
                 <li><a href="#tab2">中奖信息</a></li>
 
                 <li><a href="#tab3">试用评价</a></li>
 
+                <li><a href="#tab4">助力排行</a></li>
 
             </ul>
 
         </section>
 
     </section>
 
@@ -124,17 +125,46 @@
 
             </ul>
 
         </section>
 
     </section>
 
+    <section id="tab4" class="tabcont">
 
+        <section class="zhulilist">
 
+            <ul>
 
+                <li>
 
+                    <div>
 
+                        <img src="images/da428226.tmp2.jpg"><span>迷信的无神论者</span>
 
+                    </div>
 
+                    <div><span>助力值124</span></div>
 
+                </li>
 
+                <li>
 
+                    <div>
 
+                        <img src="images/da428226.tmp2.jpg"><span>迷信的无神论者</span>
 
+                    </div>
 
+                    <div><span>助力值124</span></div>
 
+                </li>
 
+                <li>
 
+                    <div>
 
+                        <img src="images/da428226.tmp2.jpg"><span>迷信的无神论者</span>
 
+                    </div>
 
+                    <div><span>助力值124</span></div>
 
+                </li>
 
+                <li>
 
+                    <div>
 
+                        <img src="images/da428226.tmp2.jpg"><span>迷信的无神论者</span>
 
+                    </div>
 
+                    <div><span>助力值124</span></div>
 
+                </li>
 
+            </ul>
 
+        </section>
 
+    </section>
 
 
-    <!-- <section class="layer" style="display:block">
 
+   <!--  <section class="layer" style="display:block">
 
         <section class="loginbox">
 
             <h3>您还没有登录</h3>
 
             <p>请登录后再参与福利活动</p>
 
             <section class="button-wrapper">
 
-                <a class="button border">找找其他福利</a>
 
-                <a class="button">马上登录</a>
 
+                <a class="button autowidth">马上登录马上登录</a>
 
             </section>
 
         </section>
 
     </section> -->
 
-<script type="text/javascript" src="js/global.js?v=4c79619c"></script><script type="text/javascript" src="js/active.js?v=4c79619c"></script></body>
 
+<script type="text/javascript" src="js/global.js?v=76e6ae63"></script><script type="text/javascript" src="js/active.js?v=76e6ae63"></script></body>
 
 
 </html>

File diff suppressed because it is too large
+ 0 - 0
kissy/haili/css/active.css


+ 1 - 1
kissy/haili/css/active.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/active.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/active.css?v=76e6ae63","sourceRoot":""}

+ 1 - 1
kissy/haili/css/comment.css
View File 

@@ -1,2 +1,2 @@
 
 .comment{margin-bottom:1.733333rem}.comment h2{text-align:center;font-size:.453333rem;line-height:1.653333rem}.comment .comment-imgs-box{padding:.4rem;background-color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ccc}.comment .comment-imgs-box h5{font-size:.293333rem;font-weight:400;margin-bottom:.533333rem}.comment .comment-imgs-box ul{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.comment .comment-imgs-box ul li{position:relative;margin:0 .15rem .4rem;width:2rem}.comment .comment-imgs-box ul li img{display:block;width:100%}.comment .comment-imgs-box ul li .close{position:absolute;width:.386667rem;height:.386667rem;background:url(../images/0581e9b5.close.png) no-repeat;background-size:100%;right:-.2rem;top:-.2rem}.comment .comment-imgs-box ul li.fileselect input{width:100%;height:2rem;opacity:0}.comment .comment-imgs-box ul li.fileselect:after{position:absolute;left:0;top:0;width:2rem;height:2rem;content:" ";background:url(../images/a86857f7.imgclick.png) no-repeat;background-size:100% 100%;pointer-events:none}.comment .comment-text-box{margin-top:.4rem;background-color:#fff;border-top:1px solid #ccc;border-bottom:1px solid #ccc}.comment .comment-text-box textarea{display:block;box-sizing:border-box;width:100%;padding:.266667rem .4rem;height:3.706667rem;font-size:.293333rem}.comment .comment-button-box{margin-top:.773333rem}
 
-/*# sourceMappingURL=comment.css.map?v=9fd91ad7*/
 
+/*# sourceMappingURL=comment.css.map?v=76e6ae63*/

+ 1 - 1
kissy/haili/css/comment.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/comment.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/comment.css?v=76e6ae63","sourceRoot":""}

+ 1 - 1
kissy/haili/css/detail.css
View File 

@@ -1,2 +1,2 @@
 
 .profile{background-color:#fff;box-shadow:0 0 5px rgba(8,1,3,.08);padding:1.066667rem 0 1.16rem;margin-bottom:.4rem}.profile .avatar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.profile .avatar img{display:block;width:2rem;height:2rem;border-radius:100%;margin-bottom:.133333rem}.profile .avatar span{font-size:.4rem}.profile .card{width:9.466667rem;margin:0 auto .933333rem;box-sizing:border-box}.profile .card dd{font-size:.453333rem;color:#4194f0;text-align:center;line-height:1.253333rem}.profile .card dt img{width:100%;display:block;border-radius:.133333rem}.profile .button-wrapper{margin-bottom:1.333333rem}.profile .friends{width:9.466667rem;margin:0 auto;padding-top:.96rem;border-top:1px solid #ccc}.profile .friends p{font-size:.4rem;text-align:center}.profile .friends p span{color:#4194f0}.profile .friends ul{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.profile .friends ul li{width:.933333rem;margin:.6rem .125rem 0;border-radius:100%;box-sizing:border-box;border:1px solid #d2d2d2}.profile .friends ul li img{display:block;border-radius:100%;width:100%}.applycont{background-color:#fff;box-shadow:0 0 5px rgba(8,1,3,.08);padding:.466667rem 0;margin-bottom:.4rem}.applycont h2{margin:0 auto .4rem;width:4.706667rem;text-align:center;border-bottom:.053333rem solid #000;font-size:.373333rem;line-height:.773333rem}.applycont .button-wrapper{padding:.666667rem 0 .933333rem}.applycont .summary{padding:0 .906667rem}.applycont .summary p{font-size:.32rem;line-height:.48rem;margin-bottom:.48rem}
 
-/*# sourceMappingURL=detail.css.map?v=9fd91ad7*/
 
+/*# sourceMappingURL=detail.css.map?v=76e6ae63*/

+ 1 - 1
kissy/haili/css/detail.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/detail.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/detail.css?v=76e6ae63","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
kissy/haili/css/global.css


+ 1 - 1
kissy/haili/css/global.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=76e6ae63","sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
kissy/haili/css/index.css


+ 1 - 1
kissy/haili/css/index.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/index.css?v=76e6ae63","sourceRoot":""}

+ 2 - 0
kissy/haili/css/my.css
View File 

@@ -0,0 +1,2 @@
 
+.profile{background:url(../images/e4d6c691.prbg.jpg) no-repeat top;background-size:100% auto;box-shadow:0 0 5px rgba(8,1,3,.08);padding:1rem 0 1.05rem;margin-bottom:.4rem}.profile .avatar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.profile .avatar img{display:block;width:2rem;height:2rem;border-radius:100%;margin-bottom:.133333rem}.profile .avatar span{font-size:.4rem;margin-bottom:.133333rem}.profile .avatar p{font-size:.293333rem}.mylist{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;background-color:#fff;border-top:1px solid #ccc}.mylist a{display:block;color:#666}.mylist dl{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;height:1.333333rem;padding:0 .466667rem;border-bottom:1px solid #ccc}.mylist dl,.mylist dl dt{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.mylist dl dt{font-size:.4rem}.mylist dl dt img{width:.466667rem;height:.466667rem;display:block;margin-right:.2rem}.mylist dl dd .ico-arrow{display:block;background:url(../images/965c961d.ico-arrow.png) no-repeat;background-size:100%;width:.253333rem;height:.413333rem}
 
+/*# sourceMappingURL=my.css.map?v=76e6ae63*/

+ 1 - 0
kissy/haili/css/my.css.map
View File 

@@ -0,0 +1 @@
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/my.css?v=76e6ae63","sourceRoot":""}

+ 1 - 1
kissy/haili/css/prizelist.css
View File 

@@ -1,2 +1,2 @@
 
 .prizelist{margin-bottom:1.733333rem}.prizelist h2{text-align:center;font-size:.453333rem;line-height:1.653333rem}.prizelist dl{width:9.2rem;margin:0 auto .4rem;display:-webkit-box;display:-ms-flexbox;display:flex;background-color:#fff;border-radius:.1rem;border:1px solid #ccc;padding:.266667rem;box-sizing:border-box;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.prizelist dl dt{width:2.133333rem;height:2.133333rem;margin-right:.4rem}.prizelist dl dt img{display:block;width:100%}.prizelist dl dd{height:2.133333rem;-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:distribute;justify-content:space-around}.prizelist dl dd p{font-size:.346667rem;color:#000}.prizelist dl dd a,.prizelist dl dd span{font-size:.293333rem}.prizelist dl dd a.disable,.prizelist dl dd span.disable{color:#999}.prizelist dl dd a{color:#4194f0;text-decoration:underline}.prizelist dl dd a.red{color:#fc7876}
 
-/*# sourceMappingURL=prizelist.css.map?v=9fd91ad7*/
 
+/*# sourceMappingURL=prizelist.css.map?v=76e6ae63*/

+ 1 - 1
kissy/haili/css/prizelist.css.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/prizelist.css?v=9fd91ad7","sourceRoot":""}
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/prizelist.css?v=76e6ae63","sourceRoot":""}

+ 2 - 0
kissy/haili/css/setting.css
View File 

@@ -0,0 +1,2 @@
 
+.applycont{background-color:#fff;box-shadow:0 0 5px rgba(8,1,3,.08);padding:.466667rem 0;margin-bottom:.4rem}.applycont h2{margin:0 auto .4rem;width:4.706667rem;text-align:center;border-bottom:.053333rem solid #000;font-size:.373333rem;line-height:.773333rem}.applycont input,.applycont select,.applycont textarea{padding:.44rem;box-sizing:border-box;display:block;margin:.36rem auto 0;width:8.133333rem;font-size:.32rem;border:1px solid #d6d6d6;border-radius:0;background-color:#fff;color:#666;-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text;background-color:#fbfbfd}.applycont textarea{height:3.16rem}.applycont .button-wrapper{padding:.666667rem 0 .933333rem}.applycont .summary{padding:0 .906667rem}.applycont .summary p{font-size:.32rem;line-height:.48rem;margin-bottom:.48rem}
 
+/*# sourceMappingURL=setting.css.map?v=76e6ae63*/

+ 1 - 0
kissy/haili/css/setting.css.map
View File 

@@ -0,0 +1 @@
 
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/setting.css?v=76e6ae63","sourceRoot":""}

BIN
kissy/haili/images/6445340f.ico-gift.png
View File


BIN
kissy/haili/images/965c961d.ico-arrow.png
View File


BIN
kissy/haili/images/cf37e41f.ico-star.png
View File


BIN
kissy/haili/images/d205afc3.ico-setting.png
View File


BIN
kissy/haili/images/e4d6c691.prbg.jpg
View File


BIN
kissy/haili/images/f96cf6ce.btn-back.png
View File


+ 2 - 2
kissy/haili/js/active.js
View File 

@@ -1,2 +1,2 @@
 
-webpackJsonp([2],{0:function(t,s,n){"use strict";n(16),n(7)},16:function(t,s){},24:function(t,s,n){t.exports=n(0)},7:function(t,s,n){"use strict";$(".tabs").on("click","li a",function(){var t=$(this).attr("href");return $(this).parent().addClass("cur").siblings().removeClass("cur"),$(t).show().siblings(".tabcont").hide(),!1})}},[24]);
 
-//# sourceMappingURL=active.js.map?v=4c79619c
 
+webpackJsonp([2],{0:function(t,s,n){"use strict";n(18),n(9)},18:function(t,s){},28:function(t,s,n){t.exports=n(0)},9:function(t,s,n){"use strict";$(".tabs").on("click","li a",function(){var t=$(this).attr("href");return $(this).parent().addClass("cur").siblings().removeClass("cur"),$(t).show().siblings(".tabcont").hide(),!1})}},[28]);
 
+//# sourceMappingURL=active.js.map?v=76e6ae63

+ 1 - 1
kissy/haili/js/active.js.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":["webpack:///js/active.js","webpack:///./mobile/src/router/active.js","webpack:///./mobile/src/js/active.js"],"names":["webpackJsonp","0","module","exports","__webpack_require__","16","24","7","$","on","tabid","this","attr","parent","addClass","siblings","removeClass","show","hide"],"mappings":"AAAAA,cAAc,IAERC,EACA,SAAUC,EAAQC,EAASC,GAEjC,YCLAA,GAAA,IACAA,EAAA,IDaMC,GACA,SAAUH,EAAQC,KAMlBG,GACA,SAAUJ,EAAQC,EAASC,GAEjCF,EAAOC,QAAUC,EAAoB,IAK/BG,EACA,SAAUL,EAAQC,EAASC,GAEjC,YEhCAI,GAAE,SAASC,GAAG,QAAQ,OAAO,WAC5B,GAAIC,GAAQF,EAAEG,MAAMC,KAAK,OAGzB,OAFAJ,GAAEG,MAAME,SAASC,SAAS,OAAOC,WAAWC,YAAY,OACxDR,EAAEE,GAAOO,OAAOF,SAAS,YAAYG,QAC9B,OFwCL","file":"js/active.js?v=4c79619c","sourcesContent":["webpackJsonp([2],{\n\n/***/ 0:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(16);\n\n__webpack_require__(7);\n\n/***/ }),\n\n/***/ 16:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 24:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(0);\n\n\n/***/ }),\n\n/***/ 7:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n$('.tabs').on('click', 'li a', function () {\n\tvar tabid = $(this).attr('href');\n\t$(this).parent().addClass('cur').siblings().removeClass('cur');\n\t$(tabid).show().siblings('.tabcont').hide();\n\treturn false;\n});\n\n/***/ })\n\n},[24]);\n\n\n// WEBPACK FOOTER //\n// js/active.js?v=4c79619c","import '../css/active.css';\nimport '../js/active';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/active.js","$('.tabs').on('click','li a',function(){\n\tlet tabid = $(this).attr('href');\n\t$(this).parent().addClass('cur').siblings().removeClass('cur');\n\t$(tabid).show().siblings('.tabcont').hide();\n\treturn false;\n})\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/js/active.js"],"sourceRoot":""}
 
+{"version":3,"sources":["webpack:///js/active.js","webpack:///./mobile/src/router/active.js","webpack:///./mobile/src/js/active.js"],"names":["webpackJsonp","0","module","exports","__webpack_require__","18","28","9","$","on","tabid","this","attr","parent","addClass","siblings","removeClass","show","hide"],"mappings":"AAAAA,cAAc,IAERC,EACA,SAAUC,EAAQC,EAASC,GAEjC,YCLAA,GAAA,IACAA,EAAA,IDaMC,GACA,SAAUH,EAAQC,KAMlBG,GACA,SAAUJ,EAAQC,EAASC,GAEjCF,EAAOC,QAAUC,EAAoB,IAK/BG,EACA,SAAUL,EAAQC,EAASC,GAEjC,YEhCAI,GAAE,SAASC,GAAG,QAAQ,OAAO,WAC5B,GAAIC,GAAQF,EAAEG,MAAMC,KAAK,OAGzB,OAFAJ,GAAEG,MAAME,SAASC,SAAS,OAAOC,WAAWC,YAAY,OACxDR,EAAEE,GAAOO,OAAOF,SAAS,YAAYG,QAC9B,OFwCL","file":"js/active.js?v=76e6ae63","sourcesContent":["webpackJsonp([2],{\n\n/***/ 0:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(18);\n\n__webpack_require__(9);\n\n/***/ }),\n\n/***/ 18:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 28:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(0);\n\n\n/***/ }),\n\n/***/ 9:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n$('.tabs').on('click', 'li a', function () {\n\tvar tabid = $(this).attr('href');\n\t$(this).parent().addClass('cur').siblings().removeClass('cur');\n\t$(tabid).show().siblings('.tabcont').hide();\n\treturn false;\n});\n\n/***/ })\n\n},[28]);\n\n\n// WEBPACK FOOTER //\n// js/active.js?v=76e6ae63","import '../css/active.css';\nimport '../js/active';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/active.js","$('.tabs').on('click','li a',function(){\n\tlet tabid = $(this).attr('href');\n\t$(this).parent().addClass('cur').siblings().removeClass('cur');\n\t$(tabid).show().siblings('.tabcont').hide();\n\treturn false;\n})\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/js/active.js"],"sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/comment.js


File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/comment.js.map


+ 2 - 2
kissy/haili/js/detail.js
View File 

@@ -1,2 +1,2 @@
 
-webpackJsonp([4],{19:function(n,t){},2:function(n,t,c){"use strict";c(19)},26:function(n,t,c){n.exports=c(2)}},[26]);
 
-//# sourceMappingURL=detail.js.map?v=4c79619c
 
+webpackJsonp([6],{2:function(n,t,c){"use strict";c(21)},21:function(n,t){},30:function(n,t,c){n.exports=c(2)}},[30]);
 
+//# sourceMappingURL=detail.js.map?v=76e6ae63

+ 1 - 1
kissy/haili/js/detail.js.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":["webpack:///js/detail.js","webpack:///./mobile/src/router/detail.js"],"names":["webpackJsonp","19","module","exports","2","__webpack_require__","26"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,KAMlBC,EACA,SAAUF,EAAQC,EAASE,GAEjC,YCZAA,GAAA,KDmBMC,GACA,SAAUJ,EAAQC,EAASE,GAEjCH,EAAOC,QAAUE,EAAoB,MAKlC","file":"js/detail.js?v=4c79619c","sourcesContent":["webpackJsonp([4],{\n\n/***/ 19:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 2:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(19);\n\n/***/ }),\n\n/***/ 26:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(2);\n\n\n/***/ })\n\n},[26]);\n\n\n// WEBPACK FOOTER //\n// js/detail.js?v=4c79619c","import '../css/detail.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/detail.js"],"sourceRoot":""}
 
+{"version":3,"sources":["webpack:///js/detail.js","webpack:///./mobile/src/router/detail.js"],"names":["webpackJsonp","2","module","exports","__webpack_require__","21","30"],"mappings":"AAAAA,cAAc,IAERC,EACA,SAAUC,EAAQC,EAASC,GAEjC,YCLAA,GAAA,KDYMC,GACA,SAAUH,EAAQC,KAMlBG,GACA,SAAUJ,EAAQC,EAASC,GAEjCF,EAAOC,QAAUC,EAAoB,MAKlC","file":"js/detail.js?v=76e6ae63","sourcesContent":["webpackJsonp([6],{\n\n/***/ 2:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(21);\n\n/***/ }),\n\n/***/ 21:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 30:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(2);\n\n\n/***/ })\n\n},[30]);\n\n\n// WEBPACK FOOTER //\n// js/detail.js?v=76e6ae63","import '../css/detail.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/detail.js"],"sourceRoot":""}

File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/global.js


File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/global.js.map


File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/index.js


File diff suppressed because it is too large
+ 0 - 0
kissy/haili/js/index.js.map


+ 2 - 2
kissy/haili/js/list.js
View File 

@@ -1,2 +1,2 @@
 
-webpackJsonp([5],{29:function(n,t,c){n.exports=c(5)},5:function(n,t,c){"use strict"}},[29]);
 
-//# sourceMappingURL=list.js.map?v=4c79619c
 
+webpackJsonp([7],{33:function(n,t,c){n.exports=c(5)},5:function(n,t,c){"use strict"}},[33]);
 
+//# sourceMappingURL=list.js.map?v=76e6ae63

+ 1 - 1
kissy/haili/js/list.js.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":["webpack:///js/list.js"],"names":["webpackJsonp","29","module","exports","__webpack_require__","5"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,EAASC,GAEjCF,EAAOC,QAAUC,EAAoB,IAK/BC,EACA,SAAUH,EAAQC,EAASC,GAEjC,gBAKG","file":"js/list.js?v=4c79619c","sourcesContent":["webpackJsonp([5],{\n\n/***/ 29:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(5);\n\n\n/***/ }),\n\n/***/ 5:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n/***/ })\n\n},[29]);\n\n\n// WEBPACK FOOTER //\n// js/list.js?v=4c79619c"],"sourceRoot":""}
 
+{"version":3,"sources":["webpack:///js/list.js"],"names":["webpackJsonp","33","module","exports","__webpack_require__","5"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,EAASC,GAEjCF,EAAOC,QAAUC,EAAoB,IAK/BC,EACA,SAAUH,EAAQC,EAASC,GAEjC,gBAKG","file":"js/list.js?v=76e6ae63","sourcesContent":["webpackJsonp([7],{\n\n/***/ 33:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(5);\n\n\n/***/ }),\n\n/***/ 5:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n/***/ })\n\n},[33]);\n\n\n// WEBPACK FOOTER //\n// js/list.js?v=76e6ae63"],"sourceRoot":""}

+ 2 - 0
kissy/haili/js/my.js
View File 

@@ -0,0 +1,2 @@
 
+webpackJsonp([5],{23:function(n,t){},34:function(n,t,c){n.exports=c(6)},6:function(n,t,c){"use strict";c(23)}},[34]);
 
+//# sourceMappingURL=my.js.map?v=76e6ae63

+ 1 - 0
kissy/haili/js/my.js.map
View File 

@@ -0,0 +1 @@
 
+{"version":3,"sources":["webpack:///js/my.js","webpack:///./mobile/src/router/my.js"],"names":["webpackJsonp","23","module","exports","34","__webpack_require__","6"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,KAMlBC,GACA,SAAUF,EAAQC,EAASE,GAEjCH,EAAOC,QAAUE,EAAoB,IAK/BC,EACA,SAAUJ,EAAQC,EAASE,GAEjC,YCpBAA,GAAA,OD2BG","file":"js/my.js?v=76e6ae63","sourcesContent":["webpackJsonp([5],{\n\n/***/ 23:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 34:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(6);\n\n\n/***/ }),\n\n/***/ 6:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(23);\n\n/***/ })\n\n},[34]);\n\n\n// WEBPACK FOOTER //\n// js/my.js?v=76e6ae63","import '../css/my.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/my.js"],"sourceRoot":""}

+ 2 - 2
kissy/haili/js/prizelist.js
View File 

@@ -1,2 +1,2 @@
 
-webpackJsonp([3],{21:function(n,t){},30:function(n,t,c){n.exports=c(6)},6:function(n,t,c){"use strict";c(21)}},[30]);
 
-//# sourceMappingURL=prizelist.js.map?v=4c79619c
 
+webpackJsonp([4],{24:function(n,t){},35:function(n,t,c){n.exports=c(7)},7:function(n,t,c){"use strict";c(24)}},[35]);
 
+//# sourceMappingURL=prizelist.js.map?v=76e6ae63

+ 1 - 1
kissy/haili/js/prizelist.js.map
View File 

@@ -1 +1 @@
 
-{"version":3,"sources":["webpack:///js/prizelist.js","webpack:///./mobile/src/router/prizelist.js"],"names":["webpackJsonp","21","module","exports","30","__webpack_require__","6"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,KAMlBC,GACA,SAAUF,EAAQC,EAASE,GAEjCH,EAAOC,QAAUE,EAAoB,IAK/BC,EACA,SAAUJ,EAAQC,EAASE,GAEjC,YCpBAA,GAAA,OD2BG","file":"js/prizelist.js?v=4c79619c","sourcesContent":["webpackJsonp([3],{\n\n/***/ 21:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 30:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(6);\n\n\n/***/ }),\n\n/***/ 6:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(21);\n\n/***/ })\n\n},[30]);\n\n\n// WEBPACK FOOTER //\n// js/prizelist.js?v=4c79619c","import '../css/prizelist.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/prizelist.js"],"sourceRoot":""}
 
+{"version":3,"sources":["webpack:///js/prizelist.js","webpack:///./mobile/src/router/prizelist.js"],"names":["webpackJsonp","24","module","exports","35","__webpack_require__","7"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,KAMlBC,GACA,SAAUF,EAAQC,EAASE,GAEjCH,EAAOC,QAAUE,EAAoB,IAK/BC,EACA,SAAUJ,EAAQC,EAASE,GAEjC,YCpBAA,GAAA,OD2BG","file":"js/prizelist.js?v=76e6ae63","sourcesContent":["webpackJsonp([4],{\n\n/***/ 24:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 35:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(7);\n\n\n/***/ }),\n\n/***/ 7:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(24);\n\n/***/ })\n\n},[35]);\n\n\n// WEBPACK FOOTER //\n// js/prizelist.js?v=76e6ae63","import '../css/prizelist.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/prizelist.js"],"sourceRoot":""}

+ 2 - 0
kissy/haili/js/setting.js
View File 

@@ -0,0 +1,2 @@
 
+webpackJsonp([3],{25:function(n,t){},36:function(n,t,c){n.exports=c(8)},8:function(n,t,c){"use strict";c(25)}},[36]);
 
+//# sourceMappingURL=setting.js.map?v=76e6ae63

+ 1 - 0
kissy/haili/js/setting.js.map
View File 

@@ -0,0 +1 @@
 
+{"version":3,"sources":["webpack:///js/setting.js","webpack:///./mobile/src/router/setting.js"],"names":["webpackJsonp","25","module","exports","36","__webpack_require__","8"],"mappings":"AAAAA,cAAc,IAERC,GACA,SAAUC,EAAQC,KAMlBC,GACA,SAAUF,EAAQC,EAASE,GAEjCH,EAAOC,QAAUE,EAAoB,IAK/BC,EACA,SAAUJ,EAAQC,EAASE,GAEjC,YCpBAA,GAAA,OD2BG","file":"js/setting.js?v=76e6ae63","sourcesContent":["webpackJsonp([3],{\n\n/***/ 25:\n/***/ (function(module, exports) {\n\n// removed by extract-text-webpack-plugin\n\n/***/ }),\n\n/***/ 36:\n/***/ (function(module, exports, __webpack_require__) {\n\nmodule.exports = __webpack_require__(8);\n\n\n/***/ }),\n\n/***/ 8:\n/***/ (function(module, exports, __webpack_require__) {\n\n\"use strict\";\n\n\n__webpack_require__(25);\n\n/***/ })\n\n},[36]);\n\n\n// WEBPACK FOOTER //\n// js/setting.js?v=76e6ae63","import '../css/setting.css';\n\n\n\n// WEBPACK FOOTER //\n// ./mobile/src/router/setting.js"],"sourceRoot":""}

+ 46 - 0
kissy/haili/my.html
View File 

@@ -0,0 +1,46 @@
 
+<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
 
+    <meta content="yes" name="apple-mobile-web-app-capable">
 
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
 
+    <meta content="telephone=no" name="format-detection">
 
+    <title>首页</title>
 
+    <meta name="Keywords" content="" />
 
+    <meta name="Description" content="" />
 
+<link href="css/global.css?v=76e6ae63" rel="stylesheet"><link href="css/my.css?v=76e6ae63" rel="stylesheet"></head>
 
+
 
+<body>
 
+    <header>海狸福利社</header>
 
+    <section class="profile">
 
+        <section class="avatar">
 
+            <img src="images/8db3cefb.tmp5.jpg">
 
+            <span>毛球球球</span>
 
+            <p>助力值：1244</p>
 
+        </section>
 
+    </section>
 
+    <section class="mylist">
 
+        <a href="#">
 
+            <dl>
 
+                <dt><img src="images/6445340f.ico-gift.png" />我参与的活动</dt>
 
+                <dd><em class="ico-arrow"></em></dd>
 
+            </dl>
 
+        </a>
 
+        <a href="#">
 
+            <dl>
 
+                <dt><img src="images/cf37e41f.ico-star.png" />我的奖品</dt>
 
+                <dd><em class="ico-arrow"></em></dd>
 
+            </dl>
 
+        </a>
 
+        <a href="#">
 
+            <dl>
 
+                <dt><img src="images/d205afc3.ico-setting.png" />资料设置</dt>
 
+                <dd><em class="ico-arrow"></em></dd>
 
+            </dl>
 
+        </a>
 
+    </section>
 
+<script type="text/javascript" src="js/global.js?v=76e6ae63"></script><script type="text/javascript" src="js/my.js?v=76e6ae63"></script></body>
 
+
 
+</html>

+ 34 - 0
kissy/haili/setting.html
View File 

@@ -0,0 +1,34 @@
 
+<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
 
+    <meta content="yes" name="apple-mobile-web-app-capable">
 
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
 
+    <meta content="telephone=no" name="format-detection">
 
+    <title>首页</title>
 
+    <meta name="Keywords" content="" />
 
+    <meta name="Description" content="" />
 
+<link href="css/global.css?v=76e6ae63" rel="stylesheet"><link href="css/setting.css?v=76e6ae63" rel="stylesheet"></head>
 
+
 
+<body>
 
+    <header><a href="javascript:history.go(-1)" class="back"></a>资料设置</header>
 
+    <section class="applycont">
 
+        <form>
 
+            <input type="text" placeholder="真实姓名" name="">
 
+            <select>
 
+                <option>性别</option>
 
+                <option>男</option>
 
+                <option>女</option>
 
+            </select>
 
+            <input type="text" placeholder="手机号" name="">
 
+            <textarea placeholder="通信地址" name=""></textarea>
 
+            <section class="button-wrapper">
 
+                <a class="button">保存</a>
 
+            </section>
 
+        </form>
 
+    </section>
 
+<script type="text/javascript" src="js/global.js?v=76e6ae63"></script><script type="text/javascript" src="js/setting.js?v=76e6ae63"></script></body>
 
+
 
+</html>

+ 3 - 0
tm/lib/Controller/Admin/Activity/SetPage.class.php
View File 

@@ -165,6 +165,7 @@ class SetPage extends Controller {
 
 		$info = array();
 
 		$info['yaoqing'] = Request::p('yaoqing', null); //
 
 		$info['base_num'] = Request::p('base_num', null); //
 
+		$info['zhuli_num'] = Request::p('zhuli_num', null); //
 
 		$info['events_tips'] =  Request::p('events_tips', null);
 
 		$info['events_hd_tips'] = Request::p('events_hd_tips', null); //互动提示语
 
 		$info['share_button'] = Request::p('share_button', null); //是否显示分享按钮
 
@@ -181,6 +182,8 @@ class SetPage extends Controller {
 
 		$info['column_tag_2'] = Request::p('column_tag_2', null);
 
 		$info['is_column_tag_3'] = Request::p('is_column_tag_3', null);
 
 		$info['column_tag_3'] = Request::p('column_tag_3', null);
 
+		$info['is_column_tag_4'] = Request::p('is_column_tag_4', null);
 
+		$info['column_tag_4'] = Request::p('column_tag_4', null);
 
 
 
 		$info['events_rules'] =  Request::p('events_rules', null);

+ 3 - 4
tm/lib/Controller/Admin/Activity/UserHelp.class.php
View File 

@@ -76,8 +76,7 @@ class UserHelp  extends Controller {
 
 
 		$total_num = $this->objLotteryUserHelp->totals ( $condition );
 
 
-		$ids = $this->objLotteryUserHelp->findIdsBy ( $condition, $limit, $order );
 
-		$helpData = $this->objLotteryUserHelp->gets ( $ids );
 
+		$helpData = $this->objLotteryUserHelp->fetchAll ($condition, $limit, $order );
 
 
 		// 分页
 
 
@@ -153,8 +152,8 @@ class UserHelp  extends Controller {
 
 		$condition = array (
 
 				'events_id' => $events_id
 
 		);
 
-		$ids = $this->objLotteryUserHelp->findIdsBy ( $condition);
 
-		$allData = $this->objLotteryUserHelp->gets ( $ids );
 
+		$order = ' num desc, id desc';
 
+		$helpData = $this->objLotteryUserHelp->fetchAll ($condition, 10000, $order );
 
 		
 		$uids = array ();
 
 		foreach ( $allData as $key => $data ) {

+ 11 - 1
tm/lib/Controller/Admin/Controller.class.php
View File 

@@ -279,7 +279,17 @@ class Controller extends \KIF\Core\PermissionController {
 
 				$thisPlatFormUrlData[$id]['name'] = $platform['name'];
 
 				$url = $objLottery->getEventsUrl($eventsData['type'],$eventsData['create_time'],$platform['url']);
 
 				$thisPlatFormUrlData[$id]['url'] =  $url;
 
-			    $thisPlatFormUrlData[$id]['pv'] = $objDLotteryDeliveryChannels->getDefaultEventOnePV(Request::schemeDomain(),$events_id,$id);
 
+				$t = $objDLotteryDeliveryChannels->getDefaultEventOnePV(Request::schemeDomain(),$events_id,$id);
 
+				if (strstr($t, '||')) {
 
+					$temp = explode('||', $t);
 
+					$pv = $temp[0];
 
+					$time = $temp[1];
 
+				} else {
 
+					$pv = $t;
 
+					$time = false;
 
+				}
 
+				$thisPlatFormUrlData[$id]['time'] = $time;
 
+			    $thisPlatFormUrlData[$id]['pv'] = $pv;
 
 				$thisPlatFormUrlData[$id]['img'] = $this->getImgCodePath($thisPlatFormUrlData[$id]['url']);
 
 			}
 
 		}

+ 42 - 1
tm/lib/Controller/EventsController.class.php
View File 

@@ -57,6 +57,8 @@ class EventsController extends Controller {
 
 		$this->setOutput ( 'listUrl', Request::schemeDomain () . '/list/' . $platform ['url'] );
 
 		// 我的礼品URL
 
 		$this->setOutput ( 'giftsUrl', Request::schemeDomain () . '/list/' . $platform ['url'] . '/member/gifts' );
 
+
 
+		$this->setOutput ( 'memberUrl', Request::schemeDomain () . '/list/' . $platform ['url'] . '/member/' );
 
 	}
 
 	
 	/**
 
@@ -243,6 +245,9 @@ class EventsController extends Controller {
 
 		} elseif ($type == 'feedback') {
 
 			# 获得评价信息
 
 			$this->feedback($info, $plat_form_id, 10, false);
 
+		} elseif ($type == 'help') {
 
+			# 获得助力排行
 
+			$this->help($info, $plat_form_id, 10, false);
 
 		}
 
 
 		$this->setOutput('type', $type);
 
@@ -315,6 +320,37 @@ class EventsController extends Controller {
 
 		}
 
 	}
 
 
+	public function help($eventsData, $plat_form_id, $limit = 10, $uid = false)
 
+	{
 
+		$objUserHelp = new LotteryUserHelp ();
 
+		$page = Request::varGetInt ( 'page', 1 );
 
+		$size = $limit;
 
+		$offset = ($page - 1) * $size;
 
+		$limit = "{$offset},{$size}";
 
+		$order = ' num desc, id desc';
 
+
 
+		$condition = array (
 
+				'events_id' => $eventsData['id'],
 
+		);
 
+		$data = $objUserHelp->fetchAll ( $condition, $limit, $order );
 
+		$total_num = $objUserHelp->totals ( $condition );
 
+
 
+		$uids = array();
 
+		if ($data) {
 
+			foreach ($data as $k => $v) {
 
+				$uids[] = $v['uid'];
 
+				$data[$k]['num'] = $v['num'] + $eventsData['zhuli_num'];
 
+			}
 
+			# 通过UIDs 获取用户信息
 
+			$objMUser = new User();
 
+			$users = $objMUser -> gets($uids);
 
+			$this->setOutput('userData', $users);
 
+		}
 
+
 
+		$this->setOutput('helpData', $data);
 
+		$this->setOutput('helpDataTotals', $total_num);
 
+	}
 
+
 
 	public function feedback($eventsData, $plat_form_id, $limit = 10, $uid = false)
 
 	{
 
 		$objFeedBack = new LotteryUserFeedback ();
 
@@ -467,7 +503,12 @@ class EventsController extends Controller {
 
 			} elseif (isset($newUserExpData[$v['uid']]['phone']) && $newUserExpData[$v['uid']]['phone']) {
 
 				$data[$k]['user']['mobile'] = substr_replace($newUserExpData[$v['uid']]['phone'],'****',3,4);
 
 			} else {
 
-				unset($data[$k]);
 
+				//unset($data[$k]);
 
+				$data[$k]['user']['mobile'] = $data[$k]['user']['nickname'];
 
+			}
 
+
 
+			if (!$data[$k]['user']['mobile']) {
 
+				$data[$k]['user']['mobile'] = '游客';
 
 			}
 
 		}

+ 1 - 1
tm/lib/Controller/EventsTry.class.php
View File 

@@ -38,7 +38,7 @@ class EventsTry extends EventsController {
 
 		
 		# 检查是否移动端
 
 		$title = $tryInfo['weixinShare']['title'] ? $tryInfo['weixinShare']['title'] : $tryInfo['events_name'];
 
-		$this->checkIsFromMobile($title);
 
+		//$this->checkIsFromMobile($title);

+ 8 - 1
tm/lib/Controller/Express.class.php
View File 

@@ -89,6 +89,12 @@ class Express extends EventsController {
 
 		if (!$address) {
 
 			self::ajax_fail_exit('请填写收货地址');
 
 		}
 
+
 
+		$sex = Request::g('sex');
 
+
 
+		if (!$sex) {
 
+			$sex = 1;
 
+		}
 
 		
 		# 获取用户信息
 
 		$objUserData = new UserInfo();
 
@@ -112,7 +118,8 @@ class Express extends EventsController {
 
 			'uid' => $uid,
 
 			'user_name' => $realname,
 
 			'phone' => $phone,
 
-			'address' => $address
 
+			'address' => $address,
 
+			'sex' => $sex,
 
 		);
 
 		
 		$objDLotteryUserExpress -> add($info,AbstractDao::PARAM_CREATE_ACTION_REPLACE);

+ 229 - 0
tm/lib/Controller/Member.class.php
View File 

@@ -8,6 +8,12 @@ use KIF\Core\Request;
 
 use Cas\Module\Lottery;
 
 use Cas\Dao\UserInfo;
 
 use Cas\Dao\LotteryUserFeedback;
 
+use Cas\Dao\ArticleLikeCounter;
 
+use Cas\Dao\LotteryUserHelp;
 
+use Cas\Module\LotteryLog;
 
+use Cas\Dao\LotteryUserExpress;
 
+
 
+
 
 /**
 
  * 
  * 用户资料设置
 
@@ -19,6 +25,219 @@ class Member extends EventsController {
 
 		
 	}
 
 	
+	/**
 
+	 * 我的首页
 
+	 */
 
+	public function doMy() {
 
+
 
+		# 获取当前用户的信息
 
+		$objUserData = new UserInfo();
 
+		$uid = $this->getRunTimeUid();
 
+		$userData = $objUserData -> get($uid);
 
+		$this->setOutput('userData', $userData);
 
+		$thisTime = time();
 
+
 
+		# 获取登录地址
 
+		$url = Request::g('url');
 
+		$thisUrl = Request::schemeDomain().'/member/my';
 
+		$loginUrl = $this -> getLoginUrl($thisUrl);
 
+		$this->setOutput('loginUrl', $loginUrl);
 
+		
+		# 判断是否需要登录
 
+		$ckLogin = $this->ckLogin();
 
+		$this->setOutput('ckLogin', $ckLogin);
 
+
 
+
 
+		# 获取我的助力值
 
+		$condition = array (
 
+			'events_id' => $events_id,
 
+			'uid' => $uid,
 
+		);
 
+		$objLotteryUserHelp = new LotteryUserHelp();
 
+		$info = $objLotteryUserHelp->fetchAll ( $condition, 10000, 'id desc' );
 
+		$num = 0;
 
+		if ($info) {
 
+			foreach ($info as $k => $v) {
 
+				$num += $v['num'];
 
+			}
 
+		}
 
+
 
+		$this->tpl = 'my';
 
+		$this->setOutput('thisTime', $thisTime);
 
+		$this->setOutput('title', '我的');
 
+		$this->setOutput('num', $num);
 
+		$this->setOutput('action', 'gift');
 
+		$this->setOutput('display', 1);
 
+		$this->setOutput('notShowWeixinShare', true);
 
+	}
 
+
 
+	/**
 
+	 * 资料设置
 
+	 */
 
+	public function doSet() {
 
+
 
+		# 获取当前用户的信息
 
+		$objUserData = new UserInfo();
 
+		$uid = $this->getRunTimeUid();
 
+		$userData = $objUserData -> get($uid);
 
+		$this->setOutput('userData', $userData);
 
+		$thisTime = time();
 
+
 
+		# 获取登录地址
 
+		$url = Request::g('url');
 
+		$thisUrl = Request::schemeDomain().'/member/set';
 
+		$loginUrl = $this -> getLoginUrl($thisUrl);
 
+		$this->setOutput('loginUrl', $loginUrl);
 
+		
+		# 判断是否需要登录
 
+		$ckLogin = $this->ckLogin();
 
+		$this->setOutput('ckLogin', $ckLogin);
 
+
 
+		# 获取用户最新收货地址
 
+		$objDLotteryUserExpress = new LotteryUserExpress();
 
+		
+		$userExpress = $objDLotteryUserExpress -> getUserExpress($uid);
 
+
 
+
 
+		# 获取我的资料
 
+
 
+		$this->tpl = 'my_set';
 
+		$this->setOutput('thisTime', $thisTime);
 
+		$this->setOutput('title', '我的资料');
 
+		$this->setOutput('my', $userExpress);
 
+		$this->setOutput('action', 'gift');
 
+		$this->setOutput('display', 1);
 
+		$this->setOutput('notShowWeixinShare', true);
 
+	}
 
+
 
+	/**
 
+	 * 我参与的活动
 
+	 */
 
+	public function doAct() {
 
+
 
+		# 获取当前用户的信息
 
+		$objUserData = new UserInfo();
 
+		$uid = $this->getRunTimeUid();
 
+		$userData = $objUserData -> get($uid);
 
+		$this->setOutput('userData', $userData);
 
+		$thisTime = time();
 
+
 
+		# 获取登录地址
 
+		$url = Request::g('url');
 
+		$thisUrl = Request::schemeDomain().'/member/act';
 
+		$loginUrl = $this -> getLoginUrl($thisUrl);
 
+		$this->setOutput('loginUrl', $loginUrl);
 
+		
+		# 判断是否需要登录
 
+		$ckLogin = $this->ckLogin();
 
+		$this->setOutput('ckLogin', $ckLogin);
 
+
 
+		$plat_form_id = $this->getPlatFormId();
 
+		$objLottery = new Lottery();
 
+		# 根据uid，得到参与的活动
 
+		$condition = array('uid' => $uid);
 
+		$totals = $objLottery -> getLotteryDataListNum($condition);
 
+		$offset = 0;
 
+		$size = 10;
 
+		
+		$data = $objLottery->getLotteryDataList($condition,  "{$offset},{$size}", 'create_time desc');
 
+		$events_ids = array();
 
+
 
+		foreach($data as $key=> $d) {
 
+			$events_ids[$d['run_time_data']['events']['id']] = $d['run_time_data']['events']['id'];
 
+		}
 
+
 
+		$objDLotteryEvents = new LotteryEvents();
 
+		$eventsData = $objDLotteryEvents -> gets($events_ids);
 
+
 
+		# 剩余天数
 
+		$TIME = time();
 
+		$objArticleLikeCounter = new ArticleLikeCounter();
 
+		foreach ($eventsData as $tmpKey => $tmpData) {
 
+			$rday = ($tmpData['end_time'] - $TIME) / (24 * 60 * 60);
 
+			$eventsData[$tmpKey]['rday'] = ceil($rday);
 
+			# 参与人数
 
+			$objMLotteryLog = new LotteryLog ( null, $tmpData['id'] );
 
+			$eventsData[$tmpKey]['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
 
+
 
+			if ($tmpData['type'] == 9) {
 
+				# 阅读人数
 
+				$eventsData[$tmpKey]['click_num'] = $tmpData['click_num'] + ($tmpData['article_pass_base_num']?$tmpData['click_num'] + $tmpData['article_pass_base_num']:0);
 
+				# 点赞人数
 
+				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
 
+				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
 
+			} else {
 
+				if (isset($tmpData['base_num']) && $tmpData['base_num']) {
 
+					$eventsData[$tmpKey]['user_total'] += $tmpData['base_num'];
 
+				}
 
+			}
 
+		}
 
+		$this->setOutput('eventsData', $eventsData);
 
+		$this->setOutput('title', '我参与的活动');
 
+		$this->setOutput('totals', ceil($totals / $size));
 
+		$this->tpl = 'my_act';
 
+		$this->setOutput('action', 'gift');
 
+		$this->setOutput('plat_form_id', $plat_form_id);
 
+		$this->setOutput('display', 1);
 
+		$this->setOutput('notShowWeixinShare', true);
 
+	}
 
+
 
+	/**
 
+	 * 事件：ajax翻页
 
+	 */
 
+	public function doActAjax() {
 
+		$page = Request::varGetInt('page', 1);
 
+		$thisTime = time();
 
+		$objLottery = new Lottery();
 
+		
+		$uid = $this->getRunTimeUid();
 
+		$condition = array('uid' => $uid);
 
+		
+		$totals = $objLottery -> getLotteryDataListNum($condition);
 
+		$size = 10;
 
+		$offset = ($page - 1) * $size;
 
+		$limit = "{$offset},{$size}";
 
+		$data = $objLottery->getLotteryDataList($condition,  "{$offset},{$size}", 'create_time desc');
 
+		
+		$newData = array();
 
+		$events_ids = array();
 
+		
+		$events_ids = array();
 
+
 
+		foreach($data as $key=> $d) {
 
+			$events_ids[$d['run_time_data']['events']['id']] = $d['run_time_data']['events']['id'];
 
+		}
 
+
 
+		$objDLotteryEvents = new LotteryEvents();
 
+		$eventsData = $objDLotteryEvents -> gets($events_ids);
 
+
 
+		# 剩余天数
 
+		$TIME = time();
 
+		$objArticleLikeCounter = new ArticleLikeCounter();
 
+		foreach ($eventsData as $tmpKey => $tmpData) {
 
+			$rday = ($tmpData['end_time'] - $TIME) / (24 * 60 * 60);
 
+			$eventsData[$tmpKey]['rday'] = ceil($rday);
 
+			# 参与人数
 
+			$objMLotteryLog = new LotteryLog ( null, $tmpData['id'] );
 
+			$eventsData[$tmpKey]['user_total'] = $objMLotteryLog->getUserParticipateLogNumGroupByUid ();
 
+
 
+			if ($tmpData['type'] == 9) {
 
+				# 阅读人数
 
+				$eventsData[$tmpKey]['click_num'] = $tmpData['click_num'] + ($tmpData['article_pass_base_num']?$tmpData['click_num'] + $tmpData['article_pass_base_num']:0);
 
+				# 点赞人数
 
+				$eventsData[$tmpKey]['likes'] = $objArticleLikeCounter->getLikes($tmpData['id']);
 
+				$eventsData[$tmpKey]['likes'] = $eventsData[$tmpKey]['likes'] + $tmpData['article_praise'];
 
+			} else {
 
+				if (isset($tmpData['base_num']) && $tmpData['base_num']) {
 
+					$eventsData[$tmpKey]['user_total'] += $tmpData['base_num'];
 
+				}
 
+			}
 
+		}
 
+		
+		$this->setOutput('eventsData', $eventsData);
 
+		$this->tpl = 'ajax_my_act';
 
+		$this->ajax_success_exit($this->render(true));
 
+	}
 
 
 	
 	/**
 
@@ -36,6 +255,16 @@ class Member extends EventsController {
 
 		$uid = $this->getRunTimeUid();
 
 		$userData = $objUserData -> get($uid);
 
 		$this->setOutput('userData', $userData);
 
+
 
+		# 获取登录地址
 
+		$url = Request::g('url');
 
+		$thisUrl = Request::schemeDomain().'/member/gifts';
 
+		$loginUrl = $this -> getLoginUrl($thisUrl);
 
+		$this->setOutput('loginUrl', $loginUrl);
 
+		
+		# 判断是否需要登录
 
+		$ckLogin = $this->ckLogin();
 
+		$this->setOutput('ckLogin', $ckLogin);
 
 		
 		$condition = array('audit' => 2, 'uid' => $uid,'scratch_receive' => LotteryData::EVENT_SCRATCH_RECEIVE_TRUE);
 
 		$totals = $objLottery -> getLotteryDataListNum($condition);

+ 12 - 2
tm/lib/Dao/LotteryDeliveryChannels.class.php
View File 

@@ -45,10 +45,20 @@ class LotteryDeliveryChannels extends DBAgileDev {
 
 		$key = $schemeDomain.'_'.$events_id.'_'.$platform_id;
 
 		$objMemcached = new Memcached();
 
 		$num = $objMemcached->get($key);
 
+		$time = time();
 
 		if($num){
 
-			$objMemcached->set($key,$num+1);
 
+			if (strstr($num, '||')) {
 
+				$temp = explode('||', $num);
 
+				$num = $temp[0];
 
+				$num = $num + 1;
 
+			} else {
 
+				$num = $num + 1;
 
+			}
 
+
 
+			$value = $num . '||' . $time;
 
+			$objMemcached->set($key,$value);
 
 		}else{
 
-			$objMemcached->set($key,1);
 
+			$objMemcached->set($key,1 . '||' . $time);
 
 		}
 
 	}

+ 1 - 0
tm/lib/Dao/LotteryUserExpress.class.php
View File 

@@ -24,6 +24,7 @@ class LotteryUserExpress extends DBAgileDev {
 
 		'phone',
 
 		'address',
 
 		'user_name',
 
+		'sex',//1为未知，2为男性 3为女性
 
 	);
 
 	
 	/**

+ 3 - 0
tm/template_dir/admin/activity/delivery_channels_list.html
View File 

@@ -55,6 +55,7 @@
 
 								<th>URL</th>
 
 								<th>二维码</th>
 
 								<th>渠道PV</th>
 
+								<th>最新时间</th>
 
 							</tr>
 
 						</thead>
 
 						
@@ -71,6 +72,7 @@
 
 									<img class="popup" alt="<{$qrcode.name}>" src="<{$qrcode.img}>">
 
 								</td>
 
 								<td><{if $qrcode.pv}><{$qrcode.pv}><{else}>0<{/if}></td>
 
+								<td><{if $data.create_time}><{"Y-m-d H:i:s"|date:$data.create_time}><{else}>未知<{/if}></td>
 
 							</tr>
 
 							
 							<{/foreach}>
 
@@ -89,6 +91,7 @@
 
 									<img class="popup" alt="<{$data.str_name}>" src="<{$data.img_url}>">
 
 								</td>
 
 								<td><{$data.pv_num}></td>
 
+								<td><{if $data.time}><{"Y-m-d H:i:s"|date:$data.time}><{else}>未知<{/if}></td>
 
 							</tr>
 
 							<{/foreach}>
 
 						</tbody>

+ 9 - 0
tm/template_dir/admin/activity/setPage_event.html
View File 

@@ -65,6 +65,10 @@
 
 				<input name="is_column_tag_3" type="checkbox" value="1" <{if $eventData.is_column_tag_3 == 1}>checked<{/if}>>
 
 
 				<input name="column_tag_3" class="form-control" style="display:inline;width:150px;" type="text" value="<{if $eventData.column_tag_3}><{$eventData.column_tag_3}><{else}> 试用评价<{/if}>"/>
 
+
 
+				<input name="is_column_tag_4" type="checkbox" value="1" <{if $eventData.is_column_tag_4 == 1}>checked<{/if}>>
 
+
 
+				<input name="column_tag_4" class="form-control" style="display:inline;width:150px;" type="text" value="<{if $eventData.column_tag_4}><{$eventData.column_tag_4}><{else}> 助力排行<{/if}>"/>
 
 			</div>
 
 
 			<div class="form-group">
 
@@ -103,6 +107,11 @@
 
 				<input name="base_num" class="form-control" type="text" style="width:300px;" value="<{$eventData.base_num}>"/>
 
 			</div>
 
 
+			<div class="form-group">
 
+				<label class="control-label rowlabel">助力值基数：</label>
 
+				<input name="zhuli_num" class="form-control" type="text" style="width:300px;" value="<{$eventData.zhuli_num}>"/>
 
+			</div>
 
+
 
 			<div class="form-group">
 
 				<label class="control-label rowlabel">邀请好友助力提示文字：</label>
 
 				<input name="yaoqing" class="form-control" type="text" style="width:300px;" value="<{$eventData.yaoqing}>"/>

+ 3 - 3
tm/template_dir/admin/platform/edit.html
View File 

@@ -92,7 +92,7 @@
 
 		<span class="note">导航关注按钮图片。36*36 PNG 图片</span>
 
 	</div>
 
 	<div class="form-group">
 
-		<label class="control-label rowlabel">“奖品”按钮图片</label>
 
+		<label class="control-label rowlabel">“我的”按钮图片</label>
 
 		<div>
 
 			<img id="gift_image_tag" src="<{$platformData.gift_img_url}>" style="width:30px;" class="img-thumbnail">
 
 			<input id="gift_image_input" name='gift_img_url' type="hidden" value="<{$platformData.gift_img_url}>">
 
@@ -103,8 +103,8 @@
 
 			<input id="gift_image_input_hover" name='gift_img_url_hover' type="hidden" value="<{$platformData.gift_img_url_hover}>">
 
 			<input id="gift_image_upload_hover" type="button" value="选中图片" >
 
 		</div>
 
-		<label class="control-label rowlabel">按钮文字</label><input type="text" class="form-control" name='gift_img_text' value="<{if $platformData.gift_img_text}><{$platformData.gift_img_text}><{else}>奖品<{/if}>">
 
-		<span class="note">导航奖品按钮图片。36*36 PNG 图片</span>
 
+		<label class="control-label rowlabel">按钮文字</label><input type="text" class="form-control" name='gift_img_text' value="<{if $platformData.gift_img_text}><{$platformData.gift_img_text}><{else}>我的<{/if}>">
 
+		<span class="note">导航我的按钮图片。36*36 PNG 图片</span>
 
 	</div>
 
 	<div class="form-group">
 
 		<label class="control-label rowlabel">“分享”按钮图片</label>

+ 4 - 4
tm/template_dir/admin/platform/list.html
View File 

@@ -124,7 +124,7 @@
 
 		<span class="note">导航关注按钮图片。36*36 PNG 图片</span>
 
 	</div>
 
 	<div class="form-group">
 
-		<label class="control-label rowlabel">“奖品”按钮图片</label>
 
+		<label class="control-label rowlabel">“我的”按钮图片</label>
 
 		<div>
 
 			<img id="gift_image_tag" src="http://placehold.it/36&text=36x36" style="width:30px;" class="img-thumbnail">
 
 			<input id="gift_image_input" name='gift_img_url' type="hidden" value="">
 
@@ -135,8 +135,8 @@
 
 			<input id="gift_image_input_hover" name='gift_img_url_hover' type="hidden" value="">
 
 			<input id="gift_image_upload_hover" type="button" value="选中图片" >
 
 		</div>
 
-		<label class="control-label rowlabel">按钮文字</label><input type="text" class="form-control" name='gift_img_text' value="奖品">
 
-		<span class="note">导航奖品按钮图片。36*36 PNG 图片</span>
 
+		<label class="control-label rowlabel">按钮文字</label><input type="text" class="form-control" name='gift_img_text' value="我的">
 
+		<span class="note">导航我的按钮图片。36*36 PNG 图片</span>
 
 	</div>
 
 	<div class="form-group">
 
 		<label class="control-label rowlabel">“分享”按钮图片</label>
 
@@ -236,7 +236,7 @@ KISSY.use('node, io', function (S, Node, IO) {
 
 		}
 
 		var gift_img_url = $("input[name=gift_img_url]").val();
 
 		if (!gift_img_url) {
 
-			alert('请选择“奖品”按钮图片');
 
+			alert('请选择“我的”按钮图片');
 
 			return false;
 
 		}

+ 25 - 3
tm/template_dir/ajax_events.html
View File 

@@ -1,21 +1,43 @@
 
 <{if $type == 'prize'}>
 
 <{if $userEventsData}>
 
 <{foreach from=$userEventsData item=v}>
 
-<li><img src="<{$v.user.headimgurl}>"><span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 获得 <{$v.user.events}>活动奖品。</span></li>
 
+<li><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$v.user.headimgurl}>" width="80" height="80"><span>用户 <{$v.user.mobile}> 在 <{$v.user.cdate}> 获得 <{$v.user.events}> <{$v.user.ext}>。</span></li>
 
 <{/foreach}>
 
 <{/if}>
 
 
+<{elseif $type == 'help'}>
 
+<{if $helpData}>
 
+<section id="tab4" class="tabcont" style="display:block;">
 
+    <section class="zhulilist">
 
+        <ul id="lazyLoad">
 
+            <{foreach from=$helpData item=v}>
 
+            <li>
 
+                <div>
 
+                    <{if $userData[$v.uid].headimgurl}>
 
+                    <img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$userData[$v.uid].headimgurl}>" />
 
+                    <{else}>
 
+                    <img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="http://news.mydrivers.com/Img/20110518/04481549.png" />
 
+                    <{/if}><span><{if $userData[$v.uid].nickname}><{$userData[$v.uid].nickname}><{else}>游客<{/if}></span>
 
+                </div>
 
+                <div><span>助力值<{$v.num}></span></div>
 
+            </li>
 
+            <{/foreach}>
 
+        </ul>
 
+    </section>
 
+</section>
 
+<{/if}>
 
+
 
 <{elseif $type == 'feedback'}>
 
 
 <{if $fdData}>
 
 <{foreach from=$fdData item=v}>
 
 <li>
 
-    <img src="<{$v.user.headimgurl}>">
 
+    <img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$v.user.headimgurl}>">
 
     <div class="dt">
 
         <span><{$v.user.mobile}> 的用户 <{$v.user.cdate}> 评价了 <{$v.user.events}>活动：</span>
 
         <div class="imgs">
 
             <{foreach from=$v.pic item=v1}>
 
-            <img src="<{$v1}>">
 
+            <img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$v1}>">
 
             <{/foreach}>
 
         </div>
 
         <p><{$v.content}></p>

+ 26 - 0
tm/template_dir/ajax_my_act.html
View File 

@@ -0,0 +1,26 @@
 
+

+<{if $eventsData}>

+    <{foreach from=$eventsData item=events}>

+    <dl class="noborder">

+        <dt><a href="<{$events.url}>"><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$events.img_url}>"></a></dt>

+        <dd><h5><{$events.events_name}></h5></dd>

+        <dd>

+        <{if $events.rday>=1}>

+        <span class="time">

+        <em class="icon-time"></em>剩余<{$events.rday}>天</span>

+        <{elseif $events.type != 9}>

+        <span class="time">

+        <em class="icon-time"></em>已结束</span>

+        <{/if}>

+

+        <{if $events.type == 9}>

+        <span>阅读 <{$events.click_num}></span>

+        <span>点赞 <{$events.likes}></span>

+        <{else}>

+        <span>参与<{$events.user_total}>人</span>

+        <{/if}>

+

+        </dd>

+    </dl>

+    <{/foreach}>

+<{/if}>

+ 2 - 0
tm/template_dir/bottom.html
View File 

@@ -5,6 +5,8 @@
 
 <footer>

     <ul>

         <li <{if $action != 'gift'}>class="active"<{/if}>><a href="<{$listUrl}>"><i class="icon"><img src="<{if $action != 'gift'}><{$platform.home_img_url_hover}><{else}><{$platform.home_img_url}><{/if}>"></i><span><{$platform.home_img_text}></span></a></li>

+

+        

         <li <{if $action == 'gift'}>class="active"<{/if}>><a href="<{$giftsUrl}>"><i class="icon"><img src="<{if $action == 'gift'}><{$platform.gift_img_url_hover}><{else}><{$platform.gift_img_url}><{/if}>"></i><span><{$platform.gift_img_text}></span></a></li>

 

         <{if $platform.zs_img_link}>

+ 90 - 2
tm/template_dir/events_infos.html
View File 

@@ -97,7 +97,7 @@ function help()
 
     <section class="userlist">
 
         <ul id="lazyLoad">
 
             <{foreach from=$userEventsData item=v}>
 
-            <li><img src="<{$v.user.headimgurl}>"><span>用户 <{$v.user.mobile}> 在 <{$v.user.cdate}> 获得 <{$v.user.events}> <{$v.user.ext}>。</span></li>
 
+            <li><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$v.user.headimgurl}>" width="80" height="80"><span>用户 <{$v.user.mobile}> 在 <{$v.user.cdate}> 获得 <{$v.user.events}> <{$v.user.ext}>。</span></li>
 
             <{/foreach}>
 
         </ul>
 
     </section>
 
@@ -169,6 +169,94 @@ $(body).addClass("bg_white");
 
 </script>
 
 <{/if}>
 
 
+<{elseif $type == 'help'}>
 
+
 
+<{if $helpData}>
 
+
 
+<section id="tab4" class="tabcont" style="display:block;">
 
+    <section class="zhulilist">
 
+        <ul id="lazyLoad">
 
+            <{foreach from=$helpData item=v}>
 
+            <li>
 
+                <div>
 
+                    <{if $userData[$v.uid].headimgurl}>
 
+                    <img src="<{$userData[$v.uid].headimgurl}>" />
 
+                    <{else}>
 
+                    <img src="http://news.mydrivers.com/Img/20110518/04481549.png" />
 
+                    <{/if}><span><{if $userData[$v.uid].nickname}><{$userData[$v.uid].nickname}><{else}>游客<{/if}></span>
 
+                </div>
 
+                <div><span>助力值<{$v.num}></span></div>
 
+            </li>
 
+            <{/foreach}>
 
+        </ul>
 
+    </section>
 
+</section>
 
+
 
+<div class="clear"></div>
 
+<div class="loading">
 
+    <img
 
+        id="loadPage"
 
+        src="<{$web_cfg.cdn}>/public/static/img/loading.gif"
 
+        data-ks-lazyload="<{$web_cfg.cdn}>/public/static/img/loading.gif"
 
+        data-request-url="<{$info.thisUrl}>/help?ajax=ajax"
 
+        data-page="2"
 
+        data-totals="<{$helpDataTotals}>"
 
+        style="width:0px;"
 
+    />
 
+    
+    <div class="loader-inner ball-pulse">
 
+        <div></div><div></div><div></div><div></div><div></div><div></div>
 
+    </div>
 
+    
+</div>
 
+
 
+<script>
 
+KISSY.use('node, io, gallery/datalazyload/2.0/index', function (S, Node, IO, Datalazyload) {
 
+    var lock = false;
 
+    new Datalazyload({
 
+        load: function(el){
 
+            if (lock) return false;
 
+            lock = true;
 
+            
+            var requesrUrl = $(el).data('request-url');
 
+            var page = Number($(el).data('page'));
 
+            var totals = Number($(el).data('totals'));
 
+            if (!requesrUrl) {
 
+                return false;
 
+            }
 
+            
+            if (page > totals) {
 
+                $('.loading').hide();
 
+                return false;
 
+            }
 
+            
+            IO.get(
 
+                requesrUrl
 
+                , {page: page}
 
+                , function (data) {
 
+                    if (data.ok) {
 
+                        var next_page = page + 1;
 
+                        $('#loadPage').data('page', next_page);
 
+                        $("#lazyLoad").append(data.msg);
 
+                        lock = false;
 
+                        //new Datalazyload();
 
+                        if (next_page > totals) {
 
+                            $('.up_icon').hide();
 
+                        }
 
+                    }
 
+                }
 
+                , 'json'
 
+            );
 
+        }
 
+    });
 
+});
 
+
 
+//有产品列表时添加整体body背景色
 
+$(body).addClass("bg_white");
 
+
 
+</script>
 
+<{/if}>
 
+
 
 <{elseif $type == 'feedback'}>
 
 
 <{if $fdData}>
 
@@ -204,7 +292,7 @@ $(body).addClass("bg_white");
 
         data-ks-lazyload="<{$web_cfg.cdn}>/public/static/img/loading.gif"
 
         data-request-url="<{$info.thisUrl}>/feedback?ajax=ajax"
 
         data-page="2"
 
-        data-totals="<{$totals}>"
 
+        data-totals="<{$fdDataTotals}>"
 
         style="width:0px;"
 
     />

+ 4 - 0
tm/template_dir/events_top.html
View File 

@@ -53,6 +53,10 @@
 
             <{if $info.feedback && $info.is_column_tag_3 == 1}>
 
             <li <{if $type == 'feedback'}>class="cur"<{/if}>><a href="<{$info.thisUrl}>/feedback"><{$info.column_tag_3}></a></li>
 
             <{/if}>
 
+
 
+            <{if $info.type == 4 && $info.is_column_tag_4 == 1}>
 
+            <li <{if $type == 'help'}>class="cur"<{/if}>><a href="<{$info.thisUrl}>/help"><{$info.column_tag_4}></a></li>
 
+            <{/if}>
 
         </ul>
 
     </section>
 
     <{/if}>

+ 39 - 0
tm/template_dir/my.html
View File 

@@ -0,0 +1,39 @@
 
+<{include file="header.html"}>

+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/haili/css/my.css" />

+<!--公用标题居中显示-->

+<{include file="common_header.html"}>

+

+

+<section class="profile">

+    <section class="avatar">

+        <{if $userData.headimgurl}>

+        <img src="<{$userData.headimgurl}>" />

+        <{else}>

+        <img src="http://news.mydrivers.com/Img/20110518/04481549.png" />

+        <{/if}>

+        <span><{if $userData.nickname}><{$userData.nickname}><{else}>游客<{/if}></span>

+        <p>助力值：<{$num}></p>

+    </section>

+</section>

+<section class="mylist">

+    <a href="<{$memberUrl}>act">

+        <dl>

+            <dt><img src="../images/6445340f.ico-gift.png" />我参与的活动</dt>

+            <dd><em class="ico-arrow"></em></dd>

+        </dl>

+    </a>

+    <a href="<{$memberUrl}>gifts">

+        <dl>

+            <dt><img src="../images/cf37e41f.ico-star.png" />我的奖品</dt>

+            <dd><em class="ico-arrow"></em></dd>

+        </dl>

+    </a>

+    <a href="<{$memberUrl}>set">

+        <dl>

+            <dt><img src="../images/d205afc3.ico-setting.png" />资料设置</dt>

+            <dd><em class="ico-arrow"></em></dd>

+        </dl>

+    </a>

+</section>

+

+<{include file="bottom.html"}>

+ 112 - 0
tm/template_dir/my_act.html
View File 

@@ -0,0 +1,112 @@
 
+<{include file="header.html"}>

+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/haili/css/index.css" />

+<style>

+.vogue_top_list img {

+    background: #fff url("<{$web_cfg.cdn}>/public/static/img/m-load.gif") no-repeat scroll 50% center / 20px 20px;

+}

+</style>

+<{include file="common_header.html"}>

+

+<{if $eventsData}>

+<section class="cardlist first-module">

+    <{foreach from=$eventsData item=events}>

+    <dl class="noborder">

+        <dt><a href="<{$events.url}>"><img src="<{$web_cfg.cdn}>/public/static/img/bg_alpha.png" data-ks-lazyload="<{$events.img_url}>"></a></dt>

+        <dd><h5><{$events.events_name}></h5></dd>

+        <dd>

+        <{if $events.rday>=1}>

+        <span class="time">

+        <em class="icon-time"></em>剩余<{$events.rday}>天</span>

+        <{elseif $events.type != 9}>

+        <span class="time">

+        <em class="icon-time"></em>已结束</span>

+        <{/if}>

+

+        <{if $events.type == 9}>

+        <span>阅读 <{$events.click_num}></span>

+        <span>点赞 <{$events.likes}></span>

+        <{else}>

+        <span>参与<{$events.user_total}>人</span>

+        <{/if}>

+

+        </dd>

+    </dl>

+    <{/foreach}>

+</section>

+<{/if}>

+

+<div class="clear"></div>

+<{if $totals}>

+<div class="loading">

+    <img

+        id="loadPage"

+        data-ks-lazyload="<{$web_cfg.cdn}>/public/static/img/loading_new.gif"

+        data-request-url="<{$web_cfg.domain}>/?c=member&a=actajax&plat_form_id=<{$plat_form_id}>&url=<{$url}>"

+        data-page="2"

+        data-totals="<{$totals}>"

+        style="width:0px;"

+    />

+    <div class="loader-inner ball-pulse">

+        <div></div><div></div><div></div><div></div><div></div><div></div>

+    </div>

+</div>

+<{/if}>

+

+

+<script>

+

+KISSY.use('node, io, gallery/datalazyload/2.0/index', function (S, Node, IO, Datalazyload) {

+	var $ = S.all;

+	var lock = false;

+	

+	new Datalazyload({

+		load: function(el){

+			if (lock) return false;

+			lock = true;

+			

+			var requesrUrl = $(el).attr('data-request-url');

+			var page = Number($(el).attr('data-page'));

+			var totals = Number($(el).attr('data-totals'));

+			if (!requesrUrl) {

+				lock = false;

+				return false;

+			}

+			

+			if (page > totals) {

+				$('.loading').hide();

+				return false;

+			}

+			

+			IO.get(

+				requesrUrl

+				, {page: page}

+				, function (data) {

+					if (data.ok) {

+						var next_page = page + 1;

+						$('#loadPage').attr('data-page', next_page);

+						var new_dl = $(data.msg);

+						$(".cardlist").append(new_dl);

+						new Datalazyload();

+						lock = false;

+						

+						if (next_page > totals) {

+							$('.loading').hide();

+						}

+					}

+				}

+				, 'json'

+			);

+		}

+	});

+});

+

+

+//判断当前页图片加载完成loading消失

+/* $(".vogue_top_list").find("img").load(function(){

+	$(this).parent().css("background","none");

+}); */

+

+</script>

+<{include file="bottom.html"}>

+

+<script type="text/javascript" src="<{$web_cfg.cdn}>/haili/js/list.js"></script>

+ 94 - 0
tm/template_dir/my_set.html
View File 

@@ -0,0 +1,94 @@
 
+<{include file="header.html"}>

+<link rel="stylesheet" type="text/css" href="<{$web_cfg.cdn}>/haili/css/setting.css" />

+

+<header><a href="javascript:history.go(-1)" class="back"></a>资料设置</header>

+<section class="applycont">

+    <form>

+        <input type="text" id="realname" name="realname" placeholder="真实姓名" name="<{$my.user_name}>">

+        <select id="sex" name="sex" >

+        	

+            <option <{if $my.sex != 2 && $my.sex != 3}>selected<{/if}>>性别</option>

+            <option <{if $my.sex == 2}>selected<{/if}>>男</option>

+            <option <{if $my.sex == 3}>selected<{/if}>>女</option>

+        </select>

+        <input type="text" id="phone" name="phone"  placeholder="手机号" name="<{$my.phone}>">

+        <textarea placeholder="通信地址" id="address" name="address" name="<{$my.address}>"></textarea>

+        <section class="button-wrapper">

+            <a class="button" id="sub_address">保存</a>

+        </section>

+    </form>

+</section>

+

+<!--公用提示背景遮罩层-->

+<div class="a_cover"></div>

+

+<div class="v_tips_box v_tips_box2" id="error_tips_box">

+    <div class="v_close_btn" id="tips_close_btn"></div>

+    <p class="tips_msg" id="error_msg">错误信息</p>    

+</div>

+

+<{include file="bottom.html"}>

+

+<script>

+KISSY.use('node, io', function (S, Node, IO) {

+	

+	$("input[type=text]").focus(function(){

+		$(this).parent().find("span").hide();

+		$(this).css("color","#000");

+	});

+

+	$("input[type=text]").blur(function(){

+		if($(this).val() == ''){

+			$(this).parent().find("span").show();

+		}	

+	});

+	

+	$('#sub_address').on('click', function () {

+		var realname = S.trim($('input[name=realname]').val());

+		if (realname == '') {

+			showTipsBox('真实姓名不能为空',true);

+			return false;

+		}

+		

+		var phone = S.trim($('input[name=phone]').val());

+		var regex = /^(1[0-9][0-9]|15[0-9]|18[02-9]|14[57])[0-9]{8}$/;

+		if(!regex.test(phone)) {

+			showTipsBox('请填写有效手机号码',true);

+			return false;

+		}

+		

+		var address = S.trim($('input[name=address]').val());

+		if (address == '') {

+			showTipsBox('请填写收货地址',true);

+			return false;

+		}

+

+		var sex = S.trim($('select[name=sex]').val());

+		if (!sex) {

+			showTipsBox('请选择性别',true);

+			return false;

+		}

+		

+		IO.get('<{$web_cfg.domain}>/?c=Express&a=UpExpress'

+			, {

+				lottery_data_id: '<{$lotteryData.id}>',

+				realname: realname,

+				phone: phone,

+				address: address,

+				sex:sex

+			}

+			, function (data) {

+				if (data.ok) {

+					location.reload();

+				} else {

+					showTipsBox(data.msg);

+					return false;

+				}

+			}

+			, 'json'

+		);

+	

+	});

+	

+});

+</script>

Some files were not shown because too many files changed in this diff