merge goodSize

@@ -349,7 +349,9 @@ function chosedLength() {
     var $chosedL = $('.block-list li.chosed'),
         infoHtml,
         choosedInfo = $('.choosed-info'),
-        notChoose = $('.not-choose');
+        notChoose = $('.not-choose'),
+        chosedStr = $chosedL.eq(0).html() ? $chosedL.eq(0).html().replace(/(^\s*)|(\s*$)/g, "") : '',
+        strlen = 0;
 
     choosedInfo.removeClass('hide');
 
@@ -357,13 +359,26 @@ function chosedLength() {
         notChoose.addClass('hide');
     }
 
+    for (var i = 0; i < chosedStr.length; i++) {
+        if (chosedStr.charCodeAt(i) > 255) {
+　　　　　　strlen += 2;
+　　　　} else { 
+　　　　　　strlen ++;
+        }
+
+        if (strlen >= 14) {
+            chosedStr = chosedStr.substring(0, i) + '...';
+            break;
+        }
+　　}
+
     if ($chosedL.length === 2) {
         $chosedL.each(function(val) {
 
-            infoHtml = '已选：' + $chosedL.eq(0).html() + '、' + $chosedL.eq(1).html();
-        })
+            infoHtml = '已选：' + chosedStr + '、' + $chosedL.eq(1).html();
+        });
     } else if ($chosedL.length === 1) {
-        infoHtml = '已选：' + $chosedL.eq(0).html();
+        infoHtml = '已选：' + chosedStr;
     } else {
         choosedInfo.addClass('hide');
         notChoose.removeClass('hide');

@@ -20,11 +20,11 @@
 
     .close {
         float: right;
-        font-size: 80%;
         width: 30px;
         height: 30px;
-        margin-right: 6px;
+        margin: 16px 16px 0 0;
         text-align: right;
+        color: #b1b1b1;
     }
 
     .infos {
@@ -45,7 +45,7 @@
 
     .thumb {
         width: 164px;
-        /*height: 228px;*/
+        min-height: 220px;
         position: absolute;
         top: -60px;
         border: 1px solid #e6e6e6;

 {{#cartInfo}}
 <div class="chose-panel">
     <div class="main">
-        <div class="close">X</div>
+        <div class="close iconfont">&#xe626;</div>
         <div class="infos {{#if ../tickets}}tickets-info{{/if}}">
             <div class="basic-info" >
                 {{#thumbs}}