Merge branch 'develop' into release/1.0

@@ -39,7 +39,7 @@ module.exports = {
             sort: req.query.sort,
             page: req.query.page,
             channel: req.query.channel || 'men',
-            gender: req.query.gender || '1,2,3',
+            gender: '1,2,3', // 店铺 不分 性别
             brand: req.query.brand,
             shopId: req.query.id,
             order: req.query.order || 's_t_desc',

@@ -39,6 +39,17 @@ module.exports = {
         timeout: 1000,
         retries: 0
     },
+    interfaceShunt: {
+        useInterfaceShunt: false,
+        tencentServers: {
+            api: ['123.206.1.98', '123.206.2.80'],
+            service: ['123.206.1.98', '123.206.2.80']
+        },
+        awsServers: {
+            api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
+            service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
+        }
+    },
     loggers: {
         infoFile: {
             name: 'info',
@@ -86,7 +97,18 @@ if (isProduction) {
             retries: 0
         },
         useOneapm: true,
-        useCache: true
+        useCache: true,
+        interfaceShunt: {
+            useInterfaceShunt: true,
+            tencentServers: {
+                api: ['123.206.1.98', '123.206.2.80'],
+                service: ['123.206.1.98', '123.206.2.80']
+            },
+            awsServers: {
+                api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
+                service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
+            }
+        }
     });
 } else if (isTest) {
     Object.assign(module.exports, {

@@ -2,15 +2,18 @@ const Vue = require('vue');
 const infiniteScroll = require('vue-infinite-scroll');
 const favBrandList = require('me/fav-brand-list.vue');
 const VueTouch = require('vue-touch');
+const yoho = require('yoho');
 
 require('common/vue-filter')(Vue);
 
 Vue.use(VueTouch);
 Vue.use(infiniteScroll);
 
-new Vue({
-    el: '#fav-content',
-    components: {
-        favBrandList
-    }
-});
+yoho.ready(() => {
+    new Vue({
+        el: '#fav-content',
+        components: {
+            favBrandList
+        }
+    });
+})

@@ -2,15 +2,18 @@ const Vue = require('vue');
 const infiniteScroll = require('vue-infinite-scroll');
 const favProductList = require('me/fav-product-list.vue');
 const VueTouch = require('vue-touch');
+const yoho = require('yoho');
 
 require('common/vue-filter')(Vue);
 
 Vue.use(VueTouch);
 Vue.use(infiniteScroll);
 
-new Vue({
-    el: '#fav-content',
-    components: {
-        favProductList
-    }
+yoho.ready(() => {
+    new Vue({
+        el: '#fav-content',
+        components: {
+            favProductList
+        }
+    });
 });

@@ -72,6 +72,7 @@
                 content: "";
                 position: absolute;
                 left: 30px;
+                bottom: 0;
                 width: 100%;
                 height: 0;
                 border-bottom: 1px solid #eee;

@@ -134,7 +134,7 @@
             const self = this;
 
             this.overlay = new Overlay({
-                disableScrolling: true,
+                disableScrolling: false,
                 onClose: function() {
                     self.isVisible = false;
                 }

@@ -38,7 +38,7 @@
         .title {
             background: #fff;
             font-size: 42px;
-            line-height: 46px;
+            line-height: 1.2;
             font-weight: 700;
             padding: 10px 20px;
         }

@@ -35,8 +35,6 @@
 
         methods: {
             getCoinData() {
-                let _that = this;
-
                 this.busy = true;
                 if (this.page >= this.pageTotal) {
                     return;
@@ -49,10 +47,10 @@
                     }
                 }).then(result => {
                     if (result.code === 200) {
-                        _that.busy = false;
+                        this.busy = false;
                         if (result.data.coinlist.length > 0) {
-                            this.$set('coinList', _that.coinList.concat(result.data.coinlist));
-                            _that.pageTotal = result.data.pageTotal;
+                            this.$set('coinList', this.coinList.concat(result.data.coinlist));
+                            this.pageTotal = result.data.pageTotal;
                         }
                     }
                 }).fail(() => {

@@ -131,6 +131,11 @@
                         this.brandData.splice(index, 1);
                         this.hideDelBth();
                         delete this.keys[id];
+
+                        if (this.brandData.length === 0) {
+                            this.nullbox = '';
+                            this.updateNavBar();
+                        }
                     } else if (data.code === 400) {
                         tip(data.message);
                     } else {

@@ -147,6 +147,11 @@
                         this.productData.splice(index, 1);
                         this.hideDelBth();
                         delete this.keys[id];
+
+                        if (this.productData.length === 0) {
+                            this.nullbox = '';
+                            this.updateNavBar();
+                        }
                     } else if (data.code === 400) {
                         tip(data.message);
                     } else {

@@ -196,8 +196,8 @@
     }
 
     .show-box.brand {
-        $lh: 68px;
         overflow: hidden;
+        $lh: 68px;
 
         img {
             height: 68px;
@@ -223,7 +223,6 @@
             line-height: $lh;
             color: #b0b0b0;
         }
-
     }
 
     .product-detail-desc {
@@ -232,6 +231,10 @@
             width: 100% !important;
             height: auto !important;
         }
+
+        table {
+            width: 100%;
+        }
     }
 
     i.info {
@@ -273,7 +276,6 @@
             &.highlight {
                 color: #d0021b;
             }
-
         }
     }
 
@@ -328,7 +330,6 @@
             line-height: 66px;
             text-align: center;
         }
-
     }
 
     .wash-condition {
@@ -355,7 +356,6 @@
             color: #c7c7c7;
             min-width: 100px;
         }
-
     }
 
     .model-avatar {
@@ -392,7 +392,6 @@
         data() {
             return {
                 yoho: yoho,
-                isApp: yoho.isApp,
                 intro: {},
                 firstImage: '',
                 entity: {
@@ -427,18 +426,19 @@
                             this.cartCount = result.data.goods_count;
 
                             selector.playAnimation();
-                        } 
+                        }
 
                         this.showFeatureSelector = false;
                         tip(result.message);
                     });
-                }
+                },
+
+                //state
+                isApp: yoho.isApp,
+                isSoldOut: true
             };
         },
         computed: {
-            isSoldOut: function() {
-                return this.entity.storage === 0;
-            }
         },
         components: {
             imageCarousel: require('./image-carousel.vue'),
@@ -490,6 +490,8 @@
             const self = this;
             const pid = app.data('pid');
 
+            this.isSoldOut = true;
+
             // 显示商品特征选择组件
             this.$on('feature.close', function() {
                 self.showFeatureSelector = false;
@@ -500,6 +502,10 @@
                 // TODO: 异常处理
                 this.entity = result;
 
+                if (this.entity.storage !== 0 && this.entity.status !== 0) {
+                    this.isSoldOut = false;
+                }
+
                 this.entity.goodsList.forEach((goods)=> {
                     if (!this.firstImage && goods.colorImage) {
                         this.firstImage = goods.colorImage;