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

# Conflicts:
#	config/common.js

@@ -12,6 +12,7 @@
         bottom: 0;
         bottom: 0;
         transition: all 0.6s ease 0s;
         transition: all 0.6s ease 0s;
         transform: translate(100%, 0);
         transform: translate(100%, 0);
+        background: #fff;
 
 
         div {
         div {
             font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
             font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;

@@ -14,7 +14,7 @@
         <div class="white-mask"></div>
         <div class="white-mask"></div>
         <div class="editor-goods">
         <div class="editor-goods">
             <ul>
             <ul>
-                <li v-for="(index, item) in block.goods.data">
+                <li v-for="(index, item) in block.goods.data" v-if="item.product">
                     <a :href="item.product.url">
                     <a :href="item.product.url">
                         <img :src="item.src | resize 250 334">
                         <img :src="item.src | resize 250 334">
                         <p class="title">{{item.product.product_name}}</p>
                         <p class="title">{{item.product.product_name}}</p>
@@ -66,12 +66,12 @@
     }
     }
 
 
     li {
     li {
-        width: 250px;
+        width: 250px !important;
         display: inline-block;
         display: inline-block;
         margin-right: 30px;
         margin-right: 30px;
 
 
         img {
         img {
-            width: 250px;
+            width: 250px !important;
             height: 334px;
             height: 334px;
         }
         }
 
 

@@ -61,14 +61,17 @@
 
 
         .show-box {
         .show-box {
             background: $bgcolor;
             background: $bgcolor;
-            margin-top: 30px;
-            border-bottom: 1px solid #eee;
+            border-bottom: 1px solid #000;
 
 
             &.first-box {
             &.first-box {
                 margin-top: 0;
                 margin-top: 0;
                 border-top: 0;
                 border-top: 0;
             }
             }
 
 
+            &:last-child {
+                border-bottom: 0;
+            }
+
             &:not(.no-padding) {
             &:not(.no-padding) {
                 padding-bottom: 30px;
                 padding-bottom: 30px;
             }
             }
@@ -83,8 +86,9 @@
             background: #fff;
             background: #fff;
 
 
             img {
             img {
-                width: 100%;
+                width: 690px;
                 display: block;
                 display: block;
+                margin: 30px auto 0;
             }
             }
 
 
             p {
             p {
@@ -92,7 +96,7 @@
             }
             }
 
 
             .text-block {
             .text-block {
-                padding: 30px;
+                padding: 30px 30px 0;
             }
             }
         }
         }
 
 
@@ -182,6 +186,10 @@
         }
         }
     }
     }
 
 
+    .share-bottom {
+        z-index: 10;
+    }
+
     .editorial-article-title {
     .editorial-article-title {
         font-size: 43px;
         font-size: 43px;
         font-weight: bold;
         font-weight: bold;
@@ -263,6 +271,7 @@
 
 
                 // 延时读取商品价格、名称等信息
                 // 延时读取商品价格、名称等信息
                 if (!products || !products.length) {
                 if (!products || !products.length) {
+                    this.$set('content', contentData);
                     return;
                     return;
                 }
                 }
 
 
@@ -283,9 +292,12 @@
                 content.filter((block) => {
                 content.filter((block) => {
                     if (block.goods) {
                     if (block.goods) {
                         block.goods.data.filter(item => {
                         block.goods.data.filter(item => {
-                            item.product = _.find(productList, {'product_skn': item.id});
+                            item.product = _.find(productList, {product_skn: item.id});
+                            if (!item.src) {
+                                item.src = item.product.default_images;
+                            }
                         });
                         });
-                    }               
+                    }
                 });
                 });
 
 
                 this.$set('content', content);
                 this.$set('content', content);