fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 5107552651bb9d4200a752d9d7c76c732f5f2018 2 parents 64638e31 1b04610f

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 5 changed files with 18 additions and 171 deletions
1 -<!DOCTYPE html>  
2 -<html>  
3 -<head>  
4 - <meta charset="utf-8">  
5 - <title>国际账号登录</title>  
6 - <meta name="keywords" content="">  
7 - <meta name="description" content="">  
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://172.16.6.248:8088/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=/>  
31 - <img src="http://static.dev.yohobuy.com/img/passport/go-back.png">  
32 - </a>  
33 - <p class="title">登录</p>  
34 - </div> <div class="content">  
35 - <div class="select-container row">  
36 - <span class="select-title">国家和地区</span>  
37 - <select id="country-select" class="country-select select in-android-uc">  
38 - <option value=+61 >澳大利亚</option>  
39 - <option value=+82 >韩国</option>  
40 - <option value=+1 >加拿大</option>  
41 - <option value=+60 >马来西亚</option>  
42 - <option value=+1 >美国</option>  
43 - <option value=+81 >日本</option>  
44 - <option value=+65 >新加坡</option>  
45 - <option value=+44 >英国</option>  
46 - <option value=+86 selected>中国</option>  
47 - <option value=+853 >中国澳门</option>  
48 - <option value=+886 >中国台湾</option>  
49 - <option value=+852 >中国香港</option>  
50 - </select>  
51 - <div class="arrow-right"></div>  
52 - </div> <div class="input-container phone-container row has-clear">  
53 - <span id="area-code" class="area-code">+86</span>  
54 - <input id="phone-num" class="input phone-num" type="text" placeholder="手机号" value=>  
55 - </div>  
56 - <div class="input-container row has-eye">  
57 - <input id="pwd" class="pwd input" type="password" placeholder="密码">  
58 - </div>  
59 - <span id="btn-login" class="btn btn-login disble row">登录</span>  
60 - </div>  
61 -</div>  
62 -<script src="http://172.16.6.248:8000/static/js/sea.js?nowrap"></script>  
63 -<script>  
64 - seajs.config({  
65 - base: 'http://172.16.6.248:8000'  
66 - });  
67 -</script>  
68 -  
69 -  
70 -  
71 - <script>  
72 - seajs.use('js/passport/login/interational');  
73 - </script>  
74 -  
75 -  
76 -  
77 -  
78 - <script>  
79 - seajs.use('js/homePage/girls');  
80 -</script></body>  
81 -</html>  
1 -<!DOCTYPE html>  
2 -<html>  
3 -<head>  
4 - <meta charset="utf-8">  
5 - <title>注册</title>  
6 - <meta name="keywords" content="">  
7 - <meta name="description" content="">  
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://172.16.6.248:8088/css/index.css">  
26 -</head>  
27 -<body class=passport-body>  
28 -<div class="reg-page passport-page yoho-page">  
29 - <div class="header">  
30 - <a class="go-back" href=/>  
31 - <img src="http://static.dev.yohobuy.com/img/passport/go-back.png">  
32 - </a>  
33 - <p class="title">注册</p>  
34 - </div> <div class="content">  
35 - <div class="select-container row">  
36 - <span class="select-title">国家和地区</span>  
37 - <select id="country-select" class="country-select select in-android-uc">  
38 - <option value=+61 >澳大利亚</option>  
39 - <option value=+82 >韩国</option>  
40 - <option value=+1 >加拿大</option>  
41 - <option value=+60 >马来西亚</option>  
42 - <option value=+1 >美国</option>  
43 - <option value=+81 >日本</option>  
44 - <option value=+65 >新加坡</option>  
45 - <option value=+44 >英国</option>  
46 - <option value=+86 selected>中国</option>  
47 - <option value=+853 >中国澳门</option>  
48 - <option value=+886 >中国台湾</option>  
49 - <option value=+852 >中国香港</option>  
50 - </select>  
51 - <div class="arrow-right"></div>  
52 - </div> <div class="input-container phone-container row has-clear">  
53 - <span id="area-code" class="area-code">+86</span>  
54 - <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">  
55 - </div>  
56 - <span id="btn-next" class="btn btn-next disable row">下一步</span>  
57 - <p class="register-tip">YOHO!Family账号可登录YOHO!有货、YOHO!Boys、YOHO!Girls及SHOW</p>  
58 - </div>  
59 -</div>  
60 -<script src="http://172.16.6.248:8000/static/js/sea.js?nowrap"></script>  
61 -<script>  
62 - seajs.config({  
63 - base: 'http://172.16.6.248:8000'  
64 - });  
65 -</script>  
66 -  
67 -  
68 - <script>  
69 - seajs.use('js/passport/register/register');  
70 - </script>  
71 -  
72 -  
73 -  
74 -  
75 -  
76 - <script>  
77 - seajs.use('js/homePage/girls');  
78 -</script></body>  
79 -</html>  
@@ -22,7 +22,10 @@ @@ -22,7 +22,10 @@
22 }()); 22 }());
23 })(document, window); 23 })(document, window);
24 </script> 24 </script>
25 - <link rel="stylesheet" href="http://172.16.6.248:8088/css/index.css"> 25 +
  26 +
  27 + <link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
  28 +
26 </head> 29 </head>
27 <body class=passport-body> 30 <body class=passport-body>
28 <div class="login-page passport-page yoho-page"> 31 <div class="login-page passport-page yoho-page">
@@ -47,9 +50,9 @@ @@ -47,9 +50,9 @@
47 <div class="third-party-login"> 50 <div class="third-party-login">
48 <span>其他登录方式</span> 51 <span>其他登录方式</span>
49 <div class="tp-link"> 52 <div class="tp-link">
50 - <a class="alipay" href=></a>  
51 - <a class="weibo" href=></a>  
52 - <a class="qq" href=></a> 53 + <a class="alipay" href=/passport/login/alipay></a>
  54 + <a class="weibo" href=/passport/login/sina></a>
  55 + <a class="qq" href=/passport/login/qq></a>
53 </div> 56 </div>
54 </div> 57 </div>
55 <a class="interational" href=/login.html>Interational Customer</a> 58 <a class="interational" href=/login.html>Interational Customer</a>
@@ -71,12 +74,14 @@ @@ -71,12 +74,14 @@
71 </ul> 74 </ul>
72 </div> 75 </div>
73 </div> 76 </div>
74 -<script src="http://172.16.6.248:8000/static/js/sea.js?nowrap"></script>  
75 -<script> 77 +
  78 +
  79 + <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
  80 + <script>
76 seajs.config({ 81 seajs.config({
77 - base: 'http://172.16.6.248:8000' 82 + base: 'http://localhost:8000/'
78 }); 83 });
79 -</script> 84 + </script>
80 85
81 86
82 87
@@ -85,5 +90,6 @@ @@ -85,5 +90,6 @@
85 </script> 90 </script>
86 91
87 92
  93 +
88 </body> 94 </body>
89 </html> 95 </html>
@@ -22,8 +22,6 @@ class IndexController extends AbstractAction @@ -22,8 +22,6 @@ class IndexController extends AbstractAction
22 $startBanner = $single['data']; 22 $startBanner = $single['data'];
23 } 23 }
24 } 24 }
25 - // 启动频道数据  
26 - $homeChannels = IndexData::getHomeChannels();  
27 // 用户个人信息 25 // 用户个人信息
28 $userProfile = IndexData::getUserProfile(0); 26 $userProfile = IndexData::getUserProfile(0);
29 27
@@ -31,7 +29,7 @@ class IndexController extends AbstractAction @@ -31,7 +29,7 @@ class IndexController extends AbstractAction
31 var_dump($homeChannels);exit; */ 29 var_dump($homeChannels);exit; */
32 30
33 $this->_view->assign('title', 'YOHO!有货'); 31 $this->_view->assign('title', 'YOHO!有货');
34 - $this->_view->display('index', compact('startBanner', 'homeChannels', 'userProfile')); 32 + $this->_view->display('index', compact('startBanner', 'userProfile'));
35 } 33 }
36 34
37 } 35 }
@@ -25,6 +25,9 @@ class LoginController extends AbstractAction @@ -25,6 +25,9 @@ class LoginController extends AbstractAction
25 'showHeaderImg' => true, // 控制显示头部图片 25 'showHeaderImg' => true, // 控制显示头部图片
26 'isPassportPage' => true, // 模板中模块标识 26 'isPassportPage' => true, // 模板中模块标识
27 'registerUrl' => '/reg.html', // 注册的URL链接 27 'registerUrl' => '/reg.html', // 注册的URL链接
  28 + 'aliLoginUrl' => '/passport/login/alipay', // 注册的URL链接
  29 + 'weiboLoginUrl' => '/passport/login/sina', // 注册的URL链接
  30 + 'qqLoginUrl' => '/passport/login/qq', // 注册的URL链接
28 'interationalUrl' => '/login.html', // 国际号登录的URL链接 31 'interationalUrl' => '/login.html', // 国际号登录的URL链接
29 'phoneRetriveUrl' => '/phoneback.html', // 通过手机号找回密码的URL链接 32 'phoneRetriveUrl' => '/phoneback.html', // 通过手机号找回密码的URL链接
30 'emailRetriveUrl' => '/emailback.html', // 通过邮箱找回密码的URL链接 33 'emailRetriveUrl' => '/emailback.html', // 通过邮箱找回密码的URL链接