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

@@ -29,19 +29,17 @@
             {{# content}}
             {{# content}}
                 {{# singleImage}}
                 {{# singleImage}}
                     {{# data}}
                     {{# data}}
-                    <span class="article-pictwo">
+              
                         <img src="{{image src 930 660 1}}">
                         <img src="{{image src 930 660 1}}">
-                    </span>
+           
                     {{/ data}}
                     {{/ data}}
                 {{/ singleImage}}
                 {{/ singleImage}}
                 {{# smallPic}}
                 {{# smallPic}}
-                    <span class="article-pictwo">
-                       {{!--  <div class="img-center"> --}}
-                            {{# data}}
-                            <img src="{{image src 460 660 1}}">
-                            {{/ data}}
-                       {{!--  </div> --}}
+                    {{# data}}
+                    <span class="article-pictwo"> 
+                        <img src="{{image src 460 660 1}}">
                     </span>
                     </span>
+                    {{/ data}}
                 {{/ smallPic}}
                 {{/ smallPic}}
                 {{# text}}
                 {{# text}}
                     <div class="article-text block">
                     <div class="article-text block">

@@ -18,7 +18,7 @@ var $commentList = $commentArea.find('.comments-wrap'),
     $wordCountTip = $('#word-count-tip'),
     $wordCountTip = $('#word-count-tip'),
     _alert = dialog.Alert,
     _alert = dialog.Alert,
     tag = $('#tags').find('li').length,
     tag = $('#tags').find('li').length,
-    leng = $('.goods').find('.good-info').length / 4,
+    leng = Math.ceil($('.goods').find('.good-info').length / 4),
     pag = 0,
     pag = 0,
     pre = $('.chapter-left').find('a'),
     pre = $('.chapter-left').find('a'),
     next = $('.chapter-right').find('a');
     next = $('.chapter-right').find('a');

@@ -20,6 +20,8 @@
     .article-info {
     .article-info {
         width: 580px;
         width: 580px;
         margin: 10px auto;
         margin: 10px auto;
+        clear: both;
+        margin-bottom: 20px;
     }
     }
 
 
     .article-author {
     .article-author {
@@ -75,14 +77,19 @@
             margin-right: 30px;
             margin-right: 30px;
         }
         }
     }
     }
-
-    .article-pic {
+    .article-main {
+        text-align: center;
+        margin: 0 auto;
 
 
         img {
         img {
             max-width: 930px;
             max-width: 930px;
+            display: inherit;
+            margin: auto;
         }
         }
     }
     }
 
 
+        
+
     .article-pictwo {
     .article-pictwo {
         max-width: 930px;
         max-width: 930px;
         margin: 0 auto;
         margin: 0 auto;
@@ -91,10 +98,8 @@
 
 
         img {
         img {
             display: inline-block;
             display: inline-block;
-           
             max-width: 460px;
             max-width: 460px;
-            margin-right: 2px;
-            
+            margin-right: 2px;  
         }
         }
     }
     }
 
 

@@ -126,7 +126,8 @@
     }
     }
 
 
     &.edit-dialog {
     &.edit-dialog {
-        min-width: 660px;
+        min-width: 750px;
+        min-height: 470px;
         background-color: #fff;
         background-color: #fff;
 
 
         * {
         * {
@@ -136,6 +137,10 @@
         .form {
         .form {
             margin: $bigSpace 0 $space;
             margin: $bigSpace 0 $space;
         }
         }
+
+        .btns {
+            padding-top: 40px;
+        }
     }
     }
 
 
     .cascading-address {
     .cascading-address {