updata bonus_goods

data/resource/mobile/bonus/css/content_rem.css

@@ -5,7 +5,6 @@ body {
 }
 .maincontent {
     background: #FFFAF5;
-    padding-bottom: 2.5rem;
 }
 .top {
     position: relative;
@@ -547,11 +546,11 @@ input,button {
     color: #000;
 }
 .goods_box {
-    width: 4.61rem;
+    width: 4.85rem;
     position: relative;
-    margin-top: 0.26rem;
+    margin-top: 0.1rem;
     background: #fff;
-    margin-left: 0.26rem
+    margin-left: 0.1rem
 }
 .goods .conserve {
     background: #FF4E4E;
@@ -596,7 +595,7 @@ input,button {
     font-size: 27px;
 }
 .goods .goods_msg {
-    padding: 0.17rem;
+    padding: 0.28rem 0.33rem 0.21rem 0.33rem;
 }
 .goods .discount {
     border: 1px solid #FF4E4E;
@@ -604,27 +603,25 @@ input,button {
     margin-right: 0.05rem;
 }
 .price_box {
-    margin-top: 0.22rem;
     overflow: hidden;
-    color: #FF4E4E;
 }
 .new_icon {
     position: absolute;
-    width: 0.89rem;
-    height: 0.68rem;
-    background: url("../imgaes/new_icon.png") no-repeat;
+    width: 0.86rem;
+    height: 0.86rem;
+    background: url(../imgaes/new_icon.png) no-repeat;
     background-size: 100%;
-    top: 0.37rem;
-    right: 0.33rem;
+    top: 0.3rem;
+    left: 0.26rem;
 }
 .grab_icon {
     position: absolute;
-    width: 0.89rem;
-    height: 0.68rem;
-    background: url("../imgaes/grab_icon.png") no-repeat;
+    width: 0.86rem;
+    height: 0.86rem;
+    background: url(../imgaes/grab_icon.png) no-repeat;
     background-size: 100%;
-    top: 0.37rem;
-    right: 0.33rem;
+    top: 0.3rem;
+    left: 0.26rem;
 }
 [data-dpr = "2"] .goods .badge {
     font-size: 22px;
@@ -637,7 +634,7 @@ input,button {
     white-space:nowrap;
     text-overflow:ellipsis;
     -o-text-overflow:ellipsis;
-    margin-bottom: 0.1rem;
+    margin-bottom: 0.01rem;
     overflow:hidden;
     color: #444444;
 }
@@ -647,6 +644,22 @@ input,button {
 [data-dpr = "3"] .goods_name {
     font-size: 36px;
 }
+.goods_desc {
+    font-size: 12px;
+    overflow : hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    color: #7E7E7E;
+    height: 0.85rem;
+}
+[data-dpr = "2"] .goods_desc {
+    font-size: 24px;
+}
+[data-dpr = "3"] .goods_desc {
+    font-size: 36px;
+}
 .desc {
     font-size: 12px;
     white-space:nowrap;
@@ -654,7 +667,6 @@ input,button {
     -o-text-overflow:ellipsis;
     overflow:hidden;
     color: #7E7E7E;
-
 }
 [data-dpr = "2"] .desc {
     font-size: 24px;
@@ -684,15 +696,25 @@ input,button {
     top: 0.05rem;
     margin-right: 0.05rem;
 }
-.bonus_price {
-    font-size: 15px;
+.bonus_price_box {
     color: #FF4E4E;
+    font-size: 13px;
+}
+[data-dpr = "2"] .bonus_price_box {
+    font-size: 26px;
+}
+[data-dpr = "3"] .bonus_price_box {
+    font-size: 39px;
+}
+.bonus_price {
+    font-size: 16px;
+    padding-left: 0.12rem;
 }
 [data-dpr = "2"] .bonus_price {
-    font-size: 30px;
+    font-size: 32px;
 }
 [data-dpr = "3"] .bonus_price {
-    font-size: 45px;
+    font-size: 48px;
 }
 .link {
     margin-bottom: 0.67rem;
@@ -779,9 +801,20 @@ input,button {
     font-size: 45px;
 }
 .goods_img {
+    position: relative;
     min-height: 4.6rem;
     min-width: 4.6rem;
 }
+.goods_img:after {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    content: "";
+    width: 100%;
+    height: 1px;
+    background: #9B9B9B;
+    opacity: 0.3;
+}
 a {
     text-decoration: none;
     color: inherit;
@@ -902,4 +935,77 @@ a:hover {
     background-size: 100% 100%;
 }
 
+.fixed_bottom {
+    position: fixed;
+    bottom: 0;
+    left: 50%;
+    width: 10rem;
+    height: 1.33rem;
+    margin-left: -5rem;
+    display: -webkit-box;
+    -webkit-box-align: center;
+    background: rgba(51,51,51,0.9);
+    z-index: 999;
+}
 
+.fixed_bottom .flex_logo {
+    display: block;
+    width: 0.96rem;
+    height: 0.96rem;
+    background: url("../imgaes/logo.png") no-repeat;
+    background-size: 100% 100%;
+    margin-right: 0.26rem;
+    margin-left: 0.41rem;
+}
+.fixed_bottom .label {
+    font-size: 12px;
+    width: 6.05rem;
+    line-height: 0.4rem;
+    text-align: left;
+    color: #ffffff;
+}
+[data-dpr = "2"] .fixed_bottom .label {
+    font-size: 24px;
+}
+[data-dpr = "3"] .fixed_bottom .label {
+    font-size: 36px;
+}
+.fixed_bottom a {
+    display: block;
+    width: 1.87rem;
+    height: 0.75rem;
+    line-height: 0.74rem;
+    text-align: center;
+    font-size: 12px;
+    background: #FE4F4C;
+    color: #fff;
+    border-radius: 5px;
+}
+[data-dpr = "2"] .fixed_bottom a {
+    font-size: 24px;
+}
+[data-dpr = "3"] .fixed_bottom a {
+    font-size: 36px;
+}
+.favourable {
+    color: #7E7E7E;
+    font-size: 10px;
+}
+[data-dpr = "2"] .favourable {
+    font-size: 20px;
+}
+[data-dpr = "3"] .favourable {
+    font-size: 30px;
+}
+.favourable span:first-child {
+    position: relative;
+}
+.favourable span:first-child:after {
+    position: absolute;
+    left: 0;
+    top: 50%;
+    margin-top: -1px;
+    content: "";
+    width: 100%;
+    border-bottom: 2px solid #7E7E7E;
+}

data/resource/mobile/bonus/js/tel.js

@@ -1,5 +1,5 @@
 $(function(){
-   var tel={
+    var tel={
         //总入口
         init:function(){
             var that=this;
@@ -235,4 +235,7 @@ $(function(){
         }
     };
     tel.init();
-});
+    if($('.fixed_bottom').length > 0) {
+        $('.maincontent').css('padding-bottom','2rem');
+    }
+});

mobile/control/bonusex.php

@@ -912,7 +912,7 @@ class tpl_goods
         else {
             $str  = "<p class=\"text_left goods_name\">{$country}·{$this->mSummary['goods_mobile_name']}</p>";
         }
-        $str .= "<p class=\"text_left desc\">{$this->mSummary['goods_jingle']}</p>";
+        $str .= " <p class=\"text_left goods_desc\">{$this->mSummary['goods_jingle']}</p>";
         return $str;
     }
     public function price()
@@ -929,7 +929,7 @@ class tpl_goods
         $type = $this->discount_type();
         if($type == 1) {
             $discount = $this->mSummary['goods_price'] - $this->mSummary['bonus_price'];
-            $str = "<span class=\"conserve\">立省{$discount}元</span>";
+            $str = "<span class=\"f_right\">红包抵{$discount}</span>";
         } else {
             $discount = $this->mSummary['bonus_price'] / $this->mSummary['goods_price'];
             $discount = intval($discount * 100 + 0.5) / 10;
@@ -937,11 +937,11 @@ class tpl_goods
         }
 
         $market_price = intval($this->mSummary['goods_price'] * 100 + 0.5) / 100;
-        $outstr = "<div class=\"f_left\">
-                    <p class=\"text_left desc\">专柜价{$market_price}元</p>
-                    <p class=\"text_left bonus_price\"><span class=\"bonus_icon\"></span>{$this->mSummary['bonus_price']}{$str}</p>
-                </div>";
-
+        $outstr = "<p class=\"bonus_price_box text_left\">¥<span class=\"bonus_price\">{$this->mSummary['bonus_price']}</span></p>
+                   <p class=\"overflow_h favourable\">
+                        <span class=\"f_left\">专柜价{$market_price}</span>
+                        {$str}
+                   </p>";
         return $outstr;
     }
 
@@ -959,19 +959,19 @@ class tpl_goods
         $type = $this->discount_type();
         if($type == 1) {
             $discount = $this->mSummary['goods_price'] - $this->mSummary['goods_promotion_price'];
-            $str  = "<span class=\"conserve\">立省{$discount}元</span>";
+            $str  = "<span class=\"f_right\">立省{$discount}元</span>";
         } else {
             $discount = $this->mSummary['goods_promotion_price'] / $this->mSummary['goods_price'];
             $discount = intval($discount * 100 + 0.5) / 10;
-            $str = "<span class=\"conserve\">{$discount}折</span>";
+            $str = "<span class=\"f_right\">{$discount}折</span>";
         }
 
         $market_price = intval($this->mSummary['goods_price'] * 100 + 0.5) / 100;
-        $outstr = "<div class=\"f_left\">
-                    <p class=\"text_left desc\">专柜价{$market_price}元</p>
-                    <p class=\"text_left bonus_price\">¥{$this->mSummary['goods_promotion_price']}{$str}</p>
-                </div>";
-
+        $outstr = "<p class=\"bonus_price_box text_left\">¥<span class=\"bonus_price\">{$this->mSummary['goods_promotion_price']}</span></p>
+                   <p class=\"overflow_h favourable\">
+                        <span class=\"f_left\">专柜价{$market_price}</span>
+                        {$str}
+                   </p>";
         return $outstr;
     }
     public function showicon()
@@ -983,7 +983,7 @@ class tpl_goods
         else
         {
             if($this->mSummary['is_new']) {
-                $str = "<span class=\"new_icon\"></span>";
+                $str = "<div class=\"new_icon\"></div>";
             } else {
                 $str = '';
             }
@@ -1007,23 +1007,20 @@ function bonnus_out_goods($output)
     foreach ($summarys as $summary)
     {
         $printer->reinit($summary);
-
-        echo
-        "<div class='goods_box'>
-            <a href=\"{$summary['goods_url']}\" style=\"color:#7E7E7E\">
-            <div class='goods'>
-                <div>
-                    <img src=\"{$summary['goods_image_url']}\">
-                </div>                
-                <div class=\"goods_msg\">
-                    {$printer->base_info()}                    
-                    <div class=\"price_box\">
-                    {$printer->price()}
-                    <p class=\"look_btn center\">查看</p >
-                    </div>     
-                    {$printer->showicon()}
+        echo "<div class=\"goods_box\">
+            <a href=\"{$summary['goods_url']}\">
+                <div class=\"goods\">
+                    <div class=\"goods_img\">
+                        <img src=\"{$summary['goods_image_url']}\">
+                    </div>
+                    <div class=\"goods_msg\">
+                           {$printer->base_info()}
+                        <div class=\"price_box\">
+                           {$printer->price()}
+                        </div>
+                       {$printer->showicon()}
+                    </div>
                 </div>
-            </div>
             </a>
         </div>";
     }
@@ -1054,12 +1051,14 @@ function bonus_out_download()
 {
     if(!session_helper::isapp())
     {
-        $mshop_url = BASE_SITE_URL . '/mobile/index.php?act=mshop&op=index';
-        echo '<div class="use_bonus">
-                <div class="logo_fix f_left"></div>
-                <a href="" class="btn_use_bonus" id="link">打开APP</a>
-                <a href="'.$mshop_url.'" class="btn_use_bonus">进入商城</a>
-              </div>';
+        echo "<div class=\"fixed_bottom\">
+                    <span class=\"flex_logo\"></span>
+                    <div class=\"label\">
+                        <p>熊猫美妆</p>
+                        <p>下载APP即可得100%红包</p>
+                    </div>
+                    <a href=\"#\" class=\"download_app_btn\" id=\"link\">打开APP</a>
+              </div>";
     }
 }
 

mobile/control/control.php

@@ -300,9 +300,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=20171122";
+    return "v=20171123";
 }
 function shop_version()
 {
-    return "v=20171122";
+    return "v=20171123";
 }