fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 4fb8a8df3f878238eb77c86cf0c6a27c4741ecfa 2 parents ab4a5f38 f03bece0

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

Inline Side-by-side
Showing 3 changed files with 15 additions and 18 deletions
@@ -25,7 +25,7 @@ class ReturnsData @@ -25,7 +25,7 @@ class ReturnsData
25 $param['page'] = $page; 25 $param['page'] = $page;
26 $param['client_secret'] = Sign::getSign($param); 26 $param['client_secret'] = Sign::getSign($param);
27 27
28 - return Yohobuy::post(yohobuy::API_URL, $param); 28 + return Yohobuy::post(API_URL, $param);
29 } 29 }
30 30
31 31
@@ -44,7 +44,7 @@ class ReturnsData @@ -44,7 +44,7 @@ class ReturnsData
44 $param['uid'] = $uid; 44 $param['uid'] = $uid;
45 $param['client_secret'] = Sign::getSign($param); 45 $param['client_secret'] = Sign::getSign($param);
46 46
47 - return Yohobuy::post(yohobuy::API_URL, $param); 47 + return Yohobuy::post(API_URL, $param);
48 } 48 }
49 49
50 /** 50 /**
@@ -62,7 +62,7 @@ class ReturnsData @@ -62,7 +62,7 @@ class ReturnsData
62 $param['uid'] = $uid; 62 $param['uid'] = $uid;
63 $param['client_secret'] = Sign::getSign($param); 63 $param['client_secret'] = Sign::getSign($param);
64 64
65 - return Yohobuy::post(yohobuy::API_URL, $param); 65 + return Yohobuy::post(API_URL, $param);
66 } 66 }
67 67
68 68
@@ -81,7 +81,7 @@ class ReturnsData @@ -81,7 +81,7 @@ class ReturnsData
81 $param['id'] = $id; 81 $param['id'] = $id;
82 $param['client_secret'] = Sign::getSign($param); 82 $param['client_secret'] = Sign::getSign($param);
83 83
84 - return Yohobuy::post(yohobuy::API_URL, $param); 84 + return Yohobuy::post(API_URL, $param);
85 } 85 }
86 86
87 87
@@ -100,7 +100,7 @@ class ReturnsData @@ -100,7 +100,7 @@ class ReturnsData
100 $param['id'] = $id; 100 $param['id'] = $id;
101 $param['client_secret'] = Sign::getSign($param); 101 $param['client_secret'] = Sign::getSign($param);
102 102
103 - return Yohobuy::post(yohobuy::API_URL, $param); 103 + return Yohobuy::post(API_URL, $param);
104 } 104 }
105 105
106 106
@@ -115,7 +115,7 @@ class ReturnsData @@ -115,7 +115,7 @@ class ReturnsData
115 $param['method'] = 'app.express.getExpressCompany'; 115 $param['method'] = 'app.express.getExpressCompany';
116 $param['client_secret'] = Sign::getSign($param); 116 $param['client_secret'] = Sign::getSign($param);
117 117
118 - return Yohobuy::post(yohobuy::API_URL, $param); 118 + return Yohobuy::post(API_URL, $param);
119 } 119 }
120 120
121 121
@@ -141,7 +141,7 @@ class ReturnsData @@ -141,7 +141,7 @@ class ReturnsData
141 $param['express_company'] = $expressCompany; 141 $param['express_company'] = $expressCompany;
142 $param['client_secret'] = Sign::getSign($param); 142 $param['client_secret'] = Sign::getSign($param);
143 143
144 - return Yohobuy::post(yohobuy::API_URL, $param); 144 + return Yohobuy::post(API_URL, $param);
145 } 145 }
146 146
147 147
@@ -160,7 +160,7 @@ class ReturnsData @@ -160,7 +160,7 @@ class ReturnsData
160 $param['uid'] = $uid; 160 $param['uid'] = $uid;
161 $param['client_secret'] = Sign::getSign($param); 161 $param['client_secret'] = Sign::getSign($param);
162 162
163 - return Yohobuy::post(yohobuy::API_URL, $param); 163 + return Yohobuy::post(API_URL, $param);
164 } 164 }
165 165
166 166
@@ -179,7 +179,7 @@ class ReturnsData @@ -179,7 +179,7 @@ class ReturnsData
179 $param['uid'] = $uid; 179 $param['uid'] = $uid;
180 $param['client_secret'] = Sign::getSign($param); 180 $param['client_secret'] = Sign::getSign($param);
181 181
182 - return Yohobuy::post(yohobuy::API_URL, $param); 182 + return Yohobuy::post(API_URL, $param);
183 } 183 }
184 184
185 /** 185 /**
@@ -201,7 +201,7 @@ class ReturnsData @@ -201,7 +201,7 @@ class ReturnsData
201 $param['payment'] = json_encode($payment); 201 $param['payment'] = json_encode($payment);
202 $param['client_secret'] = Sign::getSign($param); 202 $param['client_secret'] = Sign::getSign($param);
203 203
204 - return Yohobuy::post(yohobuy::API_URL, $param); 204 + return Yohobuy::post(API_URL, $param);
205 } 205 }
206 206
207 /** 207 /**
@@ -233,7 +233,7 @@ class ReturnsData @@ -233,7 +233,7 @@ class ReturnsData
233 $param['delivery_tpye'] = $deliveryType; 233 $param['delivery_tpye'] = $deliveryType;
234 $param['client_secret'] = Sign::getSign($param); 234 $param['client_secret'] = Sign::getSign($param);
235 235
236 - return Yohobuy::post(yohobuy::API_URL, $param); 236 + return Yohobuy::post(API_URL, $param);
237 } 237 }
238 238
239 /** 239 /**
@@ -255,7 +255,7 @@ class ReturnsData @@ -255,7 +255,7 @@ class ReturnsData
255 $param['yh_channel'] = $yhChannel; 255 $param['yh_channel'] = $yhChannel;
256 $param['client_secret'] = Sign::getSign($param); 256 $param['client_secret'] = Sign::getSign($param);
257 257
258 - return Yohobuy::post(yohobuy::API_URL, $param); 258 + return Yohobuy::post(API_URL, $param);
259 } 259 }
260 260
261 261
@@ -272,7 +272,7 @@ class ReturnsData @@ -272,7 +272,7 @@ class ReturnsData
272 $param['product_skn'] = $productSkn; 272 $param['product_skn'] = $productSkn;
273 $param['client_secret'] = Sign::getSign($param); 273 $param['client_secret'] = Sign::getSign($param);
274 274
275 - return Yohobuy::post(yohobuy::API_URL, $param); 275 + return Yohobuy::post(API_URL, $param);
276 } 276 }
277 277
278 /** 278 /**
@@ -65,9 +65,6 @@ class Process @@ -65,9 +65,6 @@ class Process
65 } 65 }
66 $len = count($data['menuNav']['blocks']); 66 $len = count($data['menuNav']['blocks']);
67 foreach ($data['menuNav']['blocks'] as $key => $val) { 67 foreach ($data['menuNav']['blocks'] as $key => $val) {
68 - if ($len <= 2 && $key == 0) {  
69 - $val['img'] = Images::getImageUrl($val['img'], 185, 152, 1);  
70 - }  
71 $val['img'] = Images::getImageUrl($val['img'], 185, 76, 1); 68 $val['img'] = Images::getImageUrl($val['img'], 185, 76, 1);
72 $val['url'] = Helpers::transUrl($val['url'], $type); 69 $val['url'] = Helpers::transUrl($val['url'], $type);
73 $temp['tplrecommend']['keyword'][] = array( 70 $temp['tplrecommend']['keyword'][] = array(
@@ -964,9 +964,9 @@ class Helpers @@ -964,9 +964,9 @@ class Helpers
964 public static function syncUserSession($uid, $refer = '', $callback = 'call') 964 public static function syncUserSession($uid, $refer = '', $callback = 'call')
965 { 965 {
966 if(APPLICATION_ENV == 'production' || APPLICATION_ENV == 'preview') { 966 if(APPLICATION_ENV == 'production' || APPLICATION_ENV == 'preview') {
967 - $domain = '//mapi.yohobuy.com'; 967 + $domain = 'http://mapi.yohobuy.com';
968 } else { 968 } else {
969 - $domain = '//m1.yohobuy.com'; 969 + $domain = 'http://m1.yohobuy.com';
970 } 970 }
971 return $domain.'/Passport/session/index?callback=' . $callback 971 return $domain.'/Passport/session/index?callback=' . $callback
972 . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer; 972 . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;