fe / YOHOBUYWAP · Commits

Go to a project

Authored by 周少峰
Commit 7db682aa96c48e2c2b7577b4e2402263caa5fe70 2 parents 031584d0 fb5324a0

Merge branch 'master' of git.yoho.cn:fe/YOHOBUYWAP

Inline Side-by-side
Showing 17 changed files with 26 additions and 19 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "4.9.02", 3 + "version": "4.9.03",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -42,9 +42,12 @@ @@ -42,9 +42,12 @@
42 color: #fff; 42 color: #fff;
43 } 43 }
44 .new-festival-tag { 44 .new-festival-tag {
45 - width: 90px;  
46 - background-color: #000;  
47 - color: #fff; 45 + color: #000;
  46 + width: 100px;
  47 + background-image: resolve("product/new-festival.png");
  48 + background-repeat: no-repeat;
  49 + background-color: #fff;
  50 + background-size: 100px 28px;
48 } 51 }
49 .limit-tag { 52 .limit-tag {
50 width: 100px; 53 width: 100px;
@@ -144,8 +144,12 @@ $basicBtnC:#eb0313; @@ -144,8 +144,12 @@ $basicBtnC:#eb0313;
144 color: #fff; 144 color: #fff;
145 } 145 }
146 .new-festival-tag { 146 .new-festival-tag {
147 - background-color: #000;  
148 - color: #fff; 147 + color: #000;
  148 + width: 120px;
  149 + background-image: resolve("product/new-festival.png");
  150 + background-repeat: no-repeat;
  151 + background-color: #fff;
  152 + background-size: 120px 38px;
149 } 153 }
150 .yohood-tag { 154 .yohood-tag {
151 background-color: #000; 155 background-color: #000;
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <p class="good-tag sale-tag">SALE</p> 13 <p class="good-tag sale-tag">SALE</p>
14 {{/ is_discount}} 14 {{/ is_discount}}
15 {{# is_yohood}} 15 {{# is_yohood}}
16 - <div class="good-tag running-man-tag">跑男同款</div> 16 + <p class="good-tag new-festival-tag">新品节</p>
17 {{/ is_yohood}} 17 {{/ is_yohood}}
18 {{# is_limited}} 18 {{# is_limited}}
19 <p class="good-tag limit-tag">限量商品</p> 19 <p class="good-tag limit-tag">限量商品</p>
@@ -12,9 +12,9 @@ @@ -12,9 +12,9 @@
12 {{# is_discount}} 12 {{# is_discount}}
13 <p class="good-tag sale-tag">SALE</p> 13 <p class="good-tag sale-tag">SALE</p>
14 {{/ is_discount}} 14 {{/ is_discount}}
15 - {{# is_yohoood}}  
16 - <p class="good-tag running-man-tag">跑男同款</p>  
17 - {{/ is_yohoood}} 15 + {{# is_yohood}}
  16 + <p class="good-tag new-festival-tag">新品节</p>
  17 + {{/ is_yohood}}
18 {{# is_limited}} 18 {{# is_limited}}
19 <p class="good-tag limit-tag">限量商品</p> 19 <p class="good-tag limit-tag">限量商品</p>
20 {{/ is_limited}} 20 {{/ is_limited}}
@@ -83,9 +83,9 @@ class HfController extends AbstractAction @@ -83,9 +83,9 @@ class HfController extends AbstractAction
83 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data'])); 83 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
84 break; 84 break;
85 case '4.9.0': 85 case '4.9.0':
86 - $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/ios/4.9.0/main0826.js';  
87 - $result['data']['patchv'] = '111';  
88 - $result['data']['filecode'] = 'eb9a6b782125f4cd29ca7ece23ab4e4f'; 86 + $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/ios/4.9.0/main0829.js';
  87 + $result['data']['patchv'] = '112';
  88 + $result['data']['filecode'] = '5ec605c71438642b8da76b62af349f96';
89 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data'])); 89 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
90 break; 90 break;
91 default: // 默认 91 default: // 默认
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "4.9.02" 53 +application.version = "4.9.03"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "4.9.02" 53 +application.version = "4.9.03"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "4.9.02" 53 +application.version = "4.9.03"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "4.9.02" 53 +application.version = "4.9.03"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -12,8 +12,8 @@ define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 @@ -12,8 +12,8 @@ define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing'); 12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');
13 define('USE_INTER_FACE_SHUNT', false);//分流开关 13 define('USE_INTER_FACE_SHUNT', false);//分流开关
14 14
15 -define('API_URL', 'http://api-test3.yohops.com:9999/');  
16 -define('SERVICE_URL', 'http://service-test3.yohops.com:9999/'); 15 +define('API_URL', 'http://api-test1.yohops.com:9999/');
  16 +define('SERVICE_URL', 'http://service-test1.yohops.com:9999/');
17 define('YOHOBUY_URL', 'http://www.yohobuy.com/'); 17 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
18 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/'); 18 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');
19 19