fe / YOHOBUYPC · Commits

Go to a project

Authored by biao
Commit 34581d8810458a0a74303f216ae80e15d1032a7a 2 parents eb068562 9ad60d83

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

Inline Side-by-side
Showing 21 changed files with 503 additions and 52 deletions
{{> layout/header}}
<div class="sale-page yoho-page">
<h1>折扣页面</h1>
<div class="sale-page yoho-page center-content">
{{#topBanner}}
{{> index/slide-banner}}
{{/topBanner}}
{{> sale/activity-entry}}
</div>
{{> layout/footer}}
... ...
<div class="slide-container {{#if pagination}}slide-thumb-container{{/if}}">
<div class="slide-wrapper">
<div class="slide-wrapper">
<ul>
{{# list}}
<li style="background:{{bgColor}}">
<li style="{{#if bgColor}}background:{{bgColor}}{{/if}}">
<a href="{{href}}" target= "_blank">
<img class="lazy" data-original="{{img}}" alt="">
</a>
... ... @@ -13,7 +13,7 @@
</div>
{{/ tips}}
</li>
{{/ list}}
{{/ list}}
</ul>
<div class="slide-switch">
<a class="prev" href="javascript:;">
... ... @@ -31,11 +31,11 @@
{{# pagination}}
<li>
<a href="{{href}}" target="_blank"></a>
<img src="{{img}}" alt="">
<img src="{{img}}" alt="">
</li>
{{/ pagination}}
</ul>
</div>
{{/if}}
</div>
<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
\ No newline at end of file
<div class="slide-container-placeholder {{#if pagination}}slide-thumb-container-placeholder{{/if}}"></div>
... ...
... ... @@ -83,8 +83,8 @@
<ul class="sub-nav-list">
{{# subnav}}
<li class="sub-nav-item">
<a href="{{link}}">{{name}} {{#is_new}}<span class="newlogo"></span>{{/is_new}}</a>
{{#if thirdnav}}
<a href="{{link}}">{{name}}</a>
{{#if thirdnav}}
<div class="third-nav-wrapper">
<div class="third-nav">
<div class="categorywrapper" id="category{{../index_main}}{{index_sub}}">
... ... @@ -94,8 +94,9 @@
<h1 class="category-title thirdnavbar">{{title}}</h1>
<ul class="category-list">
{{#branditems}}
<li class="category-item thirdnavbar">
<a href="{{link}}" class="{{hot}}">{{brandname}}</a>
<li class="category-
item thirdnavbar">
<a href="" hot={{hot}}>{{brandname}}</a>
</li>
{{/branditems}}
</ul>
... ... @@ -299,8 +300,7 @@
<script type="text/html" id="tmpl-my-login-new">
<div class="myyoho-info-header clearfix">
\{\{# head_ico \}\}
<div class="myyoho-photo" style="display:none;"><img src="" alt="" data-url ="\{\{it.head_ico\}\}">
</div>
<div class="myyoho-photo" style="display:none;"><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
\{\{/ head_ico\}\}
<h3 class="user-email"><a href="<?php print QConfigs_Site_Config::$site_url?>/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
<h3 class="user-level">
... ...
... ... @@ -68,6 +68,13 @@
</script>
{{/if}}
{{!-- SALE --}}
{{#if saleIndexPage}}
<script>
seajs.use('js/sale/index');
</script>
{{/if}}
{{!-- 登录注册找回密码--}}
{{#if loginPage}}
<script>
... ...
<div class="activity-entry clearfix">
{{#activityEnter}}
<a class="entry-item pull-left {{#if @first}}first{{/if}} {{#if @last}}last{{/if}}" href="link">
<img class="icon pull-left" src="{{icon}}">
<div class="entry-text">
<span class="title">{{title}}</span>
<p class="desc">{{desc}}</p>
</div>
</a>
{{/activityEnter}}
</div>
... ...
... ... @@ -3837,7 +3837,8 @@ define("js/passport/entry", ["jquery","jquery.placeholder"], function(require, e
require("js/passport/reg");
require("js/passport/back");
require("js/passport/login");
require("js/passport/reset");
require("js/passport/reset");
require("js/passport/vertification");
});
define("js/passport/reg", ["jquery"], function(require, exports, module){
/*
... ... @@ -5345,3 +5346,106 @@ $('#pwd, #repwd').keydown(function(e) {
});
});
define("js/passport/vertification", ["jquery"], function(require, exports, module){
/**
* 验证手机
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/12/14
*/
var $ = require("jquery");
var $sc = $('#send-captcha'),
$msgTip = $('#captcha-tip'),
$errTip = $('#err-tip'),
$next = $('#next-step'),
seconds,
itime;
$sc.click(function() {
$.post('/passport/register/authcode', {
mobile: $('#mobile').val(),
area: $('#area').val(),
captcha: $('#captchaPic').val(),
project: 'repassword'
}, function(jsonData) {
if (jsonData.code === 200) {
$errTip.hide();
if ($(this).hasClass('disable')) {
return;
}
seconds = 60;
//$sc.addClass('disable').prop('disabled', true);
$sc.addClass('disable').attr('disabled', true);
$msgTip.removeClass('hide');
$sc.val(seconds-- + '秒后可重新操作');
itime = setInterval(function() {
if (seconds === 0) {
clearInterval(itime);
//$sc.val('发送验证码').removeClass('disable').prop('disabled', false);
$sc.val('发送验证码').removeClass('disable').removeAttr('disabled');
} else {
$sc.val(seconds-- + '秒后可重新操作');
}
}, 1000);
} else {
$(this).addClass('error');
$errTip.removeClass('hide').text('发送失败');
}
});
});
if ($(this).hasClass('disable')) {
return;
}
seconds = 60;
//$sc.addClass('disable').prop('disabled', true);
$sc.addClass('disable').attr('disabled', true);
$msgTip.removeClass('hide');
$sc.val(seconds-- + '秒后可重新操作');
itime = setInterval(function() {
if (seconds === 0) {
clearInterval(itime);
//$sc.val('发送验证码').removeClass('disable').prop('disabled', false);
$sc.val('发送验证码').removeClass('disable').removeAttr('disabled');
} else {
$sc.val(seconds-- + '秒后可重新操作');
}
}, 1000);
$('#captcha').keyup(function() {
var v = $.trim($(this).val());
if (v !== '') {
//添加验证码正确验证
//$next.removeClass('disable').prop('disabled', false);
$next.removeClass('disable').removeAttr('disabled');
} else {
//$next.addClass('disable').prop('disabled', true);
$next.addClass('disable').attr('disabled', true);
}
}).blur(function() {
var v = $.trim($(this).val());
if (v === '') {
//添加验证码正确验证
$(this).addClass('error');
$errTip.removeClass('hide');
} else {
$(this).removeClass('error');
$errTip.addClass('hide');
}
}).focus(function() {
$(this).removeClass('error');
});
});
... ...
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.
... ... @@ -95,20 +95,20 @@ function getShoppingKey() {
}
//YAS统计代码
(function(w, d, s, j, f) {
var a = d.createElement(s);
var m = d.getElementsByTagName(s)[0];
w.YohoAcquisitionObject = f;
w[f] = function() {
w[f].p = arguments;
};
a.async = 1;
a.src = j;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', 'http://cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
//(function(w, d, s, j, f) {
// var a = d.createElement(s);
// var m = d.getElementsByTagName(s)[0];
//
// w.YohoAcquisitionObject = f;
//
// w[f] = function() {
// w[f].p = arguments;
// };
//
// a.async = 1;
// a.src = j;
// m.parentNode.insertBefore(a, m);
//})(window, document, 'script', 'http://cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
(function() {
var uid = getUid();
... ...
... ... @@ -502,6 +502,226 @@ function actionTopLogoAnimate() {
window.setTimeout(fadeAnimate, 3000);
}
}
window.newArr = [];
window.wrapperindex = 0;
window.gindex = 0;
window.targetArr1 = [];
window.targetArr2 = [];
window.targetArr3 = [];
window.oh1 = 0;
window.oh2 = 0;
window.oh3 = 0;
window.valueIndex = 0;
window.nowIndex = 0;
window.inner1 = '';
window.inner2 = '';
window.inner3 = '';
window.finalresult = '';
function createNewArray(obj) {
var $thirdnavpanel = $(obj);
$thirdnavpanel.find('.thirdnavbar').each(function() {
var $that = $(this);
var $alink = $that.find('a');
var _href = $alink.attr('href');
var hottag = $alink.attr('hot') === 'true' ? true : false;
var objt = {};
if ($that.hasClass('category-title')) {
objt = {
type: 'title',
height: 49,
content: $that.text(),
index: window.valueIndex,
href: _href,
hot: false
};
} else {
objt = {
type: 'catlist',
height: 36,
content: $alink.text(),
index: window.valueIndex,
href: _href,
hot: hottag
};
}
window.valueIndex++;
window.newArr.push(objt);
});
}
function createWrapper() {
var arrlength = window.newArr.length;
var i = 0;
var objnew = [];
var aobj = [];
var bobj = [];
var cobj = [];
var final1 = '',
final2 = '',
final3 = '';
var a = 0;
var b = 0;
var c = 0;
for (i; i < arrlength; i++) {
objnew = window.newArr[i];
if (window.gindex === 0) {
window.oh1 = (window.oh1 + objnew.height);
if (window.oh1 >= 340 && i !== (arrlength - 1)) {
window.targetArr1 = window.newArr.slice(0, objnew.index + 1);
window.nowIndex = objnew.index + 1;
window.gindex++;
}
if (i === (arrlength - 1)) {
window.targetArr1 = window.newArr.slice(0, arrlength + 1);
break;
}
}
if (window.gindex === 1) {
window.oh2 = (window.oh2 + objnew.height);
if (window.oh2 >= 340 && i !== (arrlength - 1)) {
window.targetArr2 = window.newArr.slice(window.nowIndex, objnew.index + 1);
window.nowIndex = objnew.index + 1;
window.gindex++;
}
if (i === (arrlength - 1)) {
window.targetArr2 = window.newArr.slice(window.nowIndex, arrlength + 1);
break;
}
}
if (window.gindex === 2) {
window.oh3 = (window.oh3 + objnew.height);
if (window.oh3 >= 340 && i !== (arrlength - 1)) {
window.targetArr3 = window.newArr.slice(window.nowIndex, objnew.index + 1);
window.nowIndex = objnew.index + 1;
window.gindex++;
break;
}
if (i === (arrlength - 1)) {
window.targetArr3 = window.newArr.slice(window.nowIndex, arrlength + 1);
break;
}
}
}
for (a; a < window.targetArr1.length; a++) {
aobj = window.targetArr1[a] || {};
if (aobj.type === 'title') {
window.inner1 = window.inner1 +
'<li class="cattitle"><h3><a href="' +
aobj.href +
'">' +
aobj.content +
'</a></h3></li>';
} else {
if (aobj.hot === true) {
window.inner1 = window.inner1 +
'<li class="catdetail"><a class="thirdcatelink hot" href="' +
aobj.href +
'">' +
aobj.content +
'</a></li>';
} else {
window.inner1 = window.inner1 +
'<li class="catdetail"><a class="thirdcatelink" href="' +
aobj.href + '">' +
aobj.content +
'</a></li>';
}
}
}
for (b; b < window.targetArr2.length; b++) {
bobj = window.targetArr2[b] || {};
if (bobj.type === 'title') {
window.inner2 = (window.inner2 +
'<li class="cattitle"><h3><a href="' +
bobj.href + '">' +
bobj.content +
'</a></h3></li>');
} else {
if (bobj.hot === true) {
window.inner2 = (window.inner2 +
'<li class="catdetail"><a class="thirdcatelink hot" href="' +
bobj.href + '">' + bobj.content + '</a></li>');
} else {
window.inner2 = (window.inner2 +
'<li class="catdetail"><a class="thirdcatelink" href="' +
bobj.href + '">' + bobj.content + '</a></li>');
}
}
}
for (c; c < window.targetArr3.length; c++) {
cobj = window.targetArr3[c] || {};
if (cobj.type === 'title') {
window.inner3 = (window.inner3 +
'<li class="cattitle"><h3><a href="' +
cobj.href +
'">' +
cobj.content +
'</a></h3></li>');
} else {
if (cobj.hot === true) {
window.inner3 = (window.inner3 +
'<li class="catdetail"><a class="thirdcatelink hot" href="' +
cobj.href + '">' +
cobj.content +
'</a></li>');
} else {
window.inner3 = (window.inner3 +
'<li class="catdetail"><a class="thirdcatelink" href="' +
cobj.href + '">' +
cobj.content +
'</a></li>');
}
}
}
if (window.inner1 !== '') {
final1 = '<ul class="cate_row1 cate_row">' +
window.inner1 +
'</ul>';
}
if (window.inner2 !== '') {
final2 = '<ul class="cate_row2 cate_row">' +
window.inner2 +
'</ul>';
}
if (window.inner3 !== '') {
final3 = '<ul class="cate_row3 cate_row">' +
window.inner3 +
'</ul>';
}
window.finalresult = final1 + final2 + final3;
$('#' + window.wrapperindex).empty().append(window.finalresult);
}
function actionNav() {
$('.categorywrapper').each(function(index) {
window.wrapperindex = $(this).attr('id');
window.newArr = [];
window.gindex = 0;
window.targetArr1 = [];
window.targetArr2 = [];
window.targetArr3 = [];
window.oh1 = 0;
window.oh2 = 0;
window.oh3 = 0;
window.valueIndex = 0;
window.nowIndex = 0;
window.inner1 = '';
window.inner2 = '';
window.inner3 = '';
createNewArray($(this).find('.category'));
createWrapper();
});
}
/**
* 查询跳转后保留关键字
* @return {[type]} [description]
... ... @@ -1105,6 +1325,7 @@ function actionLoginInfo() {
* @return {[type]} [description]
*/
function init() {
actionNav(); //处理导航
actionExeTemplate(); //处理模板
actionInitCookie(); //初始化cookie
actionExeCookieMap(); //格式化cookie
... ...
... ... @@ -5,4 +5,5 @@
require('./reg');
require('./back');
require('./login');
require('./reset');
\ No newline at end of file
require('./reset');
require('./vertification');
\ No newline at end of file
... ...
/**
* 首页
* @author: bikai<kia.bi@yoho.cn>
* @date: 2016/1/18
*/
var $ = require('yoho.jquery'),
lazyLoad = require('yoho.lazyload');
require('../common/slider');
lazyLoad($('img.lazy'));
$('.slide-container').slider();
... ...
... ... @@ -532,7 +532,7 @@
.third-nav-wrapper {
box-sizing: border-box;
height: 300px;
height: 410px;
position: absolute;
left: 0;
top: 38px;
... ... @@ -602,8 +602,8 @@
box-sizing: border-box;
padding-left: 19px;
padding-right: 19px;
width: 268px;
height: 100%;
width: 337px;
height: 250px;
float: right;
}
... ... @@ -945,12 +945,12 @@
.showdetail img {
display: block;
box-sizing: border-box;
width: 226px;
height: 200px;
width: 337px;
height: 250px;
}
.showdetail .title {
display: block;
margin-top: 17px;
margin-top: 40px;
width: 100%;
height: 15px;
text-align: center;
... ...
@charset "utf-8";
@import "compass",
@import "compass",
"compass/reset",
"header",
"footer",
... ... @@ -9,7 +9,7 @@
"pager";
body {
font-family: arial,"Microsoft YaHei";
font-family: arial,"Microsoft YaHei";
}
@font-face {
... ... @@ -38,10 +38,10 @@ body {
}
.clearfix:after {
clear: both;
clear: both;
}
.clearfix {
.clearfix {
*zoom: 1;
}
... ... @@ -86,4 +86,4 @@ input,textarea {
}
}
@import "home/index", "product/index", "guang/index", "passport/index", "error","order/index";
@import "home/index", "product/index", "guang/index", "passport/index", "error", "order/index", "sale/index";
... ...
.sale-page {
margin-top: 10px;
.slide-container {
position: relative;
height: 450px;
overflow: hidden;
}
.activity-entry {
margin: 10px 0;
.entry-item {
display: block;
width: 377px;
margin-right: 10px;
padding: 24px 0;
background: #f5f5f5;
&.first,
&.last {
width: 376px;
}
&.last {
margin-right: 0;
}
}
.entry-text {
padding-left: 160px;
font-size: 16px;
}
.icon {
width: 72px;
height: 72px;
margin-left: 48px;
}
.title {
font-size: 26px;
font-weight: bold;
line-height: 48px;
}
}
}
... ...
<?php
/**
* 启动运行
*
*
* @name Bootstrap
* @author fei.hong
* @desc 所有在Bootstrap类中, 以_init开头的方法, 都会被Yaf调用,
... ... @@ -54,7 +54,7 @@ class Bootstrap extends Bootstrap_Abstract
// */
// public function _initPlugin(Dispatcher $dispatcher)
// {
//
//
// }
/**
... ... @@ -77,6 +77,7 @@ class Bootstrap extends Bootstrap_Abstract
case 'www': // 主站
case 'new': // 原新版
case 'dev': // 开发环境
case 'web':
break;
case 'search': // 搜索
$searchRequest = new Yaf\Request\Http('/product/search/index');
... ... @@ -89,10 +90,10 @@ class Bootstrap extends Bootstrap_Abstract
$module = 'Product';
$url = strtolower($dispatcher->getRequest()->getRequestUri());
//list列表的index
if(empty($url) || $url == '/index') {
$listRequest = new Yaf\Request\Http('/product/list/index');
$dispatcher->setRequest($listRequest);
}
if(empty($url) || $url == '/index' || $url == '/') {
$listRequest = new Yaf\Request\Http('/product/list/index');
$dispatcher->setRequest($listRequest);
}
break;
case 'sale'://促销
$module = 'Product';
... ... @@ -135,7 +136,7 @@ class Bootstrap extends Bootstrap_Abstract
$layout = new TemplateLayout();
$layout->setScriptPath($this->_config->application->template->path);
$dispatcher->setView($layout);
//}
//}
}
// /**
... ...
... ... @@ -18,4 +18,4 @@ class LifestyleController extends WebAction
);
$this->_view->display('index', $data);
}
}
\ No newline at end of file
}
... ...
... ... @@ -79,8 +79,8 @@ class HomeModel
'is_new' => $val['is_new'] == 'Y' ? true : false,
// 'subnav' => array()
);
$index_sub = 0;
foreach ($val['sub'] as $sub) { // 二级
$index_sub = 0;
$subnav = array(
'name' => $sub['sort_name'],
'name_en' => $sub['sort_name_en'],
... ...
... ... @@ -205,6 +205,7 @@ class BackController extends WebAction {
$code = AuthCode::encode ( $str, PassportModel::BACK_FIND_SECRET_KEY );
$url = '/passport/back/backcode?code=' . base64_encode ( $code );
$this->redirect ( SITE_MAIN . $url );
return true;
}
}
//出错直接跳到找回密码页
... ...
... ... @@ -2,16 +2,57 @@
// 前端开发添加的路由，对应需求 http://redmine.yoho.cn/issues/143, 后端开发完删除
// 首页 毕凯，赵彪
// 列表页 王成龙
use Action\AbstractAction;
use Action\WebAction;
use Plugin\Helpers;
class Sale1Controller extends AbstractAction
class Sale1Controller extends WebAction
{
public function indexAction()
{
$data = array(
'salePage' => true
'saleIndexPage' => true,
'topBanner' => array(
'list' => array(
array(
'href' => 'http://www.yohobuy.com',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/23/03/01cd0659953f9f213213839c971406413c.jpg?imageView/1/w/1150/h/450'
),
array(
'href' => 'http://www.yohobuy.com',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/23/03/01c571ce38e5d6cf5a0077bd11593bbdfe.jpg?imageView/1/w/1150/h/450'
),
array(
'href' => 'http://www.yohobuy.com',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/23/03/01cd0659953f9f213213839c971406413c.jpg?imageView/1/w/1150/h/450'
),
array(
'href' => 'http://www.yohobuy.com',
'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/23/03/01c571ce38e5d6cf5a0077bd11593bbdfe.jpg?imageView/1/w/1150/h/450'
)
)
),
'activityEnter' => array(
array(
'icon' => '',
'title' => 'VIP会员专享',
'desc' => 'Only for VIP',
'link' => 'http://www.yohobuy.com'
),
array(
'icon' => '',
'title' => '断码区',
'desc' => 'Discount',
'link' => 'http://www.yohobuy.com'
),
array(
'icon' => '',
'title' => '最新降价',
'desc' => 'Off Price',
'link' => 'http://www.yohobuy.com'
)
)
);
$this->setWebNavHeader();
$this->_view->display('index', $data);
}
... ...