Merge branch 'develop' into release/1.0

@@ -54,7 +54,7 @@
         }
         }
 
 
         .blk-header-title {
         .blk-header-title {
-            opacity: 0.3;
+            opacity: 0.4;
         }
         }
     }
     }
 
 

 <template>
 <template>
-    <div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch">
+    <div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch" infinite-scroll-distance="1200">
         <ul class="cardlist card-large clearfix">
         <ul class="cardlist card-large clearfix">
             <li class="card" v-for="item in data">
             <li class="card" v-for="item in data">
                 <div class="card-pic">
                 <div class="card-pic">
@@ -100,7 +100,6 @@
             padding-top: 26px;
             padding-top: 26px;
             text-align: center;
             text-align: center;
             font-size: 0;
             font-size: 0;
-            
         }
         }
 
 
         .card-label {
         .card-label {
@@ -116,18 +115,20 @@
         color: #b0b0b0;
         color: #b0b0b0;
         margin-right: 14px;
         margin-right: 14px;
         font-size: 24px;
         font-size: 24px;
+
         &:last-of-type {
         &:last-of-type {
             margin-right: 0;
             margin-right: 0;
         }
         }
+
         &.old-price {
         &.old-price {
             text-decoration: line-through;
             text-decoration: line-through;
         }
         }
+
         &.sale-price {
         &.sale-price {
             color: #d0021b;
             color: #d0021b;
         }
         }
     }
     }
 
 
-
     .empty-tip {
     .empty-tip {
         margin-top: 380px;
         margin-top: 380px;
         color: #b0b0b0;
         color: #b0b0b0;

@@ -3,8 +3,7 @@
         <navbar>
         <navbar>
             <template slot="right">
             <template slot="right">
                 <a class="right-button no-intercept" href="javascript:void(0);" @click="like()">
                 <a class="right-button no-intercept" href="javascript:void(0);" @click="like()">
-                    <span class="icon icon-like" :class=""></span>
-                    {{likeCount ? likeCount : ''}}
+                    <span class="icon icon-like" :class=""><span class="count">{{likeCount ? likeCount : ''}}</span></span>
                 </a>
                 </a>
                 <!--暂时隐藏收藏入口，下个版本使用-->
                 <!--暂时隐藏收藏入口，下个版本使用-->
                 <!--<a class="right-button no-intercept" href="javascript:void(0);" @click="favorite()">-->
                 <!--<a class="right-button no-intercept" href="javascript:void(0);" @click="favorite()">-->
@@ -21,7 +20,7 @@
 <style>
 <style>
     .top-nav {
     .top-nav {
         .right-button {
         .right-button {
-            /*margin-left: 30px;*/
+            margin-left: 30px;
         }
         }
     }
     }
 </style>
 </style>

@@ -97,6 +97,10 @@
                 this.$parent.$refs.filter.isVisible = !this.$parent.$refs.filter.isVisible;
                 this.$parent.$refs.filter.isVisible = !this.$parent.$refs.filter.isVisible;
             },
             },
             changeTopStatus() {
             changeTopStatus() {
+                if (!this.shareData.isBlkShop) {
+                    return;
+                }
+
                 let ghost = true;
                 let ghost = true;
                 let ghost2 = false;
                 let ghost2 = false;
                 let ghost3 = false;
                 let ghost3 = false;
@@ -118,18 +122,14 @@
                 this.$refs.header.$el.classList.toggle('ghost-3', ghost3);
                 this.$refs.header.$el.classList.toggle('ghost-3', ghost3);
             }
             }
         },
         },
-        created() {
-            this.domain = this.shareData.domain;
+        ready() {
+            window.addEventListener('touchmove', () => {
+                this.changeTopStatus();
+            });
 
 
-            if (this.shareData.isBlkShop) {
-                window.addEventListener('touchmove', () => {
-                    this.changeTopStatus();
-                });
-
-                window.addEventListener('scroll', () => {
-                    this.changeTopStatus();
-                });
-            }
+            window.addEventListener('scroll', () => {
+                this.changeTopStatus();
+            });
         }
         }
     };
     };
 </script>
 </script>