stanley-king 7 years ago
parent
commit
65f894f87b

+ 1 - 1
data/resource/mobile/bargain/css/main.css

@@ -214,7 +214,7 @@ ul,li {
     color: #fad952;
 }
 .users_list li .user {
-    width: 420px;
+    width: 400px;
     font-size: 28px;
     line-height: 1.3;
 }

+ 3 - 2
helper/goods_helper.php

@@ -209,8 +209,9 @@ class goods_helper
 
             $goods_num = $item['goods_num'];
             $storage   = $summary['goods_storage'];
-            if($storage > intval(($goods_num - $storage) / 2)) {
-                $grabed_num = intval(($goods_num - $storage) / 2 + 0.5);
+
+            if($storage > $goods_num) {
+                $grabed_num = $goods_num - 1;
             } else {
                 $grabed_num = $goods_num - $storage;
             }

+ 16 - 13
mobile/control/bargain.php

@@ -245,10 +245,13 @@ class tpl_bargain
                     <div class=\"introduce\">
                         <p class=\"goods_name\">{$summary['goods_mobile_name']}</p>
                         <p class=\"floor_price\" style='margin-bottom: 7px;'>原价{$summary['goods_price']}</p>
+                       
                         <div class=\"price_describe\">
                             <div class=\"price_box\">
                                 <span class=\"current_price\" id=\"current_price\">现价¥{$cur_price}</span>
                                 <span class=\"floor_price\">可砍至{$lowest}元</span>
+                                <input type=\"hidden\" value=\"{$summary['goods_price']}\" id=\"goods_price\">
+                                <input type=\"hidden\" value=\"{$lowest}\" id=\"lowest_price\">
                             </div>
                         </div>
                         <div class=\"count_down\">
@@ -420,18 +423,19 @@ class tpl_bargain
 
     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 class="over_pop hide">
-                        <div class="bargain_over_bg"></div>
-                        <span class="start_bargain_btn"></span>
-                    </div>';;
-        }
+        $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;
     }
 
@@ -451,6 +455,5 @@ class tpl_bargain
     {
         $price = $this->mBargain->lowest_price();
         return "帮我砍个价,{$price}元得商品~";
-
     }
 }

+ 2 - 2
mobile/control/control.php

@@ -297,9 +297,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018013101";
+    return "v=2018020101";
 }
 function shop_version()
 {
-    return "v=20180131";
+    return "v=2018020101";
 }

+ 11 - 5
mobile/templates/default/bargain/bargain.php

@@ -346,20 +346,28 @@
         console.log(datas);
         try
         {
+            var goods_price  = $('#goods_price').val();
+            var lowest_price = $('#lowest_price').val();
+
             if(msg_type == 'bargain') {
-                var price = datas.content.value;
-                priceChange(price);
+                var discount = datas.content.discount;
+                priceChange(goods_price - discount);
                 slideMsgs.addChild(datas).play();
             }
             else if(msg_type =='ret_bargain') {
                 var ret_bargain_price = datas.content.value;
+                var discount = datas.content.discount;
+
                 var image = new Image();
                 image.src = "<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/images/bargain_pop.jpg";
                 image.onload = function(){
                     $('.bargain_pop').removeClass('hide');
                 };
                 $('.ret_bargain').text(ret_bargain_price);
-                $('.balance').text(datas.content.discount);
+
+                var gap = goods_price - lowest_price - discount;
+                gap = parseInt(gap * 100 + 0.5) / 100;
+                $('.balance').text(gap);
             }
             else if(msg_type == 'message') {
                 var msg = datas.content.content;
@@ -426,8 +434,6 @@
     $('.affirm_close_btn').on('click',function(){
         $('.affirm_pop').addClass('hide');
     });
-
-
 </script>
 </body>
 </html>

+ 0 - 132
mobile/templates/default/bargain/bargain_list.php

@@ -1,132 +0,0 @@
-<?php defined('InShopNC') or exit('Access Invalid!'); ?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>砍价团</title>
-    <meta name="viewport" content="width=750,user-scalable=no,target-densitydpi=device-dpi">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/css/main.css?<?php echo bonus_version(); ?>"/>
-    <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/bargain/css/list.css?<?php echo bonus_version(); ?>"/>
-</head>
-<body>
-    <div class="container">
-        <ul class="bargain_list">
-            <li>
-                <div class="goods_image">
-                    <img src="http://img2.imgtn.bdimg.com/it/u=2909519701,1856442059&fm=11&gp=0.jpg">
-                </div>
-                <div class="goods_details">
-                    <p class="goods_name">【雪花秀】与润修复面膜</p>
-                    <div class="goods_price">原价 380 元</div>
-                    <div class="nums">
-                        <div class="gross">共20份</div>
-                        <div class="bargained_num">已抢100份</div>
-                    </div>
-                    <p class="bargain_over hide">该砍价已结束</p>
-                    <p class="show_count_down">剩:<span class="days time_color"></span> 天 <span class="hours time_color"></span> :<span class="minutes time_color"></span> :<span class="seconds time_color"></span> 结束</p>
-                    <div class="launch">
-                        <span class="launch_btn allow">砍价0元得</span>
-                    </div>
-                </div>
-            </li>
-            <li>
-                <div class="goods_image">
-                    <img src="http://img2.imgtn.bdimg.com/it/u=2909519701,1856442059&fm=11&gp=0.jpg">
-                    <span class="start_date">周三福利</span>
-                </div>
-                <div class="goods_details">
-                    <p class="goods_name">【雪花秀】与润修复面膜</p>
-                    <div class="goods_price">原价 380 元</div>
-                    <div class="nums">
-                        <div class="gross">共20份</div>
-                        <div class="bargained_num">已抢100份</div>
-                    </div>
-                    <p class="bargain_over hide">该砍价已结束</p>
-                    <p class="show_count_down">还有:<span class="days time_color"></span> 天 <span class="hours time_color"></span> :<span class="minutes time_color"></span> :<span class="seconds time_color"></span> 开始</p>
-                    <div class="launch">
-                        <span class="launch_btn not_started">等待砍价</span>
-                    </div>
-                </div>
-            </li>
-            <li>
-                <div class="goods_image">
-                    <img src="http://img2.imgtn.bdimg.com/it/u=2909519701,1856442059&fm=11&gp=0.jpg">
-                    <span class="start_date">周五福利</span>
-                </div>
-                <div class="goods_details">
-                    <p class="goods_name">【雪花秀】与润修复面膜</p>
-                    <div class="goods_price">原价 380 元</div>
-                    <div class="nums">
-                        <div class="gross">共20份</div>
-                        <div class="bargained_num">已抢100份</div>
-                    </div>
-                    <p class="bargain_over hide">该砍价已结束</p>
-                    <p class="show_count_down">还有:<span class="days time_color"></span> 天 <span class="hours time_color"></span> :<span class="minutes time_color"></span> :<span class="seconds time_color"></span> 开始</p>
-                    <div class="launch">
-                        <span class="launch_btn not_started">等待砍价</span>
-                    </div>
-                </div>
-            </li>
-        </ul>
-    </div>
-
-
-<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/new_bridge.js"></script>
-<script type="text/javascript">
-    //倒计时
-    var over_times = [
-                    (new Date(2018,0,20).getTime())/1000,
-                    (new Date(2018,0,21).getTime())/1000,
-                    (new Date(2018,0,24).getTime())/1000];
-
-
-
-    (function(){
-        for(var i=0;i<over_times.length;i++) {
-            (function(j){
-                var g = j;
-                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,bargain_count_down);
-                },1000);
-            })(i);
-        }
-    })();
-
-
-    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(timer);
-            $('.show_count_down').eq(num).addClass('hide');
-            $('.bargain_over').eq(num).removeClass('hide');
-            return;
-        }
-        if(days < 10) {
-            days = '0' + days;
-        }
-        if(hours < 10) {
-            hours = '0' + hours;
-        }
-        if(minutes < 10) {
-            minutes = '0' + minutes;
-        }
-        if(seconds < 10) {
-            seconds = '0' + seconds;
-        }
-        $('.days').eq(num).text(days);
-        $('.hours').eq(num).text(hours);
-        $('.minutes').eq(num).text(minutes);
-        $('.seconds').eq(num).text(seconds);
-    }
-</script>
-</body>
-</html>
-