huanggang 7 years ago
parent
commit
07db157f4b
2 changed files with 36 additions and 17 deletions
  1. 14 0
      mobile/control/bargain.php
  2. 22 17
      mobile/templates/default/bargain/bargain.php

+ 14 - 0
mobile/control/bargain.php

@@ -417,6 +417,20 @@ class tpl_bargain
         return $str;
     }
 
+    public function show_close_pop()
+    {
+        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>没有关闭</div>';
+        }
+        return $str;
+    }
+
     public function share_url()
     {
         return url_helper::bargain_open_url($this->mBargain->bargain_id());

+ 22 - 17
mobile/templates/default/bargain/bargain.php

@@ -45,11 +45,9 @@
         <div class="send_msg">发送</div>
     </div>
     <div>
-        <?php if(session_helper::isapp()) { ?>
-            <button class="join_btn download_app">发起砍价</button>
-        <?php } else {?>
+        <?php if(!session_helper::isapp()) { ?>
             <button class="download_app" id="download_app">下载app</button>
-        <?php }?>
+        <?php } ?>
     </div>
 </div>
 
@@ -81,10 +79,7 @@
     </div>
 </div>
 
-<div class="over_pop hide">
-    <div class="bargain_over_bg"></div>
-    <span class="start_bargain_btn"></span>
-</div>
+<?php echo $output['tpl']->show_close_pop(); ?>
 
 
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js?<?php echo bonus_version(); ?>"></script>
@@ -97,6 +92,7 @@
 <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 $output['tpl']->share_url(); ?>";
     var title       = "<?php echo $output['tpl']->share_title(); ?>";
     var img_url     = "<?php echo $output['tpl']->share_image(); ?>";
@@ -123,12 +119,16 @@
     };
     bridge.call_native_handler('on_native_click',JSON.stringify(jsInit));
 
-    window.onload = function(){
-        var myScroll = new IScroll('#wrapper',{
-            click: true,
-            taps:true
-        });
-    };
+
+    if(from_app) {
+        $('.send_input').css('width','560px');
+    }
+
+    var myScroll = new IScroll('#wrapper',{
+        click: true,
+        taps:true
+    });
+
 
     //发送弹幕
     var Barrage = function()
@@ -256,6 +256,9 @@
                                 '</div>'+
                           '</li>';
             $parent.append(sub_html);
+            setTimeout(function () {
+                myScroll.refresh();
+            },0);
             return this;
         };
         this.stop = function(){
@@ -343,7 +346,7 @@
 
     $('.start_bargain_btn').on('click',function(){
         if(from_app){
-           alert('schema跳转,地址不清楚');
+            window.location.href = 'xmmz://'+location.host+'/block/special?title=56CN5Lu35ZuiCg==&special_id=1181';
         }
         else {
             download_app();
@@ -372,11 +375,11 @@
     function sOpen(){
     }
     function sError(e){
-        console.log('网络连接失败!请刷新重试 msg:' + e.message);
+        console.log('网络连接失败!请刷新重试');
         online = false;
     }
     function sClose(e){
-        console.log('网络连接关闭!msg:' + e.message);
+        console.log('网络连接关闭!');
         online = false;
     }
 
@@ -467,6 +470,8 @@
     $('.affirm_close_btn').on('click',function(){
         $('.affirm_pop').addClass('hide');
     });
+
+
 </script>
 </body>
 </html>