Merge remote-tracking branch 'remotes/origin/hotfix/master0628'

@@ -25,7 +25,7 @@ class ReturnsData
         $param['page'] = $page;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -44,7 +44,7 @@ class ReturnsData
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
     /**
@@ -62,7 +62,7 @@ class ReturnsData
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -81,7 +81,7 @@ class ReturnsData
         $param['id'] = $id;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -100,7 +100,7 @@ class ReturnsData
         $param['id'] = $id;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -115,7 +115,7 @@ class ReturnsData
         $param['method'] = 'app.express.getExpressCompany';
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -141,7 +141,7 @@ class ReturnsData
         $param['express_company'] = $expressCompany;
         $param['client_secret'] = Sign::getSign($param);
         
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -160,7 +160,7 @@ class ReturnsData
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -179,7 +179,7 @@ class ReturnsData
         $param['uid'] = $uid;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
     /**
@@ -201,7 +201,7 @@ class ReturnsData
         $param['payment'] = json_encode($payment);
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
     /**
@@ -233,7 +233,7 @@ class ReturnsData
         $param['delivery_tpye'] = $deliveryType;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
     /**
@@ -255,7 +255,7 @@ class ReturnsData
         $param['yh_channel'] = $yhChannel;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
 
@@ -272,7 +272,7 @@ class ReturnsData
         $param['product_skn'] = $productSkn;
         $param['client_secret'] = Sign::getSign($param);
 
-        return Yohobuy::post(yohobuy::API_URL, $param);
+        return Yohobuy::post(API_URL, $param);
     }
 
     /**

@@ -65,9 +65,6 @@ class Process
         }
         $len = count($data['menuNav']['blocks']);
         foreach ($data['menuNav']['blocks'] as $key => $val) {
-            if ($len <= 2 && $key == 0) {
-                $val['img'] = Images::getImageUrl($val['img'], 185, 152, 1);
-            }
             $val['img'] = Images::getImageUrl($val['img'], 185, 76, 1);
             $val['url'] = Helpers::transUrl($val['url'], $type);
             $temp['tplrecommend']['keyword'][] = array(

@@ -964,9 +964,9 @@ class Helpers
     public static function syncUserSession($uid, $refer = '', $callback = 'call')
     {
         if(APPLICATION_ENV == 'production' || APPLICATION_ENV == 'preview') {
-            $domain = '//mapi.yohobuy.com';
+            $domain = 'http://mapi.yohobuy.com';
         } else {
-            $domain = '//m1.yohobuy.com';
+            $domain = 'http://m1.yohobuy.com';
         }
         return $domain.'/Passport/session/index?callback=' . $callback
                 . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;