Merge branch 'feature/personal3.0' into feature/release/3.0

# Conflicts:
#	config/common.js

@@ -18,20 +18,23 @@ module.exports = {
         app_type: 1
     },
     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/',
 
-        // api: 'http://api-test3.yohops.com:9999/',
-        // service: 'http://service-test3.yohops.com:9999/',
-        // singleApi: 'http://api-test3.yohops.com:9999/',
+        // api: 'http://api-test2.yohops.com:9999/',
+        // service: 'http://service-test2.yohops.com:9999/',
 
         // api: 'http://dev-api.yohops.com:9999/',
         // service: 'http://dev-service.yohops.com:9999/',
+        // singleApi: 'http://192.168.102.27:8092/'
 
-        api: 'http://api.yoho.cn/',
-        service: 'http://service.yoho.cn/',
+        // api: 'http://api.yoho.cn/',
+        // service: 'http://service.yoho.cn/',
         singleApi: 'http://single.yoho.cn/'
+
+        //  singleApi: 'http://192.168.102.205:8080/gateway/',//'http://single.yoho.cn/',
+        // api: 'http://192.168.102.205:8080/gateway/',//'http://api.yoho.cn/',
+        // service: 'http://192.168.102.205:8080/gateway/'//'http://service.yoho.cn/'
     },
     subDomains: {
         host: '.m.yohoblk.com',

@@ -12,7 +12,8 @@
         bottom: 0;
         transition: all 0.6s ease 0s;
         transform: translate(100%, 0);
-        background: #fff;
+        background: resolve("me/channel_default_bg.jpg") no-repeat;
+        background-size: 100% 100%;
 
         div {
             font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
@@ -37,13 +38,12 @@
     }
 
     .bg-animation {
-        transform: translate(0, 0); 
+        transform: translate(0, 0);
     }
+
     .men {
-        /*background: resolve('me/men.png') no-repeat;*/
         width: 680px;
         height: 105px;
-        background-size: contain;
         position: absolute;
         bottom: 260px;
         left: 50%;
@@ -52,10 +52,8 @@
     }
 
     .women {
-        /*background: resolve('me/women.png') no-repeat;*/
         width: 680px;
         height: 105px;
-        background-size: contain;
         position: absolute;
         bottom: 120px;
         left: 50%;
@@ -63,6 +61,7 @@
         border: none;
     }
 </style>
+
 <script>
     'use strict';
 

@@ -11,7 +11,6 @@
     </div>
 
     <div v-if="block.goods" class="editor-goods-area">
-        <div class="white-mask"></div>
         <div class="editor-goods">
             <ul>
                 <li v-for="(index, item) in block.goods.data" v-if="item.product">
@@ -31,7 +30,7 @@
 
     .white-mask {
         &:before {
-            content: '';
+            content: "";
             width: 30px;
             position: absolute;
             left: 0;
@@ -42,7 +41,7 @@
         }
 
         &:after {
-            content: '';
+            content: "";
             width: 30px;
             position: absolute;
             right: 0;
@@ -53,6 +52,7 @@
         }
     }
 }
+
 .editor-goods {
     width: 750px;
     padding: 0 30px;
@@ -96,6 +96,7 @@
     }
 }
 </style>
+
 <script>
     module.exports = {
         props: {

@@ -61,17 +61,13 @@
 
         .show-box {
             background: $bgcolor;
-            border-bottom: 1px solid #000;
+            border-bottom: 1px solid #fff;
 
             &.first-box {
                 margin-top: 0;
                 border-top: 0;
             }
 
-            &:last-child {
-                border-bottom: 0;
-            }
-
             &:not(.no-padding) {
                 padding-bottom: 30px;
             }
@@ -201,6 +197,7 @@
     .editorial-relate-title {
         text-align: center;
         line-height: 100px;
+        border-top: 1px solid #000;
     }
 
     .icon-see:before {
@@ -255,6 +252,7 @@
                     contentData.filter((block) => {
                         if (block && typeof block.goods === 'object') {
                             products = products.concat(block.goods.data);
+                            return products;
                         }
                     });
 
@@ -296,8 +294,12 @@
                             if (!item.src) {
                                 item.src = item.product.default_images;
                             }
+
+                            return item;
                         });
                     }
+
+                    return block;
                 });
 
                 this.$set('content', content);