Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -243,6 +243,7 @@ const _getRelatedData = (idList) => {
 const _processContentData = (list) => {
 const _processContentData = (list) => {
     list = list || [];
     list = list || [];
     list = camelCase(list);
     list = camelCase(list);
+    // console.log(list)
 
 
     let contentData = {
     let contentData = {
         contents: []
         contents: []
@@ -252,6 +253,7 @@ const _processContentData = (list) => {
 
 
         if (value.singleImage) {
         if (value.singleImage) {
             _.forEach(value.singleImage.data, function(data, index) {
             _.forEach(value.singleImage.data, function(data, index) {
+                console.log(data)
                 if (index === 0) {
                 if (index === 0) {
                     contentData = _.assign(contentData, {
                     contentData = _.assign(contentData, {
                         shareImg: data.src
                         shareImg: data.src

@@ -30,10 +30,17 @@
                 {{# singleImage}}
                 {{# singleImage}}
                     {{# data}}
                     {{# data}}
                     <div class="article-pic block">
                     <div class="article-pic block">
-                        <img src="{{image src 930 660}}">
+                        <img src="{{image src 930 660 1}}">
                     </div>
                     </div>
                     {{/ data}}
                     {{/ data}}
                 {{/ singleImage}}
                 {{/ singleImage}}
+                {{# smallPic}}
+                    <div class="article-pictwo block">
+                        {{# data}}
+                        <img src="{{image src 440 660 1}}">
+                        {{/ data}}
+                    </div>
+                {{/ smallPic}}
                 {{# text}}
                 {{# text}}
                     <div class="article-text block">
                     <div class="article-text block">
                         {{# data}}
                         {{# data}}

@@ -79,11 +79,21 @@
     .article-pic {
     .article-pic {
 
 
         img {
         img {
-            width: 930px;
-            height: 660px;
+            max-width: 930px;
         }
         }
     }
     }
 
 
+    .article-pictwo {
+        max-width: 930px;
+
+        img {
+            display: block;
+            float: left;
+            max-width: 450px;
+            max-height: 660px;
+            margin-right: 10px;
+        }
+    }
     .article-text {
     .article-text {
         width: 700px;
         width: 700px;
         margin: 25px auto;
         margin: 25px auto;
@@ -451,7 +461,7 @@
         background: #000;
         background: #000;
         cursor: pointer;
         cursor: pointer;
 
 
-/*        &:hover {
+      /*  &:hover {
             background: #000;
             background: #000;
         }*/
         }*/
     }
     }

@@ -18,11 +18,23 @@
         margin: 20px auto;
         margin: 20px auto;
         width: 300px;
         width: 300px;
         height: 40px;
         height: 40px;
-    }
-
-    .paging {
         margin-top: 40px;
         margin-top: 40px;
         margin-bottom: 80px;
         margin-bottom: 80px;
+
+        .next-page {
+            i {
+                position: relative;
+                left: 1px;
+                top: -1px;
+            }
+        }
+
+        .pre-page {
+            i {
+                position: relative;
+                top: -1px;
+            }
+        }
     }
     }
 }
 }