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

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

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

@@ -31,25 +31,25 @@ function shareBase(options) {
     switch (defOption.channel) {
         case 'weibo':
             openUrl = 'http://service.weibo.com/share/share.php?url=' + defOption.url + '&title=' +
-                defOption.title + '&appkey=3739328910&searchPic=true&pic=' + defOption.image;
+                defOption.title + '&appkey=3739328910&searchPic=true&pic=https:' + defOption.image;
             break;
         case 'tweibo':
             openUrl = 'http://share.v.t.qq.com/index.php?c=share&a=index&url=' + defOption.url + '&title=' +
-                defOption.title + '&appkey=c0af9c29e0900813028c2ccb42021792&pic=' + defOption.image;
+                defOption.title + '&appkey=c0af9c29e0900813028c2ccb42021792&pic=https:' + defOption.image;
             break;
         case 'qzone':
             openUrl = 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=' + defOption.url + '&title=' +
-                defOption.title + '&desc=&summary=' + defOption.desc + '&site=YOHO!有货&pics=' + defOption.image;
+                defOption.title + '&desc=&summary=' + defOption.desc + '&site=YOHO!有货&pics=https:' + defOption.image;
             break;
         case 'renren':
             openUrl = 'http://widget.renren.com/dialog/share?resourceUrl=' + defOption.url + '&srcUrl=' +
                 defOption.url + '&desc=' + defOption.desc + '&title=' + defOption.title + '&description=' +
-                defOption.desc + '&pic=' + defOption.image;
+                defOption.desc + '&pic=https:' + defOption.image;
             break;
         case 'qq':
             openUrl = 'http://connect.qq.com/widget/shareqq/index.html?url=' + defOption.url + '&desc=' +
                 defOption.desc + '&title=' + defOption.title.replace('%', '') + '&desc=&summary=' +
-                defOption.desc + '&site=YOHO!有货&pics=' + defOption.image;
+                defOption.desc + '&site=YOHO!有货&pics=http:' + defOption.image;
             break;
         case 'weixin':
             // console.log(defOption.weixinUrl)

@@ -50,7 +50,7 @@ var Util = {
     refreshCart: function(data, callback) {
         $('#cart_content').html(data.hasGoods ? cartTpl(data) : emptyCartTpl);
 
-        $('.brand-name, .pro-name a').dotdotdot({
+        $('.pro-name a').dotdotdot({
             wrap: 'letter'
         });
 

@@ -73,6 +73,7 @@
         position: relative;
         padding-top: 40px;
         padding-bottom: 20px;
+        margin: 0 auto; /* IE8 */
 
         .title {
             font-size: 22px;

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