debug

data/resource/mobile/bargain/css/main.css

@@ -143,6 +143,7 @@ ul,li {
     color: #ffffff;
     background: url(../images/mine_bargain_btn.jpg?v=1) no-repeat;
     background-size: 100% 100%;
+    margin-bottom: 17px;
 }
 .join_btn {
     display: inline-block;

mobile/control/bargain.php

@@ -403,7 +403,8 @@ class tpl_bargain
             }
             else {
                 $str = '<span class="mine_bargain_btn" id="mine_bargain_btn"></span>
-                        <span class="join_btn hide" id="join_btn"></span>';
+                        <span class="just_buy" id="just_buy"></span>
+                        <span class="invite_btn join_btn" id="invite_btn"></span>';
             }
         }
         else
@@ -421,24 +422,6 @@ class tpl_bargain
         return $str;
     }
 
-    public function show_close_pop()
-    {
-        $str = "";
-//        if($this->mBargain->closed()) {
-//            $str = '<div class="over_pop">
-//                        <div class="bargain_over_bg"></div>
-//                        <span class="start_bargain_btn"></span>
-//                    </div>';
-//        }
-//        else {
-//            $str = '<div class="over_pop hide">
-//                        <div class="bargain_over_bg"></div>
-//                        <span class="start_bargain_btn"></span>
-//                    </div>';;
-//        }
-        return $str;
-    }
-
     public function share_url()
     {
         return url_helper::bargain_open_url($this->mBargain->bargain_id());

mobile/templates/default/bargain/bargain.php

@@ -126,7 +126,8 @@
 
     var myScroll = new IScroll('#wrapper',{
         click: true,
-        taps:true
+        taps:true,
+        preventDefault:false
     });
 
     var barrage = new Barrage();
@@ -301,16 +302,6 @@
         }
     });
 
-    $('.start_bargain_btn').on('click',function(){
-        if(from_app){
-            window.location.href = 'xmmz://'+location.host+'/block/special?title=56CN5Lu35ZuiCg==&special_id=1181';
-        }
-        else {
-            download_app();
-        }
-    });
-
-
     var room    =  <?php echo $output['room']['room']; ?>;
     var roomkey = "<?php echo $output['room']['room_key']; ?>";
     var addr    = "<?php echo $output['room']['addr']; ?>";
@@ -368,6 +359,7 @@
                 var gap = goods_price - lowest_price - discount;
                 gap = (parseInt(gap * 100 + 0.5) / 100).toFixed(2);
                 $('.balance').text(gap);
+                $('.pop').removeClass('hide');
             }
             else if(msg_type == 'message') {
                 var msg = datas.content.content;
@@ -395,9 +387,9 @@
             return;
         }
         $(this).addClass('hide');
-        $('.pop').removeClass('hide');
         $('.join_btn').removeClass('hide');
         websocket.bargain();
+        myScroll.refresh();
     });
 
     //我的砍价按钮
@@ -407,9 +399,8 @@
             return;
         }
         $(this).addClass('hide');
-        $('.pop').removeClass('hide');
-        $('.join_btn').removeClass('hide');
         websocket.bargain();
+        myScroll.refresh();
     });
 
     //发送信息
@@ -439,8 +430,12 @@
     });
 
     $('.affirm_btn').on('click',function(){
+        if(!online) {
+            alert('网络连接失败！请刷新重试');
+            return;
+        }
         websocket.bargain_over();
-        alert('结束成功！请在APP中查收您的红包购买砍价所得商品');
+        window.location.reload();
     });
 
     $('.affirm_close_btn').on('click',function(){