ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 89ba733351a7ae751407d8ba0d33c5dc646cdf8a 2 parents 987513e6 eb3b8635

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Inline Side-by-side
Showing 5 changed files with 7 additions and 7 deletions
@@ -8,6 +8,6 @@ @@ -8,6 +8,6 @@
8 <link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" /> 8 <link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
9 {{/ prevEnvironment}} 9 {{/ prevEnvironment}}
10 {{# prodEnvironment}} 10 {{# prodEnvironment}}
11 -<link rel="stylesheet" type="text/css" href="http://rescdn.yohoboys.com/res/new/girls/css/girls.css" /> 11 +<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/girls.css"/>
12 {{/ prodEnvironment}} 12 {{/ prodEnvironment}}
13 13
1 {{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ devEnvironment}} 1 {{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ devEnvironment}}
2 {{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ testEnvironment}} 2 {{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ testEnvironment}}
3 {{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prevEnvironment}} 3 {{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prevEnvironment}}
4 -{{# prodEnvironment}}http://rescdn.yohoboys.com/res/new/girls/assets/swf/util{{/ prodEnvironment}}  
  4 +{{# prodEnvironment}}http://cdn.yoho.cn/yohogirls-frontend-web/assets/swf/util{{/ prodEnvironment}}
@@ -16,8 +16,8 @@ seajs.use("index"); @@ -16,8 +16,8 @@ seajs.use("index");
16 </script> 16 </script>
17 {{/ prevEnvironment}} 17 {{/ prevEnvironment}}
18 {{# prodEnvironment}} 18 {{# prodEnvironment}}
19 -<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/js/util/seajs.js"></script>  
20 -<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/index.js"></script> 19 +<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
  20 +<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/index.js"></script>
21 <script type="text/javascript"> 21 <script type="text/javascript">
22 seajs.use("index"); 22 seajs.use("index");
23 </script> 23 </script>
1 {{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}} 1 {{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}
2 {{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}} 2 {{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}}
3 {{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}} 3 {{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}}
4 -{{# prodEnvironment}}http://rescdn.yohoboys.com/res/new/girls/assets/images{{/ prodEnvironment}} 4 +{{# prodEnvironment}}http://cdn.yoho.cn/yohogirls-frontend-web/assets/images{{/ prodEnvironment}}
5 5
@@ -16,8 +16,8 @@ seajs.use("index"); @@ -16,8 +16,8 @@ seajs.use("index");
16 </script> 16 </script>
17 {{/ prevEnvironment}} 17 {{/ prevEnvironment}}
18 {{# prodEnvironment}} 18 {{# prodEnvironment}}
19 -<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/js/util/seajs.js"></script>  
20 -<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/index.js"></script> 19 +<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
  20 +<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/index.js"></script>
21 <script type="text/javascript"> 21 <script type="text/javascript">
22 seajs.use("index"); 22 seajs.use("index");
23 </script> 23 </script>