fe / YOHOBUYWAP · Commits

Go to a project

Authored by biao
Commit 49331616653a046a70774bf39a0b7bae45c8ea8f 2 parents de70cb71 feb0592c

Merge remote-tracking branch 'origin/develop/wap' into beta/wap

Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
@@ -41,6 +41,7 @@ class HfController extends AbstractAction @@ -41,6 +41,7 @@ class HfController extends AbstractAction
41 * patchv 当前补丁的版本号，没有就传空 string "100" 41 * patchv 当前补丁的版本号，没有就传空 string "100"
42 * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332" 42 * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332"
43 * ] 43 * ]
  44 + * echo md5(file_get_contents('http://ad.yoho.cn/test/main.js'));
44 */ 45 */
45 public function v1Action() 46 public function v1Action()
46 { 47 {
@@ -50,10 +51,9 @@ class HfController extends AbstractAction @@ -50,10 +51,9 @@ class HfController extends AbstractAction
50 $version = $this->post('app_version'); 51 $version = $this->post('app_version');
51 switch ($version) { 52 switch ($version) {
52 case '4.0.0': // 版本号 53 case '4.0.0': // 版本号
53 - case '3.8.0':  
54 - $result['data']['url'] = 'http://cdn.yoho.cn/analysis/v1/js/om_code.js';  
55 - $result['data']['patchv'] = '100';  
56 - $result['data']['filecode'] = md5('496c71eb82ce76410d5e0b3a74c02b43' . 'yohopatch2016'); 54 + $result['data']['url'] = 'http://ad.yoho.cn/test/main.js';
  55 + $result['data']['patchv'] = '102';
  56 + $result['data']['filecode'] = md5('bae3f6522d7a53436931799ac10f8a40' . 'yohopatch2016');
57 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data'])); 57 $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
58 break; 58 break;
59 default: // 默认 59 default: // 默认
@@ -54,7 +54,7 @@ class GradeModel @@ -54,7 +54,7 @@ class GradeModel
54 //当vip等级升至顶级时，进度条满格 54 //当vip等级升至顶级时，进度条满格
55 $result['vipGrade']['percent'] = 100; 55 $result['vipGrade']['percent'] = 100;
56 } else { 56 } else {
57 - $result['vipGrade']['percent'] = 100 * (round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2)); 57 + $result['vipGrade']['percent'] = 100 * (round($data['grade']['current_year_cost'] / $data['grade']['next_need_cost'], 2));
58 } 58 }
59 59
60 //距离升级所需消费金额 60 //距离升级所需消费金额