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

 <template>
 <template>
-    <div class="header-wrap" :class="class">
-        <div class="header">
-            <div class="header-left">
+    <div class="blk-header-wrap" :class="class">
+        <div class="blk-header">
+            <div class="blk-header-left">
                 <slot name="left">
                 <slot name="left">
                     <i class="icon icon-left" @click="goBack"></i>
                     <i class="icon icon-left" @click="goBack"></i>
                 </slot>
                 </slot>
             </div>
             </div>
-            <div class="header-right">
+            <div class="blk-header-right">
                 <slot name="right"></slot>
                 <slot name="right"></slot>
             </div>
             </div>
-            <div class="header-main">
-                <span class="header-title">{{title}}</span>
+            <div class="blk-header-main">
+                <span class="blk-header-title">{{title}}</span>
             </div>
             </div>
         </div>
         </div>
-        <div class="header-gap"></div>
+        <div class="blk-header-gap"></div>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
@@ -29,7 +29,7 @@
     };
     };
 </script>
 </script>
 <style>
 <style>
-    .header {
+    .blk-header {
         box-sizing: content-box;
         box-sizing: content-box;
         position: fixed;
         position: fixed;
         top: 0;
         top: 0;
@@ -47,12 +47,12 @@
         color: #000;
         color: #000;
 
 
         .icon,
         .icon,
-        .header-title {
+        .blk-header-title {
             vertical-align: middle;
             vertical-align: middle;
         }
         }
     }
     }
 
 
-    .header-main {
+    .blk-header-main {
         display: block;
         display: block;
         text-align: center;
         text-align: center;
         margin-left: auto;
         margin-left: auto;
@@ -62,11 +62,11 @@
         text-overflow: ellipsis;
         text-overflow: ellipsis;
     }
     }
 
 
-    .header-left {
+    .blk-header-left {
         float: left;
         float: left;
     }
     }
 
 
-    .header-right {
+    .blk-header-right {
         float: right;
         float: right;
 
 
         .icon {
         .icon {
@@ -74,17 +74,17 @@
         }
         }
     }
     }
 
 
-    .header-gap {
+    .blk-header-gap {
         height: 100px;
         height: 100px;
         background-color: transparent;
         background-color: transparent;
     }
     }
 
 
     .app.ios {
     .app.ios {
-        .header {
+        .blk-header {
             padding-top: 60px;
             padding-top: 60px;
         }
         }
 
 
-        .header-gap {
+        .blk-header-gap {
             height: calc(70 + 60 + 10)px;
             height: calc(70 + 60 + 10)px;
         }
         }
     }
     }

@@ -40,6 +40,7 @@
     const tip = require('common/tip');
     const tip = require('common/tip');
     const interceptClick = require('common/intercept-click');
     const interceptClick = require('common/intercept-click');
     const yoho = require('yoho');
     const yoho = require('yoho');
+    const bus = require('common/vue-bus');
 
 
     module.exports = {
     module.exports = {
         data() {
         data() {
@@ -91,6 +92,11 @@
                     }
                     }
 
 
                     this.nullbox = this.brandData.length ? 'hide' : '';
                     this.nullbox = this.brandData.length ? 'hide' : '';
+
+                    if (this.page === 1) {
+                        yoho.showLoading(false);
+                        this.updateNavBar();
+                    }
                 }).fail(() => {
                 }).fail(() => {
                     tip('网络错误');
                     tip('网络错误');
                 });
                 });
@@ -143,7 +149,7 @@
                     return false;
                     return false;
                 } else {
                 } else {
                     this.pageX = event.targetTouches[0].pageX;
                     this.pageX = event.targetTouches[0].pageX;
-                    var delBtn = $('#del-' + id);
+                    let delBtn = $('#del-' + id);
 
 
                     if (delBtn.hasClass('hide')) {
                     if (delBtn.hasClass('hide')) {
                         delBtn.removeClass('hide');
                         delBtn.removeClass('hide');
@@ -222,15 +228,9 @@
                 this.updateNavBar();
                 this.updateNavBar();
             });
             });
 
 
-            document.addEventListener('visibilitychange', () => {
-                if (!document.hidden) {
-                    this.updateNavBar();
+            if (yoho.isApp) {
+                bus.$on('app.favourite.tabChange', this.updateNavBar);
             }
             }
-            });
-        },
-        ready() {
-            yoho.showLoading(false);
-            this.updateNavBar();
         }
         }
     };
     };
 </script>
 </script>

@@ -45,6 +45,7 @@
     const tip = require('common/tip');
     const tip = require('common/tip');
     const interceptClick = require('common/intercept-click');
     const interceptClick = require('common/intercept-click');
     const yoho = require('yoho');
     const yoho = require('yoho');
+    const bus = require('common/vue-bus');
 
 
     module.exports = {
     module.exports = {
         data() {
         data() {
@@ -72,12 +73,7 @@
                     if ($.isEmptyObject(data) || data.pageTotal === 0) {
                     if ($.isEmptyObject(data) || data.pageTotal === 0) {
                         this.busy = true;
                         this.busy = true;
                     } else {
                     } else {
-                        if (this.page === data.pageTotal) {
-                            this.busy = true;
-                        } else {
-                            this.busy = false;
-                        }
-
+                        this.busy = this.page === data.pageTotal;
                         const list = data.productList || [];
                         const list = data.productList || [];
 
 
                         list.forEach(o => {
                         list.forEach(o => {
@@ -111,6 +107,11 @@
                     }
                     }
 
 
                     this.nullbox = this.productData.length ? 'hide' : '';
                     this.nullbox = this.productData.length ? 'hide' : '';
+
+                    if (this.page === 1) {
+                        yoho.showLoading(false);
+                        this.updateNavBar();
+                    }
                 }).fail(() => {
                 }).fail(() => {
                     tip('网络错误');
                     tip('网络错误');
                 });
                 });
@@ -162,7 +163,7 @@
                     return false;
                     return false;
                 } else {
                 } else {
                     this.pageX = event.targetTouches[0].pageX;
                     this.pageX = event.targetTouches[0].pageX;
-                    var delBtn = $('#del-' + id);
+                    let delBtn = $('#del-' + id);
 
 
                     if (delBtn.hasClass('hide')) {
                     if (delBtn.hasClass('hide')) {
                         delBtn.removeClass('hide');
                         delBtn.removeClass('hide');
@@ -229,6 +230,7 @@
                 if (!this.productData.length) {
                 if (!this.productData.length) {
                     header.right.des = '';
                     header.right.des = '';
                 }
                 }
+
                 yoho.updateNavigationBar({
                 yoho.updateNavigationBar({
                     header: header
                     header: header
                 });
                 });
@@ -241,15 +243,9 @@
                 this.updateNavBar();
                 this.updateNavBar();
             });
             });
 
 
-            document.addEventListener('visibilitychange', () => {
-                if (!document.hidden) {
-                    this.updateNavBar();
+            if (yoho.isApp) {
+                bus.$on('app.favourite.tabChange', this.updateNavBar);
             }
             }
-            });
-        },
-        ready() {
-            yoho.showLoading(false);
-            this.updateNavBar();
         }
         }
     };
     };
 </script>
 </script>

@@ -5,11 +5,11 @@
 </template>
 </template>
 <style>
 <style>
     .top-nav {
     .top-nav {
-        .header {
+        .blk-header {
             background-color: transparent;
             background-color: transparent;
         }
         }
 
 
-        .header-gap {
+        .blk-header-gap {
             display: none;
             display: none;
         }
         }
     }
     }

@@ -11,23 +11,23 @@
 
 
 <style>
 <style>
     .top-box {
     .top-box {
-        .header {
+        .blk-header {
             background-color: transparent;
             background-color: transparent;
             color: #fff;
             color: #fff;
         }
         }
 
 
-        .header-gap {
+        .blk-header-gap {
             display: none;
             display: none;
         }
         }
     }
     }
 
 
     .top-change {
     .top-change {
-        .header {
+        .blk-header {
             background-color: #fff;
             background-color: #fff;
             color: #000;
             color: #000;
         }
         }
 
 
-        .header-gap {
+        .blk-header-gap {
             display: block;
             display: block;
         }
         }
     }
     }