Merge branch 'release/4.5' of git.dev.yoho.cn:web/yohobuywap into release/4.5

@@ -38,7 +38,7 @@ class SearchData
             case 'test':
             case 'test':
             case 'developer':
             case 'developer':
             default:
             default:
-                return 'http://192.168.102.216:8087/yohosearch/search.json';
+                return 'http://192.168.102.216:8080/yohosearch/search.json';
         }
         }
     }
     }
 
 

@@ -82,45 +82,30 @@ class SearchData
             case 'developer':
             case 'developer':
             default:
             default:
                 if ($type == 'sort') {
                 if ($type == 'sort') {
-                    return 'http://192.168.102.216:8087/yohosearch/sortgroup.json';
-//                    return 'http://101.200.31.165/yohosearch/sortgroup.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/sortgroup.json';
+                    return 'http://192.168.102.216:8080/yohosearch/sortgroup.json';
                 }
                 }
                 elseif ($type == 'discount') {
                 elseif ($type == 'discount') {
-                    return 'http://192.168.102.216:8087/yohosearch/discount.json';
-//                    return 'http://101.200.31.165/yohosearch/discount.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/discount.json';
+                    return 'http://192.168.102.216:8080/yohosearch/discount.json';
                 }
                 }
                 elseif ($type == 'recent') {
                 elseif ($type == 'recent') {
-                    return 'http://192.168.102.216:8087/yohosearch/recent.json';
-//                    return 'http://101.200.31.165/yohosearch/recent.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/recent.json';
+                    return 'http://192.168.102.216:8080/yohosearch/recent.json';
                 }
                 }
                 elseif ($type == 'suggest') {
                 elseif ($type == 'suggest') {
-                    return 'http://192.168.102.216:8087/yohosearch/suggest.json';
-//                    return 'http://101.200.31.165/yohosearch/suggest.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/suggest.json';
+                    return 'http://192.168.102.216:8080/yohosearch/suggest.json';
                 }
                 }
                 else if($type == 'new-shelve') {
                 else if($type == 'new-shelve') {
-                    return  'http://192.168.102.216:8087/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json';
-//                    return  'http://182.92.99.119:8080/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json';
+                    return  'http://192.168.102.216:8080/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json';
                 }
                 }
                 elseif ($type == 'shop') {
                 elseif ($type == 'shop') {
-                    return 'http://192.168.102.216:8087/yohosearch/shops.json';
-//                    return 'http://101.200.31.165/yohosearch/shops.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/shops.json';
+                    return 'http://192.168.102.216:8080/yohosearch/shops.json';
                 }
                 }
                 elseif ($type == 'search') {
                 elseif ($type == 'search') {
-                    return 'http://192.168.102.216:8087/yohosearch/search-once.json';
+                    return 'http://192.168.102.216:8080/yohosearch/search-once.json';
                 }
                 }
                 elseif ($type == 'brand') {
                 elseif ($type == 'brand') {
-                    return 'http://192.168.102.216:8087/yohosearch/brand/list.json';
-//                    return 'http://101.200.31.165/yohosearch/brand/list.json';
-//                    return 'http://182.92.99.119:8080/yohosearch/brand/list.json';
+                    return 'http://192.168.102.216:8080/yohosearch/brand/list.json';
                 }
                 }
-                return 'http://192.168.102.216:8087/yohosearch/search.json';//支持shop_id
-            //return 'http://101.200.31.165/yohosearch/search.json';
-//                return 'http://182.92.99.119:8080/yohosearch/search.json';
+                return 'http://192.168.102.216:8080/yohosearch/search.json';;//支持shop_id
         }
         }
     }
     }
 
 

@@ -23,7 +23,7 @@ var jumpToApp = $('#jump-to-app').val();
 
 
 var mIntro, aIntro;
 var mIntro, aIntro;
 
 
-var moreHammer, likeHammer;
+var moreHammer, likeHammer, $goodName, $title;
 
 
 require('../../plugin/wx-share');
 require('../../plugin/wx-share');
 
 
@@ -32,6 +32,15 @@ ellipsis.init();
 //Init LazyLoad
 //Init LazyLoad
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 
+if ($('.good-detail-text .name').length > 0) {
+    $('.good-detail-text .name').each(function() {
+        $goodName = $(this);
+        $title = $goodName.find('a');
+
+        $title[0].mlellipsis(2);
+    });
+}
+
 //文字介绍文字截取
 //文字介绍文字截取
 $intro[0].mlellipsis(3);
 $intro[0].mlellipsis(3);