chenchao / YOHOBUYPC · Commits

Go to a project

Authored by 郭成尧
Commit af441a54b0798ce0205b5743f5b337758fc5d135 2 parents edb30f41 78e5ca06

'和master'

Inline Side-by-side
Showing 10 changed files with 19 additions and 17 deletions
@@ -22,21 +22,21 @@ class Yohobuy @@ -22,21 +22,21 @@ class Yohobuy
22 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 22 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
23 23
24 //java API 24 //java API
25 - // const API_URL = 'http://api.yoho.yohoops.org/';//  
26 - // const API_URL2 = 'http://api.yoho.yohoops.org/';//  
27 - // const SERVICE_URL = 'http://service.yoho.yohoops.org/';  
28 - // const YOHOBUY_URL = 'http://www.yohobuy.com/';  
29 - // const API_OLD = 'http://api2.open.yohobuy.com/';  
30 -//// 支付回调地址  
31 - // const SERVICE_NOTIFY = 'http://service.yoho.cn/'; 25 + const API_URL = 'http://api.yoho.yohoops.org/';//
  26 + const API_URL2 = 'http://api.yoho.yohoops.org/';//
  27 + const SERVICE_URL = 'http://service.yoho.yohoops.org/';
  28 + const YOHOBUY_URL = 'http://www.yohobuy.com/';
  29 + const API_OLD = 'http://api2.open.yohobuy.com/';
  30 +// 支付回调地址
  31 + const SERVICE_NOTIFY = 'http://service.yoho.cn/';
32 32
33 // 测试环境 */ 33 // 测试环境 */
34 - const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/' 34 + /*const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
35 const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; 35 const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
36 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 36 const YOHOBUY_URL = 'http://www.yohobuy.com/';
37 const API_OLD = 'http://test2.open.yohobuy.com/'; 37 const API_OLD = 'http://test2.open.yohobuy.com/';
38 // 支付回调地址 38 // 支付回调地址
39 - const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/'; 39 + const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';*/
40 40
41 /* 预览环境 */ 41 /* 预览环境 */
42 // const API_URL = 'http://preapi.yoho.cn/'; 42 // const API_URL = 'http://preapi.yoho.cn/';
@@ -94,7 +94,7 @@ if ($refundInfo.length) { @@ -94,7 +94,7 @@ if ($refundInfo.length) {
94 setBackInput($(this).val() * 1); 94 setBackInput($(this).val() * 1);
95 } 95 }
96 }); 96 });
97 -} else { 97 +} else if (defaultArea) {
98 syncRefundMode(defaultArea); 98 syncRefundMode(defaultArea);
99 } 99 }
100 100
1 { 1 {
2 "name": "web-yohobuy", 2 "name": "web-yohobuy",
3 - "version": "0.0.29", 3 + "version": "0.0.30",
4 "description": "web yohobuy static", 4 "description": "web yohobuy static",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -287,7 +287,7 @@ class ReturnsModel @@ -287,7 +287,7 @@ class ReturnsModel
287 if (!empty($value['cn_alphabet'])) { 287 if (!empty($value['cn_alphabet'])) {
288 $cnAlphabet = $value['cn_alphabet']; 288 $cnAlphabet = $value['cn_alphabet'];
289 } 289 }
290 - $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet); 290 + $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
291 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60); 291 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
292 $result['goods'][$key]['name'] = $value['product_name']; 292 $result['goods'][$key]['name'] = $value['product_name'];
293 $result['goods'][$key]['color'] = $value['color_name']; 293 $result['goods'][$key]['color'] = $value['color_name'];
@@ -354,7 +354,7 @@ class ReturnsModel @@ -354,7 +354,7 @@ class ReturnsModel
354 if (!empty($value['cn_alphabet'])) { 354 if (!empty($value['cn_alphabet'])) {
355 $cnAlphabet = $value['cn_alphabet']; 355 $cnAlphabet = $value['cn_alphabet'];
356 } 356 }
357 - $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet); 357 + $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
358 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60); 358 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
359 $result['goods'][$key]['name'] = $value['product_name']; 359 $result['goods'][$key]['name'] = $value['product_name'];
360 $result['goods'][$key]['color'] = $value['color_name']; 360 $result['goods'][$key]['color'] = $value['color_name'];
@@ -46,6 +46,8 @@ class IndexController extends WebAction @@ -46,6 +46,8 @@ class IndexController extends WebAction
46 $result['shopTemplateType'] = $shopIntro['shopTemplateType']; 46 $result['shopTemplateType'] = $shopIntro['shopTemplateType'];
47 $result['multBrandShopType'] = $shopIntro['multBrandShopType']; 47 $result['multBrandShopType'] = $shopIntro['multBrandShopType'];
48 $result['shopId'] = $shopIntro['shopId']; 48 $result['shopId'] = $shopIntro['shopId'];
  49 + $result['brandNameEn'] = '';
  50 + $result['brandNameCn'] = $shopIntro['brandName'];
49 break; 51 break;
50 } 52 }
51 $this->shopHome($shopId); 53 $this->shopHome($shopId);
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "0.0.29" 53 +application.version = "0.0.30"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "0.0.29" 53 +application.version = "0.0.30"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "0.0.29" 53 +application.version = "0.0.30"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets/web" 50 application.assets.path = ROOT_PATH "/assets/web"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "0.0.29" 53 +application.version = "0.0.30"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"