Authored by Rock Zhang

Merge branch 'develop/wap' into beta/wap

@@ -117,7 +117,7 @@ class GirldayController extends HuodongAction @@ -117,7 +117,7 @@ class GirldayController extends HuodongAction
117 case 'testing': // 测试 117 case 'testing': // 测试
118 case 'develop': // 开发 118 case 'develop': // 开发
119 default: 119 default:
120 - return 90; 120 + return 490;
121 } 121 }
122 } 122 }
123 123
@@ -15,7 +15,7 @@ use WebPlugin\Helpers; @@ -15,7 +15,7 @@ use WebPlugin\Helpers;
15 class GirldayController extends HuodongAction 15 class GirldayController extends HuodongAction
16 { 16 {
17 // const STATIC_FILE = 'http://localhost:2222/1.0.0'; 17 // const STATIC_FILE = 'http://localhost:2222/1.0.0';
18 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.0'; 18 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2-web/1.0.1';
19 /** 19 /**
20 * 检测登录状态 20 * 检测登录状态
21 * 21 *
@@ -59,7 +59,7 @@ class GirldayController extends HuodongAction @@ -59,7 +59,7 @@ class GirldayController extends HuodongAction
59 case 'testing': // 测试 59 case 'testing': // 测试
60 case 'develop': // 开发 60 case 'develop': // 开发
61 default: 61 default:
62 - return 90; 62 + return 490;
63 } 63 }
64 } 64 }
65 65