Merge branch 'gray' of http://git.yoho.cn/fe/yohoblk-wap into gray

@@ -24,7 +24,7 @@
                 </li>
                 </li>
             </ul>
             </ul>
         </div>
         </div>
-        <div class="service">
+        <div class="service" :class="{'bottom-border': !isApp}">
             <ul>
             <ul>
                 <li><i class="icon icon-real"></i>100%品牌正品</li>
                 <li><i class="icon icon-real"></i>100%品牌正品</li>
                 <li class="return" v-if="intro.supportRefundExchange === 'N'">
                 <li class="return" v-if="intro.supportRefundExchange === 'N'">
@@ -33,7 +33,7 @@
                 <li><i class="icon icon-onlineservice"></i>便捷在线客服</li>
                 <li><i class="icon icon-onlineservice"></i>便捷在线客服</li>
             </ul>
             </ul>
         </div>
         </div>
-        <add-to-cart class="add-cart" :value="entity" @add-cart="addCart"></add-to-cart>
+        <add-to-cart v-if="isApp" class="add-cart" :value="entity" @add-cart="addCart"></add-to-cart>
     </show-box>
     </show-box>
     <show-box :is-last="preferList.length <= 0" :zero-top-margin="true" class="info">
     <show-box :is-last="preferList.length <= 0" :zero-top-margin="true" class="info">
         <div v-if="intro.productDescBo">
         <div v-if="intro.productDescBo">
@@ -253,7 +253,7 @@
         <shopping-bag :cart-count="cartCount"></shopping-bag>
         <shopping-bag :cart-count="cartCount"></shopping-bag>
     </div>
     </div>
 
 
-    <div v-if="!isApp">
+    <div v-if="false">
         <share-bottom></share-bottom>
         <share-bottom></share-bottom>
     </div>
     </div>
 </div>
 </div>
@@ -551,6 +551,10 @@
     .service {
     .service {
         border-top: 1px solid #eee;
         border-top: 1px solid #eee;
 
 
+        &.bottom-border {
+            border-bottom: 1px solid #eee;
+        }
+
         ul {
         ul {
             font-size: 0;
             font-size: 0;
             height: 108px;
             height: 108px;

@@ -193,6 +193,11 @@
 </script>
 </script>
 <style>
 <style>
     @import "../../../scss/common/_header.css";
     @import "../../../scss/common/_header.css";
+    html,
+    body {
+        height: 100%;
+        background-color: #fff;
+    }
     .list-header {
     .list-header {
         background-color: white;
         background-color: white;
     }
     }

@@ -173,6 +173,11 @@
 
 
 </script>
 </script>
 <style>
 <style>
+    html,
+    body {
+        height: 100%;
+        background-color: #fff;
+    }
     .list-items {
     .list-items {
         background-color: #fff;
         background-color: #fff;
         padding-top: 105px;
         padding-top: 105px;

@@ -171,6 +171,11 @@
     };
     };
 </script>
 </script>
 <style>
 <style>
+    html,
+    body {
+        height: 100%;
+        background-color: #fff;
+    }
     .top-filter {
     .top-filter {
         border-top: none!important;
         border-top: none!important;
     }
     }

@@ -9,6 +9,12 @@
     </div>
     </div>
 </template>
 </template>
 <style>
 <style>
+    html,
+    body {
+        height: 100%;
+        background-color: #fff;
+    }
+
     .shop-box.no-header {
     .shop-box.no-header {
         .top-filter {
         .top-filter {
             top: 0;
             top: 0;