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

@@ -121,8 +121,6 @@ class Config_Defines
     	define('SHOW_SITE_MAIN', 'http://show.test.yoho.cn/');
     	define('YOHOBUY_API','http://api.open.yohobuy.com/?');
     	define('SITE_PUBLISH_NEWS_SECRET', '123456');
-    	define('YOHO_WECHAT_APPID', 'wx984e31a227819392');
-    	define('YOHO_WECHAT_APPSECRET', '');
         self::setCache(false, false, false, false);
     }
     

@@ -11,21 +11,8 @@ else
 {
 	$thumb = SITE_IMG.'/pic01.png';
 }
-
 $height = ceil($thumb_size['height'] * (308 / $thumb_size['width']));
 $width = 308;
-/*if($thumb_size['height'] < 308 && $thumb_size['width'] < 308)
-{
-    $height = $thumb_size['height'];
-    $width = $thumb_size['width'];
-    
-    $width = 308;
-}
-else
-{
-    $height = ceil($thumb_size['height'] * (308 / $thumb_size['width']));
-    $width = 308;
-}*/
 ?>
 <div class="<?php !isset($video) ?'fluid-item':'';?>layout-item tiled">
      <div class="image-box">