Authored by microTT

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohood into develop

@@ -653,6 +653,30 @@ define('yohood', function(require, exports) { @@ -653,6 +653,30 @@ define('yohood', function(require, exports) {
653 653
654 //详情页资讯 654 //详情页资讯
655 exports.detailNews = function(id) { 655 exports.detailNews = function(id) {
  656 + //截取字符串
  657 + function cutString(str, len) {
  658 + //length属性读出来的汉字长度为1
  659 + if(str.length*2 <= len) {
  660 + return str;
  661 + }
  662 + var strlen = 0;
  663 + var s = "";
  664 + for(var i = 0;i < str.length; i++) {
  665 + s = s + str.charAt(i);
  666 + if (str.charCodeAt(i) > 128) {
  667 + strlen = strlen + 2;
  668 + if(strlen >= len){
  669 + return s.substring(0,s.length-1) + "...";
  670 + }
  671 + } else {
  672 + strlen = strlen + 1;
  673 + if(strlen >= len){
  674 + return s.substring(0,s.length-2) + "...";
  675 + }
  676 + }
  677 + }
  678 + return s;
  679 + }
656 var recom = ''; 680 var recom = '';
657 var hotVideo = ''; 681 var hotVideo = '';
658 var lastNews = ''; 682 var lastNews = '';
@@ -664,7 +688,7 @@ define('yohood', function(require, exports) { @@ -664,7 +688,7 @@ define('yohood', function(require, exports) {
664 } 688 }
665 var d = getLocalTime(create_time); 689 var d = getLocalTime(create_time);
666 var type='<span class="item-time"><?php $en = array("01"=>"January","02"=>"February","03"=>"March","04"=>"April","05"=>"May","06"=>"June","07"=>"July","08"=>"August","09"=>"September","10"=>"October","11"=>"November","12"=>"December");$m=date("m", '+create_time+');echo $en[$m]?>&nbsp;&nbsp;&nbsp;<?php ECHO $m=date("d.Y", '+create_time+')?></span>'; 690 var type='<span class="item-time"><?php $en = array("01"=>"January","02"=>"February","03"=>"March","04"=>"April","05"=>"May","06"=>"June","07"=>"July","08"=>"August","09"=>"September","10"=>"October","11"=>"November","12"=>"December");$m=date("m", '+create_time+');echo $en[$m]?>&nbsp;&nbsp;&nbsp;<?php ECHO $m=date("d.Y", '+create_time+')?></span>';
667 - var title = $('<p>' + title + '</p>').text(); 691 + var title = $('<p>' + cutString(title,60) + '</p>').text();
668 var html = '<div class="layout-item clearfix">' + 692 var html = '<div class="layout-item clearfix">' +
669 '<div class="image-box">' + 693 '<div class="image-box">' +
670 '<a href="' + url + '" target="_blank" title="' + title + '">' + 694 '<a href="' + url + '" target="_blank" title="' + title + '">' +
@@ -74,6 +74,10 @@ @@ -74,6 +74,10 @@
74 </a> 74 </a>
75 <!-- 二级菜单 start --> 75 <!-- 二级菜单 start -->
76 <div class="second-menu"> 76 <div class="second-menu">
  77 + <a href="/news/index">
  78 + <em>全部资讯</em>
  79 + <i></i>
  80 + </a>
77 <a href="/news/index/tag/品牌资讯"> 81 <a href="/news/index/tag/品牌资讯">
78 <em>品牌资讯</em> 82 <em>品牌资讯</em>
79 <i></i> 83 <i></i>