fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by hf
Commit bf770ffe3302fc84d18d181af4e7295853a437ae 1 parent 70d6a34b

do home select channel

Inline Side-by-side
Showing 13 changed files with 189 additions and 44 deletions
  1 +<!DOCTYPE html>
  2 +<html>
  3 +<head>
  4 + <meta charset="utf-8">
  5 + <title>YOHO!有货</title>
  6 + <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
  7 + <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
  8 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  9 + <meta http-equiv="cleartype" content="on">
  10 + <meta name="apple-mobile-web-app-status-bar-style" content="black" />
  11 + <meta content="telephone=no" name="format-detection" />
  12 + <meta content="email=no" name="format-detection" />
  13 + <script type="text/javascript">
  14 + (function (doc, win) {
  15 + var docEl = doc.documentElement;
  16 + (function () {
  17 + var clientWidth = docEl.clientWidth;
  18 + if (!clientWidth) {
  19 + return;
  20 + }
  21 + docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
  22 + }());
  23 + })(document, window);
  24 + </script>
  25 + <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
  26 +</head>
  27 +<body >
  28 +
  29 +<div class="index-page yoho-page">
  30 +
  31 + <div class="index-container">
  32 +
  33 + <div class="index-channel">
  34 + <img class="img" src="http://img11.static.yhbimg.com/yhb-img01/2015/10/11/10/018454ab5cb742522f5e667c00a95f737c.jpg?imageView/1/w/640/h/800" alt="">
  35 + <div class="index-channel-list">
  36 + <a href="/boys"><img class="homestyle" src="http://img10.static.yhbimg.com/adpic/2015/09/28/18/01bdbd27952eb5f780ac23641e70fd6e12.png"></a>
  37 + <a href="/girls"><img class="homestyle" src="http://img13.static.yhbimg.com/adpic/2015/09/28/18/025a4056cad1c2b6704a5d7c83066a2d25.png"></a>
  38 + </div>
  39 +
  40 + </div>
  41 +
  42 + </div>
  43 +</div>
  44 +
  45 + <footer class="yoho-footer">
  46 + <p class="op-row">
  47 + <a href="/signin.html">登录</a>
  48 + <span class="sep-line">|</span>
  49 + <a href="/login.html">注册</a>
  50 + <span class="back-to-top">
  51 + Back to top
  52 + <i class="iconfont">&#xe608;</i>
  53 + </span>
  54 + </p>
  55 + <address class="copyright">
  56 + CopyRight©2007-2016 南京新与力文化传播有限公司
  57 + </address>
  58 + </footer>
  59 + <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
  60 + <script>
  61 + seajs.config({
  62 + base: 'http://localhost:8000/'
  63 + });
  64 + </script>
  65 +
  66 +
  67 +
  68 +
  69 +
  70 +
  71 +
  72 +</body>
  73 +</html>
  1 +<!DOCTYPE html>
  2 +<html>
  3 +<head>
  4 + <meta charset="utf-8">
  5 + <title>国际账号登录 | YOHO!有货</title>
  6 + <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
  7 + <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
  8 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  9 + <meta http-equiv="cleartype" content="on">
  10 + <meta name="apple-mobile-web-app-status-bar-style" content="black" />
  11 + <meta content="telephone=no" name="format-detection" />
  12 + <meta content="email=no" name="format-detection" />
  13 + <script type="text/javascript">
  14 + (function (doc, win) {
  15 + var docEl = doc.documentElement;
  16 + (function () {
  17 + var clientWidth = docEl.clientWidth;
  18 + if (!clientWidth) {
  19 + return;
  20 + }
  21 + docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
  22 + }());
  23 + })(document, window);
  24 + </script>
  25 + <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
  26 +</head>
  27 +<body class=passport-body>
  28 +<div class="login-interational-page passport-page yoho-page">
  29 + <div class="header">
  30 + <a class="go-back" href=/></a>
  31 + <p class="title">登录</p>
  32 + </div> <div class="content">
  33 + <div class="select-container row">
  34 + <span class="select-title">国家和地区</span>
  35 + <select id="country-select" class="country-select select in-android-uc">
  36 + <option value=+61 >澳大利亚</option>
  37 + <option value=+82 >韩国</option>
  38 + <option value=+1 >加拿大</option>
  39 + <option value=+60 >马来西亚</option>
  40 + <option value=+1 >美国</option>
  41 + <option value=+81 >日本</option>
  42 + <option value=+65 >新加坡</option>
  43 + <option value=+44 >英国</option>
  44 + <option value=+86 selected>中国</option>
  45 + <option value=+853 >中国澳门</option>
  46 + <option value=+886 >中国台湾</option>
  47 + <option value=+852 >中国香港</option>
  48 + </select>
  49 + <div class="arrow-right"></div>
  50 + </div> <div class="input-container phone-container row has-clear">
  51 + <span id="area-code" class="area-code">+86</span>
  52 + <input id="phone-num" class="input phone-num" type="text" placeholder="手机号" value=>
  53 + </div>
  54 + <div class="input-container row has-eye">
  55 + <input id="pwd" class="pwd input" type="password" placeholder="密码">
  56 + </div>
  57 + <span id="btn-login" class="btn btn-login disble row">登录</span>
  58 + </div>
  59 +</div>
  60 + <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
  61 + <script>
  62 + seajs.config({
  63 + base: 'http://localhost:8000/'
  64 + });
  65 + </script>
  66 +
  67 +
  68 +
  69 + <script>
  70 + seajs.use('js/passport/login/interational');
  71 + </script>
  72 +
  73 +
  74 +
  75 +
  76 +</body>
  77 +</html>
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 - <title>登录</title>  
6 - <meta name="keywords" content="">  
7 - <meta name="description" content=""> 5 + <title>登录 | YOHO!有货</title>
  6 + <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
  7 + <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> 8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
9 <meta http-equiv="cleartype" content="on"> 9 <meta http-equiv="cleartype" content="on">
10 <meta name="apple-mobile-web-app-status-bar-style" content="black" /> 10 <meta name="apple-mobile-web-app-status-bar-style" content="black" />
@@ -22,18 +22,13 @@ @@ -22,18 +22,13 @@
22 }()); 22 }());
23 })(document, window); 23 })(document, window);
24 </script> 24 </script>
25 -  
26 -  
27 <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> 25 <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
28 -  
29 </head> 26 </head>
30 <body class=passport-body> 27 <body class=passport-body>
31 <div class="login-page passport-page yoho-page"> 28 <div class="login-page passport-page yoho-page">
32 <div class="header"> 29 <div class="header">
33 - <a class="go-back" href=/>  
34 - <img src="http://static.dev.yohobuy.com/img/passport/go-back.png">  
35 - </a>  
36 - <img class="img-header" src="http://static.dev.yohobuy.com/img/passport/yoho-family.png"> 30 + <a class="go-back" href=/></a>
  31 + <div class="img-header"></div>
37 </div> <div class="content"> 32 </div> <div class="content">
38 <div class="acc-container input-container row has-clear"> 33 <div class="acc-container input-container row has-clear">
39 <div class="yoho-logo"></div> 34 <div class="yoho-logo"></div>
@@ -74,8 +69,6 @@ @@ -74,8 +69,6 @@
74 </ul> 69 </ul>
75 </div> 70 </div>
76 </div> 71 </div>
77 -  
78 -  
79 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> 72 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
80 <script> 73 <script>
81 seajs.config({ 74 seajs.config({
@@ -91,5 +84,6 @@ @@ -91,5 +84,6 @@
91 84
92 85
93 86
  87 +
94 </body> 88 </body>
95 </html> 89 </html>
@@ -262,16 +262,16 @@ class AbstractAction extends Controller_Abstract @@ -262,16 +262,16 @@ class AbstractAction extends Controller_Abstract
262 $header = array(); 262 $header = array();
263 263
264 if (!empty($backUrl)) { 264 if (!empty($backUrl)) {
265 - $header['pageHeader']['navBack'] = $backUrl; 265 + $header['navBack'] = $backUrl;
266 } 266 }
267 if (!empty($title)) { 267 if (!empty($title)) {
268 - $header['pageHeader']['navTitle'] = $title; 268 + $header['navTitle'] = $title;
269 } 269 }
270 if (!empty($homeUrl)) { 270 if (!empty($homeUrl)) {
271 - $header['pageHeader']['navHome'] = $homeUrl; 271 + $header['navHome'] = $homeUrl;
272 } 272 }
273 273
274 - $this->_view->assign('header', $header); 274 + $this->_view->assign('pageHeader', $header);
275 } 275 }
276 276
277 /** 277 /**
@@ -285,19 +285,19 @@ class AbstractAction extends Controller_Abstract @@ -285,19 +285,19 @@ class AbstractAction extends Controller_Abstract
285 285
286 // 已登录 @todo 286 // 已登录 @todo
287 if (false) { 287 if (false) {
288 - $footer['pageFooter']['user'] = array();  
289 - $footer['pageFooter']['user']['name'] = 'goodboy'; // 昵称  
290 - $footer['pageFooter']['user']['url'] = ''; // 个人中心链接  
291 - $footer['pageFooter']['user']['signoutUrl'] = ''; // 登出链接 288 + $footer['user'] = array();
  289 + $footer['user']['name'] = 'goodboy'; // 昵称
  290 + $footer['user']['url'] = ''; // 个人中心链接
  291 + $footer['user']['signoutUrl'] = ''; // 登出链接
292 } 292 }
293 // 未登录 293 // 未登录
294 else { 294 else {
295 - $footer['pageFooter'] = array();  
296 - $footer['pageFooter']['loginUrl'] = '/signin.html'; // 登录链接  
297 - $footer['pageFooter']['signupUrl'] = '/login.html'; // 注册链接 295 + $footer = array();
  296 + $footer['loginUrl'] = '/signin.html'; // 登录链接
  297 + $footer['signupUrl'] = '/login.html'; // 注册链接
298 } 298 }
299 299
300 - $this->_view->assign('footer', $footer); 300 + $this->_view->assign('pageFooter', $footer);
301 } 301 }
302 302
303 /** 303 /**
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 <div class="index-channel"> 7 <div class="index-channel">
8 <img class="img" src="{{background}}" alt=""> 8 <img class="img" src="{{background}}" alt="">
9 <div class="index-channel-list"> 9 <div class="index-channel-list">
10 - <a href="http://new.m.yohobuy.com/"><img class="homestyle" src="http://img10.static.yhbimg.com/adpic/2015/09/28/18/01bdbd27952eb5f780ac23641e70fd6e12.png"></a>  
11 - <a href="http://new.m.yohobuy.com/girl"><img class="homestyle" src="http://img13.static.yhbimg.com/adpic/2015/09/28/18/025a4056cad1c2b6704a5d7c83066a2d25.png"></a> 10 + <a href="/boys"><img class="homestyle" src="http://img10.static.yhbimg.com/adpic/2015/09/28/18/01bdbd27952eb5f780ac23641e70fd6e12.png"></a>
  11 + <a href="/girls"><img class="homestyle" src="http://img13.static.yhbimg.com/adpic/2015/09/28/18/025a4056cad1c2b6704a5d7c83066a2d25.png"></a>
12 </div> 12 </div>
13 13
14 </div> 14 </div>
1 {{> layout/page_footer}} 1 {{> layout/page_footer}}
2 {{#if rlsEnv}} 2 {{#if rlsEnv}}
3 - <link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js">  
4 - <link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"> 3 + <script src="http://static.wap.yohobuy.com/js/sea.js"></script>
  4 + <script>seajs.config({base:'http://static.wap.yohobuy.com/'});</script>
5 {{/if}} 5 {{/if}}
6 -  
7 -{{#if rlsEnv}} 6 +{{#if testEnv}}
  7 + <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  8 + <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
8 {{/if}} 9 {{/if}}
9 -  
10 {{#if devEnv}} 10 {{#if devEnv}}
11 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> 11 <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
12 <script> 12 <script>
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
23 })(document, window); 23 })(document, window);
24 </script> 24 </script>
25 {{#if rlsEnv}} 25 {{#if rlsEnv}}
26 - <link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css"> 26 + <link rel="stylesheet" href="http://static.wap.yohobuy.com/css/index.css">
27 {{/if}} 27 {{/if}}
28 {{#if testEnv}} 28 {{#if testEnv}}
29 - <link rel="stylesheet" href="http://static.wap.yohobuy.com/css/index.css"> 29 + <link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
30 {{/if}} 30 {{/if}}
31 {{#if devEnv}} 31 {{#if devEnv}}
32 <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> 32 <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
@@ -30,6 +30,8 @@ class BoysController extends AbstractAction @@ -30,6 +30,8 @@ class BoysController extends AbstractAction
30 $data['content'] = FloorProcess::getContent($channelData['data']); 30 $data['content'] = FloorProcess::getContent($channelData['data']);
31 } 31 }
32 32
  33 + $data['maybeLike'] = true;
  34 +
33 $this->_view->display('index', $data); 35 $this->_view->display('index', $data);
34 } 36 }
35 37
@@ -30,6 +30,8 @@ class GirlsController extends AbstractAction @@ -30,6 +30,8 @@ class GirlsController extends AbstractAction
30 $data['content'] = FloorProcess::getContent($channelData['data'], 2); 30 $data['content'] = FloorProcess::getContent($channelData['data'], 2);
31 } 31 }
32 32
  33 + $data['maybeLike'] = true;
  34 +
33 $this->_view->display('index', $data); 35 $this->_view->display('index', $data);
34 } 36 }
35 37
@@ -23,7 +23,6 @@ class IndexController extends AbstractAction @@ -23,7 +23,6 @@ class IndexController extends AbstractAction
23 $data['background'] = Helpers::getImageUrl($banner, 640, 800, 1); 23 $data['background'] = Helpers::getImageUrl($banner, 640, 800, 1);
24 } 24 }
25 25
26 -<<<<<<< HEAD  
27 // 设置底部导航信息 26 // 设置底部导航信息
28 $this->setNavFooter(); 27 $this->setNavFooter();
29 28
@@ -31,12 +30,6 @@ class IndexController extends AbstractAction @@ -31,12 +30,6 @@ class IndexController extends AbstractAction
31 $this->_view->html('index'); 30 $this->_view->html('index');
32 31
33 // 渲染模板 32 // 渲染模板
34 -=======  
35 - //echo '<pre>';  
36 - //print_r($data);exit;  
37 -  
38 - $this->_view->assign('title', 'YOHO!有货');  
39 ->>>>>>> 5df4e9e0657a496745f843a30aa8932a8fe7ce1f  
40 $this->_view->display('index', $data); 33 $this->_view->display('index', $data);
41 } 34 }
42 35
@@ -30,6 +30,8 @@ class KidsController extends AbstractAction @@ -30,6 +30,8 @@ class KidsController extends AbstractAction
30 $data['content'] = FloorProcess::getContent($channelData['data'], 3); 30 $data['content'] = FloorProcess::getContent($channelData['data'], 3);
31 } 31 }
32 32
  33 + $data['maybeLike'] = true;
  34 +
33 $this->_view->display('index', $data); 35 $this->_view->display('index', $data);
34 } 36 }
35 37
@@ -30,6 +30,8 @@ class LifestyleController extends AbstractAction @@ -30,6 +30,8 @@ class LifestyleController extends AbstractAction
30 $data['content'] = FloorProcess::getContent($channelData['data'], 4); 30 $data['content'] = FloorProcess::getContent($channelData['data'], 4);
31 } 31 }
32 32
  33 + $data['maybeLike'] = true;
  34 +
33 $this->_view->display('index', $data); 35 $this->_view->display('index', $data);
34 } 36 }
35 37
@@ -20,10 +20,10 @@ class RecomController extends AbstractAction @@ -20,10 +20,10 @@ class RecomController extends AbstractAction
20 public function maylikeAction() 20 public function maylikeAction()
21 { 21 {
22 do { 22 do {
23 -// /* 判断是否是AJAX请求 */  
24 -// if (!$this->isAjax()) {  
25 -// break;  
26 -// } 23 + /* 判断是否是AJAX请求 */
  24 + if (!$this->isAjax()) {
  25 + break;
  26 + }
27 27
28 /* 判断分页参数是否有效 */ 28 /* 判断分页参数是否有效 */
29 $page = $this->get('page', 1); 29 $page = $this->get('page', 1);