Merge branch 'release/4.0' into gray

@@ -18,17 +18,17 @@ module.exports = {
         app_type: 1
         app_type: 1
     },
     },
     domains: {
     domains: {
-        api: 'http://api-test3.yohops.com:9999/',
-        service: 'http://service-test3.yohops.com:9999/',
-        singleApi: 'http://api-test3.yohops.com:9999/'
+        // api: 'http://api-test3.yohops.com:9999/',
+        // service: 'http://service-test3.yohops.com:9999/',
+        // singleApi: 'http://api-test3.yohops.com:9999/'
 
 
         // api: 'http://dev-api.yohops.com:9999/',
         // api: 'http://dev-api.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
         // singleApi: 'http://192.168.102.27:8092/'
         // singleApi: 'http://192.168.102.27:8092/'
         // //
         // //
-        // api: 'http://api.yoho.cn/',
-        // service: 'http://service.yoho.cn/',
-        // singleApi: 'http://single.yoho.cn/'
+        api: 'http://api.yoho.cn/',
+        service: 'http://service.yoho.cn/',
+        singleApi: 'http://single.yoho.cn/'
     },
     },
     subDomains: {
     subDomains: {
         host: '.m.yohoblk.com',
         host: '.m.yohoblk.com',

@@ -169,8 +169,6 @@
         text-align: center;
         text-align: center;
         width: 100%;
         width: 100%;
         diplay: flex;
         diplay: flex;
-        height: 24px;
-        margin-bottom: 8px;
         align-items: center;
         align-items: center;
 
 
         a {
         a {
@@ -179,6 +177,7 @@
             display: inline-block;
             display: inline-block;
             width: 24px;
             width: 24px;
             height: 24px;
             height: 24px;
+            margin: 2px 0;
 
 
             &.zoom {
             &.zoom {
                  background-color: #000;
                  background-color: #000;

@@ -27,24 +27,6 @@ export default {
             }
             }
             return this.src;
             return this.src;
         }
         }
-    },
-    mounted() {
-//        let timer;
-//        let img = new Image();
-//        let maxRetry = 30 * 1000;
-//        let start = Date.now();
-//
-//        timer = setInterval(() => {
-//            img.src = this.$refs.image.src;
-//
-//            if (!img.src) {
-//                clearInterval(timer);
-//            }
-//
-//            if (img.complete || Date.now() - start > maxRetry) {
-//                clearInterval(timer);
-//            }
-//        }, 3000);
     }
     }
 };
 };
 </script>
 </script>

@@ -13,7 +13,7 @@
             <scroller ref="scroller" @loading="loading" class="channel-scroll">
             <scroller ref="scroller" @loading="loading" class="channel-scroll">
                 <component
                 <component
                     :is="component.template_name"
                     :is="component.template_name"
-                        v-for="(component, index) in floors.filter(c => ['twoPicture', 'goods', 'tfGoodsList', 'focus', 'blkCategory', 'newSingleImage', 'BlkNewProductFloorResource'].some(k => k === c.template_name) )"
+                        v-for="(component, index) in (floors || []).filter(c => ['twoPicture', 'goods', 'tfGoodsList', 'focus', 'blkCategory', 'newSingleImage', 'BlkNewProductFloorResource'].some(k => k === c.template_name) )"
                     :value="component.data"
                     :value="component.data"
                     :key="index"></component>
                     :key="index"></component>
             </scroller>
             </scroller>

@@ -29,12 +29,12 @@ export function createChannel() {
             gender: 'men',
             gender: 'men',
             men: {
             men: {
                 sort: {},
                 sort: {},
-                floors: {},
+                floors: [],
                 isFetching: false
                 isFetching: false
             },
             },
             women: {
             women: {
                 sort: {},
                 sort: {},
-                floors: {},
+                floors: [],
                 isFetching: false
                 isFetching: false
             },
             },
             fethingHome: false,
             fethingHome: false,