'和master'

@@ -22,21 +22,21 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     //java API
-    // const API_URL = 'http://api.yoho.yohoops.org/';//
-    // const API_URL2 = 'http://api.yoho.yohoops.org/';//
-    // const SERVICE_URL = 'http://service.yoho.yohoops.org/';
-    // const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    // const API_OLD = 'http://api2.open.yohobuy.com/';
-//// 支付回调地址
-    // const SERVICE_NOTIFY = 'http://service.yoho.cn/';
+     const API_URL = 'http://api.yoho.yohoops.org/';//
+     const API_URL2 = 'http://api.yoho.yohoops.org/';//
+     const SERVICE_URL = 'http://service.yoho.yohoops.org/';
+     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+     const API_OLD = 'http://api2.open.yohobuy.com/';
+// 支付回调地址
+     const SERVICE_NOTIFY = 'http://service.yoho.cn/';
     
     // 测试环境 */
-    const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
+    /*const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const API_OLD = 'http://test2.open.yohobuy.com/';
 //   支付回调地址
-   const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
+   const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';*/
 
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';

@@ -94,7 +94,7 @@ if ($refundInfo.length) {
             setBackInput($(this).val() * 1);
         }
     });
-} else {
+} else if (defaultArea) {
     syncRefundMode(defaultArea);
 }
 

 {
   "name": "web-yohobuy",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",

@@ -287,7 +287,7 @@ class ReturnsModel
                 if (!empty($value['cn_alphabet'])) {
                     $cnAlphabet = $value['cn_alphabet'];
                 }
-                $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet);
+                $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
                 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
                 $result['goods'][$key]['name'] = $value['product_name'];
                 $result['goods'][$key]['color'] = $value['color_name'];
@@ -354,7 +354,7 @@ class ReturnsModel
                 if (!empty($value['cn_alphabet'])) {
                     $cnAlphabet = $value['cn_alphabet'];
                 }
-                $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_skn'], $value['goods_id'], $cnAlphabet);
+                $result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
                 $result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'],60,60);
                 $result['goods'][$key]['name'] = $value['product_name'];
                 $result['goods'][$key]['color'] = $value['color_name'];

@@ -46,6 +46,8 @@ class IndexController extends WebAction
                         $result['shopTemplateType'] = $shopIntro['shopTemplateType'];
                         $result['multBrandShopType'] = $shopIntro['multBrandShopType'];
                         $result['shopId'] = $shopIntro['shopId'];
+                        $result['brandNameEn'] = '';
+                        $result['brandNameCn'] = $shopIntro['brandName'];
                         break;
                     }
                     $this->shopHome($shopId);

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "0.0.29"
+application.version = "0.0.30"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "0.0.29"
+application.version = "0.0.30"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "0.0.29"
+application.version = "0.0.30"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "0.0.29"
+application.version = "0.0.30"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"