fe / YOHOBUYWAP · Commits

Go to a project

Authored by 周少峰
Commit 4f0fd71f672e836af59520772e510be854a1eb95 2 parents e3ca42f9 89fc2dd4

Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

Inline Side-by-side
Showing 10 changed files with 86 additions and 54 deletions
No preview for this file type
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.
@@ -11,6 +11,10 @@ @@ -11,6 +11,10 @@
11 height: 200px; 11 height: 200px;
12 position: relative; 12 position: relative;
13 overflow: hidden; 13 overflow: hidden;
  14 +
  15 + .shop-back-img {
  16 + height: 100%;
  17 + }
14 } 18 }
15 19
16 .logo { 20 .logo {
@@ -107,16 +111,8 @@ @@ -107,16 +111,8 @@
107 } 111 }
108 112
109 .banner-area { 113 .banner-area {
110 - @extend .banner-top;  
111 -  
112 - .banner-swiper ul {  
113 - height: 260px;  
114 - }  
115 -  
116 - .swiper-pagination {  
117 - bottom: 60px;  
118 - }  
119 - 114 + @extend .banner-top;
  115 + margin-bottom: 30px;
120 } 116 }
121 117
122 .hide { 118 .hide {
@@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 {{/if}} 23 {{/if}}
24 - <div class="branner-top" style="background: url({{branerImg}})"> 24 + <div class="branner-top">
  25 + <img class="shop-back-img" src="{{branerImg}}">
25 <img class="logo" src="{{logoImg}}"> 26 <img class="logo" src="{{logoImg}}">
26 <p class="store-name">{{storeName}}</p> 27 <p class="store-name">{{storeName}}</p>
27 <div class="collect"> 28 <div class="collect">
@@ -7,8 +7,8 @@ use Action\AbstractAction; @@ -7,8 +7,8 @@ use Action\AbstractAction;
7 * @name HfController 7 * @name HfController
8 * @package 8 * @package
9 * @copyright yoho.inc 9 * @copyright yoho.inc
10 - * @version 1.0 (2016-2-3 11:34:40)  
11 - * @author fei.hong <fei.hong@yoho.cn> 10 + * @version 1.1 (2016-5-23 9:57:40) 增加android接口
  11 + * @author CL
12 */ 12 */
13 class HfController extends AbstractAction 13 class HfController extends AbstractAction
14 { 14 {
@@ -20,57 +20,92 @@ class HfController extends AbstractAction @@ -20,57 +20,92 @@ class HfController extends AbstractAction
20 * 20 *
21 * 参数列表 21 * 参数列表
22 * ------------------------------------------------------------------------- 22 * -------------------------------------------------------------------------
23 - * 字段 描述 类型 示例  
24 - * app_version 当前版本号 string 3.8.0  
25 - * uid 用户ID string 13423331  
26 - * client_type 用户手机系统:Android,IOS string Android  
27 - * screen_size 屏幕尺寸 string 1080x1920  
28 - * udid 设备唯一码 string 1d123sadao3  
29 - * os_version 设备版本号 string 1d123sadao3  
30 - * patchv 补丁版本号，如果本地没有补丁，传空 string 100 23 + * 字段 描述 类型 示例
  24 + * app_version 当前版本号 string 3.8.0
  25 + * uid 用户ID string 13423331
  26 + * client_type 用户手机系统:Android,IOS string Android
  27 + * screen_size 屏幕尺寸 string 1080x1920
  28 + * udid 设备唯一码 string 1d123sadao3
  29 + * os_version 设备版本号 string 1d123sadao3
  30 + * patchv 补丁版本号，如果本地没有补丁，传空 string 100
31 * 31 *
32 * 返回列表 32 * 返回列表
33 * ------------------------------------------------------------------------- 33 * -------------------------------------------------------------------------
34 - * 字段 描述 类型 示例  
35 - * code 返回的code，200,304等，具体的服务器定义 int 200  
36 - * message 信息 string "Config Success"  
37 - * md5 当前请求的唯一码 string "1234567890123456"  
38 - * data 配置参数数据，参考data列表 object 34 + * 字段 描述 类型 示例
  35 + * code 返回的code，200,304等，具体的服务器定义 int 200
  36 + * message 信息 string "Config Success"
  37 + * md5 当前请求的唯一码 string "1234567890123456"
  38 + * data 配置参数数据，参考data列表 object
39 * [ 39 * [
40 - * url 补丁url地址，没有传空 string http://yohocdn.com/fpath/fpkk.js  
41 - * patchv 当前补丁的版本号，没有就传空 string "100"  
42 - * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332" 40 + * url 补丁url地址，没有传空 string http://yohocdn.com/fpath/fpkk.js
  41 + * patchv 当前补丁的版本号，没有就传空 string "100"
  42 + * filecode md5(md5(文件内容) + "yohopatch2016") string "1233321121212332"
43 * ] 43 * ]
44 * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-4.js')); exit; 44 * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-4.js')); exit;
45 */ 45 */
46 - public function v1Action() 46 + public function v1Action()
47 { 47 {
48 $result = array('code' => 200, 'message' => 'Config Success', 'md5' => '', 'data' => array()); 48 $result = array('code' => 200, 'message' => 'Config Success', 'md5' => '', 'data' => array());
49 -  
50 - // 根据版本号返回补丁文件信息 49 + $clienttype = $this->post('client_type');
51 $version = $this->post('app_version'); 50 $version = $this->post('app_version');
52 - switch ($version) {  
53 -// case '4.0.1': // 版本  
54 -// $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-4.js';  
55 -// $result['data']['patchv'] = '103';  
56 -// $result['data']['filecode'] = md5('f9c03ec39cfb2686d2b778e444fb2306' . 'yohopatch2016');  
57 -// $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));  
58 -// break;  
59 - case '4.0.0': // 版本  
60 - $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js';  
61 - $result['data']['patchv'] = '102';  
62 - $result['data']['filecode'] = md5('dddd71eed2754a53ad843a78587dc1f5' . 'yohopatch2016');  
63 - $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));  
64 - break;  
65 - default: // 默认  
66 - $result['data']['url'] = '';  
67 - $result['data']['patchv'] = '';  
68 - $result['data']['filecode'] = '';  
69 - $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));  
70 - break;  
71 - } 51 +
  52 + $ios = 'ios';
  53 + $android = 'android';
  54 +
  55 + // 根据版本号返回补丁文件信息
  56 +
  57 + if (strcasecmp($clienttype, $ios) == 0){
  58 +
  59 + switch ($version) {
  60 + // case '4.0.1': // 版本
  61 + // $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-4.js';
  62 + // $result['data']['patchv'] = '103';
  63 + // $result['data']['filecode'] = md5('f9c03ec39cfb2686d2b778e444fb2306' . 'yohopatch2016');
  64 + // $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
  65 + // break;
  66 + case '4.0.0': // 版本
  67 + $result['data']['url'] = '';
  68 + $result['data']['patchv'] = '';
  69 + $result['data']['filecode'] = md5('dddd71eed2754a53ad843a78587dc1f5' . 'yohopatch2016');
  70 + $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
  71 + // var_dump('ios 4.0');
  72 + break;
  73 + default: // 默认
  74 + $result['data']['url'] = '';
  75 + $result['data']['patchv'] = '';
  76 + $result['data']['filecode'] = '';
  77 + $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
  78 + // var_dump('ios 4.1');
  79 + break;
  80 + }
72 81
73 - $this->echoJson($result); 82 + }
  83 + else if (strcasecmp($clienttype, $android) == 0){
  84 +
  85 + switch ($version) {
  86 + case '4.4.0': // 版本
  87 + $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/a/4.3.0/201605191600.apatch';
  88 + $result['data']['patchv'] = '103';
  89 + $result['data']['filecode'] = md5('c1edcb91fc0eb56a4699e0b31e942d06' . 'yohopatch2016');
  90 + $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
  91 + // var_dump('android 4.3.0');
  92 + break;
  93 + default: // 默认
  94 + $result['data']['url'] = '';
  95 + $result['data']['patchv'] = '';
  96 + $result['data']['filecode'] = '';
  97 + $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
  98 + // var_dump('android noversion');
  99 + break;
  100 + }
  101 +
  102 + }
  103 + else
  104 + {
  105 + // var_dump('no found app clienttype');
  106 +
  107 + }
  108 + $this->echoJson($result);
74 } 109 }
75 110
76 } 111 }
@@ -151,7 +151,7 @@ class NewsaleController extends AbstractAction @@ -151,7 +151,7 @@ class NewsaleController extends AbstractAction
151 $channel = Helpers::getChannelByCookie(); 151 $channel = Helpers::getChannelByCookie();
152 152
153 $data = NewsaleData::selectNewSaleProducts( 153 $data = NewsaleData::selectNewSaleProducts(
154 - $gender, $brand, $sort, $color, $size, $price, $p_d, $channel, $dayLimit, $limit, $page, $order 154 + $gender, $brand, $sort, $color, $size, $price, $p_d, $channel, $dayLimit, $limit, $page, $order, null
155 ); 155 );
156 $result = \Product\NewsaleModel::selectData($data); 156 $result = \Product\NewsaleModel::selectData($data);
157 } 157 }