updata

mobile/control/bargain.php

@@ -21,7 +21,7 @@ class bargainControl extends mobileControl
     }
 
     public function listOp(){
-        self::outsuccess(null,'game/bargain_list');
+        self::outsuccess(null,'bargain/bargain_list');
     }
 
     public function openOp()
@@ -39,7 +39,7 @@ class bargainControl extends mobileControl
             return self::outerr(errcode::ErrParamter);
         }
         else {
-            return self::outsuccess(['tpl' => new tpl_bargain($bargain_id)],'game/bargain');
+            return self::outsuccess(['tpl' => new tpl_bargain($bargain_id)],'bargain/bargain');
         }
     }
 
@@ -62,12 +62,7 @@ class tpl_bargain
         $this->mBargain = new room\bargain($info);
     }
 
-    public function show()
-    {
-        $this->show_goods();
-    }
-
-    private function show_goods()
+    public function show_goods()
     {
         $goods_id = $this->mBargain->goods_id();
         $helper = new goods_helper();
@@ -96,4 +91,21 @@ class tpl_bargain
                 </div>";
         echo $str;
     }
+
+    public function show_bargain_friends(){
+
+        $str = "<li>
+                    <div class=\"head_portrait\">
+                         <img src=\"". RESOURCE_SITE_URL. "/mobile/bargain/images/head_icon.png\" alt=\"\">
+                    </div>
+                    <div class=\"user\">
+                         <div class=\"user_name\">小东</div>
+                              <div class=\"user_msg\">绑架老板打劫福利</div>
+                         </div>
+                         <div class=\"bargain_msg\">
+                              <span class=\"wallet\"></span><span class=\"msg\">砍掉1.8元</span>
+                         </div>
+               </li>";
+        echo $str;
+    }
 }

mobile/templates/default/game/bargain.php

@@ -23,7 +23,7 @@
                     <h3>我在<span class="logo">熊猫美妆</span>发现一件好货</h3>
                     <p>帮我砍到0元免费拿吧！</p>
                 </header>
-                <?php $output['tpl']->show(); ?>
+                <?php $output['tpl']->show_goods(); ?>
             </div>
 
 
@@ -35,78 +35,7 @@
                 <div class="title">我的砍价帮</div>
                 <div class="slide_container">
                     <ul class="users_list" id="slide_list">
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="head_portrait">
-                                <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/head_icon.png" alt="">
-                            </div>
-                            <div class="user">
-                                <div class="user_name">小东</div>
-                                <div class="user_msg">绑架老板打劫福利</div>
-                            </div>
-                            <div class="bargain_msg">
-                                <span class="wallet"></span><span class="msg">砍掉1.8元</span>
-                            </div>
-                        </li>
+                        <?php $output['tpl']->show_bargain_friends();?>
                     </ul>
                 </div>
             </div>
@@ -137,15 +66,31 @@
     </div>
 </div>
 
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/wx_share.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/shake/js/zepto.min.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/animate.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/iscroll.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/websocket.js"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js"></script>
+<script type="text/javascript" src="http://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js?<?php echo bonus_version(); ?>"></script>
+
 <script type="text/javascript">
 
+    //var url         = "<?php //echo share_url($output); ?>//";
+    //var title = "<?php //echo share_title($output); ?>//";
+    //var img_url     = "<?php //echo share_image($output); ?>//";
+    //var sub_title   = "<?php //echo share_subtitle($output); ?>//\n\n点击领取";
+    //
+    //weiXinShare.init({
+    //    title:title,
+    //    desc:sub_title,
+    //    link:url,
+    //    imgUrl:img_url
+    //});
+
     window.onload = function(){
-        myScroll = new IScroll('#wrapper',{
+        var myScroll = new IScroll('#wrapper',{
             click: true,
             taps:true
         });
@@ -248,7 +193,7 @@
         websocket.setMeId(datas.content.me);
     }
     //倒计时
-    var over_time = (new Date(2018,0,20).getTime())/1000;
+    var over_time = (new Date(2018,0,24).getTime())/1000;
 
     var bargain_count_down = setInterval(function(){
         var local_time = (new Date().getTime())/1000;
@@ -293,15 +238,20 @@
             this.play();
         };
         this.play = function(){
-            this.slide_play = setInterval(function(){
-                var $first = $parent.find('li').first();
-                var height = $first.height();
-                $first.animate({
-                    marginTop: -height + 'px'
-                },'ease-out',function(){
-                    $parent.append($first.css('marginTop',0));
-                })
-            },2000);
+            if($parent.children('li').length < 5){
+                 return;
+            }
+            else {
+                this.slide_play = setInterval(function(){
+                    var $first = $parent.find('li').first();
+                    var height = $first.height();
+                    $first.animate({
+                        marginTop: -height + 'px'
+                    },'ease-out',function(){
+                        $parent.append($first.css('marginTop',0));
+                    })
+                },2000);
+            }
         };
         this.addChild = function(msg){
             this.stop();

mobile/templates/default/game/bargain_list.php

@@ -82,29 +82,31 @@
     var over_times = [
                     (new Date(2018,0,20).getTime())/1000,
                     (new Date(2018,0,21).getTime())/1000,
-                    (new Date(2018,0,22).getTime())/1000];
+                    (new Date(2018,0,24).getTime())/1000];
+
+
 
     (function(){
         for(var i=0;i<over_times.length;i++) {
             (function(j){
                 var g = j;
-                setInterval(function(){
+                var bargain_count_down = setInterval(function(){
                     var local_time = (new Date().getTime())/1000;
                     var count_down_time = (over_times[g] - local_time).toFixed(0);
-                    formatDuring(count_down_time,g);
+                    formatDuring(count_down_time,g,bargain_count_down);
                 },1000);
             })(i);
         }
     })();
 
 
-    function formatDuring(mss,num) {
+    function formatDuring(mss,num,timer) {
         var days = parseInt( mss / 60 / 60 / 24, 10); //计算剩余的天数
         var hours = parseInt(mss / 60 / 60 % 24, 10); //计算剩余的小时
         var minutes = parseInt(mss / 60 % 60, 10);//计算剩余的分钟
         var seconds = parseInt(mss % 60, 10);//计算剩余的秒数
         if(days <= 0 && hours <= 0 && minutes <= 0 && seconds <= 0) {
-            clearInterval(bargain_count_down);
+            clearInterval(timer);
             $('.show_count_down').eq(num).addClass('hide');
             $('.bargain_over').eq(num).removeClass('hide');
             return;