fe / yoho-blk · Commits

Go to a project

Authored by biao
Commit 9eb8cf107f845fda604d69d75f1c17691793da3a 2 parents 89239bc4 5d24de35

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

Inline Side-by-side
Showing 6 changed files with 23 additions and 21 deletions
@@ -29,19 +29,15 @@ @@ -29,19 +29,15 @@
29 {{# content}} 29 {{# content}}
30 {{# singleImage}} 30 {{# singleImage}}
31 {{# data}} 31 {{# data}}
32 - <span class="article-pictwo">  
33 <img src="{{image src 930 660 1}}"> 32 <img src="{{image src 930 660 1}}">
34 - </span>  
35 {{/ data}} 33 {{/ data}}
36 {{/ singleImage}} 34 {{/ singleImage}}
37 {{# smallPic}} 35 {{# smallPic}}
38 - <span class="article-pictwo">  
39 - {{!-- <div class="img-center"> --}}  
40 - {{# data}}  
41 - <img src="{{image src 460 660 1}}">  
42 - {{/ data}}  
43 - {{!-- </div> --}}  
44 - </span> 36 + <span class="article-pictwo">
  37 + {{# data}}
  38 + <img src="{{image src 460 660 1}}">
  39 + {{/ data}}
  40 + </span>
45 {{/ smallPic}} 41 {{/ smallPic}}
46 {{# text}} 42 {{# text}}
47 <div class="article-text block"> 43 <div class="article-text block">
@@ -18,7 +18,7 @@ var $commentList = $commentArea.find('.comments-wrap'), @@ -18,7 +18,7 @@ var $commentList = $commentArea.find('.comments-wrap'),
18 $wordCountTip = $('#word-count-tip'), 18 $wordCountTip = $('#word-count-tip'),
19 _alert = dialog.Alert, 19 _alert = dialog.Alert,
20 tag = $('#tags').find('li').length, 20 tag = $('#tags').find('li').length,
21 - leng = $('.goods').find('.good-info').length / 4, 21 + leng = Math.ceil($('.goods').find('.good-info').length / 4),
22 pag = 0, 22 pag = 0,
23 pre = $('.chapter-left').find('a'), 23 pre = $('.chapter-left').find('a'),
24 next = $('.chapter-right').find('a'); 24 next = $('.chapter-right').find('a');
@@ -31,25 +31,25 @@ function shareBase(options) { @@ -31,25 +31,25 @@ function shareBase(options) {
31 switch (defOption.channel) { 31 switch (defOption.channel) {
32 case 'weibo': 32 case 'weibo':
33 openUrl = 'http://service.weibo.com/share/share.php?url=' + defOption.url + '&title=' + 33 openUrl = 'http://service.weibo.com/share/share.php?url=' + defOption.url + '&title=' +
34 - defOption.title + '&appkey=3739328910&searchPic=true&pic=' + defOption.image; 34 + defOption.title + '&appkey=3739328910&searchPic=true&pic=https:' + defOption.image;
35 break; 35 break;
36 case 'tweibo': 36 case 'tweibo':
37 openUrl = 'http://share.v.t.qq.com/index.php?c=share&a=index&url=' + defOption.url + '&title=' + 37 openUrl = 'http://share.v.t.qq.com/index.php?c=share&a=index&url=' + defOption.url + '&title=' +
38 - defOption.title + '&appkey=c0af9c29e0900813028c2ccb42021792&pic=' + defOption.image; 38 + defOption.title + '&appkey=c0af9c29e0900813028c2ccb42021792&pic=https:' + defOption.image;
39 break; 39 break;
40 case 'qzone': 40 case 'qzone':
41 openUrl = 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=' + defOption.url + '&title=' + 41 openUrl = 'http://sns.qzone.qq.com/cgi-bin/qzshare/cgi_qzshare_onekey?url=' + defOption.url + '&title=' +
42 - defOption.title + '&desc=&summary=' + defOption.desc + '&site=YOHO!有货&pics=' + defOption.image; 42 + defOption.title + '&desc=&summary=' + defOption.desc + '&site=YOHO!有货&pics=https:' + defOption.image;
43 break; 43 break;
44 case 'renren': 44 case 'renren':
45 openUrl = 'http://widget.renren.com/dialog/share?resourceUrl=' + defOption.url + '&srcUrl=' + 45 openUrl = 'http://widget.renren.com/dialog/share?resourceUrl=' + defOption.url + '&srcUrl=' +
46 defOption.url + '&desc=' + defOption.desc + '&title=' + defOption.title + '&description=' + 46 defOption.url + '&desc=' + defOption.desc + '&title=' + defOption.title + '&description=' +
47 - defOption.desc + '&pic=' + defOption.image; 47 + defOption.desc + '&pic=https:' + defOption.image;
48 break; 48 break;
49 case 'qq': 49 case 'qq':
50 openUrl = 'http://connect.qq.com/widget/shareqq/index.html?url=' + defOption.url + '&desc=' + 50 openUrl = 'http://connect.qq.com/widget/shareqq/index.html?url=' + defOption.url + '&desc=' +
51 defOption.desc + '&title=' + defOption.title.replace('%', '') + '&desc=&summary=' + 51 defOption.desc + '&title=' + defOption.title.replace('%', '') + '&desc=&summary=' +
52 - defOption.desc + '&site=YOHO!有货&pics=' + defOption.image; 52 + defOption.desc + '&site=YOHO!有货&pics=http:' + defOption.image;
53 break; 53 break;
54 case 'weixin': 54 case 'weixin':
55 // console.log(defOption.weixinUrl) 55 // console.log(defOption.weixinUrl)
@@ -50,7 +50,7 @@ var Util = { @@ -50,7 +50,7 @@ var Util = {
50 refreshCart: function(data, callback) { 50 refreshCart: function(data, callback) {
51 $('#cart_content').html(data.hasGoods ? cartTpl(data) : emptyCartTpl); 51 $('#cart_content').html(data.hasGoods ? cartTpl(data) : emptyCartTpl);
52 52
53 - $('.brand-name, .pro-name a').dotdotdot({ 53 + $('.pro-name a').dotdotdot({
54 wrap: 'letter' 54 wrap: 'letter'
55 }); 55 });
56 56
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
73 position: relative; 73 position: relative;
74 padding-top: 40px; 74 padding-top: 40px;
75 padding-bottom: 20px; 75 padding-bottom: 20px;
  76 + margin: 0 auto; /* IE8 */
76 77
77 .title { 78 .title {
78 font-size: 22px; 79 font-size: 22px;
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
20 .article-info { 20 .article-info {
21 width: 580px; 21 width: 580px;
22 margin: 10px auto; 22 margin: 10px auto;
  23 + clear: both;
  24 + margin-bottom: 20px;
23 } 25 }
24 26
25 .article-author { 27 .article-author {
@@ -75,14 +77,19 @@ @@ -75,14 +77,19 @@
75 margin-right: 30px; 77 margin-right: 30px;
76 } 78 }
77 } 79 }
78 -  
79 - .article-pic { 80 + .article-main {
  81 + text-align: center;
  82 + margin: 0 auto;
80 83
81 img { 84 img {
82 max-width: 930px; 85 max-width: 930px;
  86 + display: inherit;
  87 + margin: auto;
83 } 88 }
84 } 89 }
85 90
  91 +
  92 +
86 .article-pictwo { 93 .article-pictwo {
87 max-width: 930px; 94 max-width: 930px;
88 margin: 0 auto; 95 margin: 0 auto;
@@ -91,10 +98,8 @@ @@ -91,10 +98,8 @@
91 98
92 img { 99 img {
93 display: inline-block; 100 display: inline-block;
94 -  
95 max-width: 460px; 101 max-width: 460px;
96 - margin-right: 2px;  
97 - 102 + margin-right: 2px;
98 } 103 }
99 } 104 }
100 105