Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
weiqingting
9 years ago
Commit
ce994ea27dd565791fefdf6f1e4554d75b7d24bf
2 parents
eeef8c34
c34159a9
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
124 additions
and
97 deletions
library/Plugin/HelperSearch.php
static/js/cart/order-ensure.js
template/www.yohobuy.com/partials/passport/register.phtml
template/www.yohobuy.com/partials/product/good.phtml
web-static/js/passport/reg.js
web-static/sass/passport/_register.scss
web-static/sass/product/_good.scss
yohobuy/www.yohobuy.com/application/models/Product/Search.php
yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register1.php
yohobuy/www.yohobuy.com/application/modules/Product/controllers/List.php
library/Plugin/HelperSearch.php
View file @
ce994ea
...
...
@@ -102,15 +102,15 @@ class HelperSearch
$result
[
'opts'
][
'pageCount'
]
=
$data
[
'product'
][
'page_total'
];
$result
[
'opts'
][
'nextHref'
]
=
(
$next
=
self
::
next
(
$data
[
'product'
][
'page_total'
],
$data
[
'product'
][
'filter'
]))
?
$next
[
'href'
]
:
''
;
$result
[
'hasNextPage'
]
=
self
::
next
(
$data
[
'product'
][
'page_total'
]);
//全部折扣
$result
[
'leftContent'
][][
'allDiscount'
]
=
isset
(
$data
[
'discount'
])
?
self
::
getDiscount
(
$data
[
'discount'
][
'discount'
])
:
array
();
//分类条件
$result
[
'filters'
][
'sort'
]
=
isset
(
$data
[
'sort'
])
?
self
::
searchSort
(
$data
[
'sort'
][
'sort'
])
:
array
();
//左侧分类分类
$result
[
'leftContent'
][][
'allSort'
]
=
isset
(
$data
[
'sort'
])
?
self
::
groupSort
(
$data
[
'sort'
][
'sort'
])
:
array
();
//一周新品上架
$result
[
'leftContent'
][][
'newSales'
]
=
isset
(
$data
[
'recent'
])
?
self
::
recentShelve
(
$data
[
'recent'
][
'recent'
])
:
array
();
//全部折扣
$result
[
'leftContent'
][][
'allDiscount'
]
=
isset
(
$data
[
'discount'
])
?
self
::
getDiscount
(
$data
[
'discount'
][
'discount'
])
:
array
();
//总记录数
//总记录数
$result
[
'totalCount'
]
=
$data
[
'product'
][
'total'
];
//品牌店铺信息
$result
[
'shopEntry'
]
=
isset
(
$data
[
'shop'
])
&&
!
empty
(
$data
[
'shop'
])
?
self
::
shop
(
$data
[
'shop'
],
$data
[
'sort'
][
'sort'
])
:
array
();
...
...
static/js/cart/order-ensure.js
View file @
ce994ea
...
...
@@ -86,6 +86,7 @@ $('.invoice').on('touchend', '.checkbox', function() {
if
(
$this
.
hasClass
(
'icon-checkbox'
))
{
$
(
'.invoice'
).
removeClass
(
'focus'
);
}
return
false
;
});
function
orderCompute
(
firstEnter
)
{
...
...
template/www.yohobuy.com/partials/passport/register.phtml
View file @
ce994ea
<div class="register-page">
<!--<form id="register-form" class="register-form" method="POST" action="{{actionUrl}}" autocomplete="off">-->
<ul>
<li class="clearfix">
<select id="region" class="region" name="region">
{{#each region}}
<option {{#if selected}}selected="selected"{{/if}} value="{{areaCode}}">{{name}}</option>
{{/each}}
</select>
</li>
<li class="clearfix" data-index="0">
<span id="country-code" class="country-code">{{location}}</span>
<input value="" id="phone-num" class="input va phone-num" type="text" name="phoneNum" placeholder="请输入手机号码" autocomplete="off">
</li>
<li class="w330 clearfix" data-index="1">
<input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="图形验证码" autocomplete="off" maxlength="4">
<img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
<a class="link change-captcha">换一张</a>
</li>
<li class="clearfix" data-index="2">
<input id="msg-captcha" class="input va msg-captcha" type="text" name="msgCaptcha" placeholder="短信验证码" autocomplete="off" maxlength="4">
<input id="send-captcha" class="btn send-captcha disable" type="button" value="获取短信验证码">
<span id="msg-tip" class="hide msg-tip">短信验证码已发送至您的手机,请查收</span>
</li>
<li class="clearfix" data-index="3">
<input id="pwd" class="input va pwd" name="pwd" placeholder="设置密码" autocomplete="off" maxlength="20" type="password">
<div class="pwd-intensity-container">
<span class="pwd-intensity low">低</span>
<span class="pwd-intensity mid">中</span>
<span class="pwd-intensity high">高</span>
</div>
<div id="pwd-tips" class="hide pwd-tips">
<div class="default" id="pwd-tip1"><i></i>密码只支持6-20位字符</div>
<div class="default" id="pwd-tip2"><i></i>建议由字母、 数字、 符号两种以上组合</div>
</div>
</li>
<ul>
<li class="clearfix">
<select id="region" class="region" name="region">
{{#each region}}
<option {{#if selected}}selected="selected"{{/if}} value="{{areaCode}}">{{name}}</option>
{{/each}}
</select>
</li>
<li class="clearfix" data-index="0">
<span id="country-code" class="country-code">{{location}}</span>
<input value="" id="phone-num" class="input va phone-num" type="text" name="phoneNum" placeholder="请输入手机号码" autocomplete="off">
</li>
<li class="w330 clearfix" data-index="1">
<input id="captcha" class="input va captcha" type="text" name="captcha" placeholder="图形验证码" autocomplete="off" maxlength="4">
<img id="captcha-img" class="captcha-img" src="{{captchaUrl}}" alt="">
<a class="link change-captcha">换一张</a>
</li>
<li class="clearfix" data-index="2">
<input id="msg-captcha" class="input va msg-captcha" type="text" name="msgCaptcha" placeholder="短信验证码" autocomplete="off" maxlength="4">
<input id="send-captcha" class="btn send-captcha disable" type="button" value="获取短信验证码">
<span id="msg-tip" class="hide msg-tip">短信验证码已发送至您的手机,请查收</span>
</li>
<li class="clearfix" data-index="3">
<input id="pwd" class="input va pwd" name="pwd" placeholder="设置密码" autocomplete="off" maxlength="20" type="password">
<div class="pwd-intensity-container">
<span class="pwd-intensity low">低</span>
<span class="pwd-intensity mid">中</span>
<span class="pwd-intensity high">高</span>
</div>
<div id="pwd-tips" class="hide pwd-tips">
<div class="default" id="pwd-tip1"><i></i>密码只支持6-20位字符</div>
<div class="default" id="pwd-tip2"><i></i>建议由字母、 数字、 符号两种以上组合</div>
</div>
</li>
<li class="items-container clearfix">
<input id="agree-terms" class="agree-terms" type="checkbox" checked="">
<span>
我已阅读并同意遵守
<a class="link go-yoho-items" href="{{itemUrl}}">YOHO!有货服务条款</a>
</span>
</li>
<li class="clearfix">
<input name="refer" id="refer" type="hidden" value="{{referUrl}}">
<input id="register-btn" class="btn register-btn disable" type="submit" value="{{regBtnText}}" disabled="">
</li>
{{# loginUrl}}
<li class="quick-login-container">
我已注册YOHO!有货账号
<a class="link go-login" href="{{.}}">完善信息</a>
</li>
{{/loginUrl}}
<li class="items-container clearfix">
<input id="agree-terms" class="agree-terms" type="checkbox" checked="">
<span>
我已阅读并同意遵守
<a class="link go-yoho-items" href="{{itemUrl}}">YOHO!有货服务条款</a>
</span>
</li>
<li class="clearfix">
<input name="refer" id="refer" type="hidden" value="{{referUrl}}">
<input id="register-btn" class="btn register-btn disable" type="submit" value="{{regBtnText}}" disabled="">
</li>
{{# loginUrl}}
<li class="quick-login-container">
我已注册YOHO!有货账号
<a class="link go-login" href="{{.}}">快速登录</a>
</li>
{{/loginUrl}}
{{# skipUrl}}
<li class="skip-user-info">
<a href="{{.}}">跳过此步</a>
</li>
{{/skipUrl}}
{{# skipUrl}}
<li class="skip-user-info">
<a href="{{.}}">跳过此步</a>
</li>
{{/skipUrl}}
</ul>
<div id="err-tip" class="err-tip hide">
<span></span>
<b></b>
</div>
<!--</form>-->
</ul>
<div id="err-tip" class="err-tip hide">
<span></span>
<b></b>
</div>
</div>
\ No newline at end of file
...
...
template/www.yohobuy.com/partials/product/good.phtml
View file @
ce994ea
...
...
@@ -39,12 +39,12 @@
<div class="good-detail-text">
<a href="{{url}}">{{name}}</a>
<p class="price">
<span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
¥{{salePrice}}
</span>
{{# marketPrice}}
<span class="market-price">¥{{.}}</span>
{{/ marketPrice}}
<span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
¥{{salePrice}}
</span>
</p>
</div>
</div>
\ No newline at end of file
...
...
web-static/js/passport/reg.js
View file @
ce994ea
...
...
@@ -29,7 +29,9 @@ var $pwdIntensity = $('.pwd-intensity'),
//signup验证
var
$region
=
$
(
'#country-code'
),
$regionSelect
=
$
(
'#region'
);
$regionSelect
=
$
(
'#region'
),
isPwd
=
false
,
pwdVal
;
setTimeout
(
function
()
{
$pn
.
val
(
''
);
...
...
@@ -43,10 +45,13 @@ setTimeout(function() {
$ca
.
attr
(
'maxlength'
,
caCount
);
//密码规则提示
$pwd
.
focus
(
function
()
{
$pwd
.
focus
(
function
(
event
)
{
$pwdTips
.
removeClass
(
'hide'
);
isPwd
=
true
;
pwdVal
=
$
(
this
).
val
();
}).
blur
(
function
()
{
$pwdTips
.
addClass
(
'hide'
);
isPwd
=
false
;
});
...
...
@@ -509,6 +514,23 @@ exports.init = function(page) {
});
});
// 防止粘贴密码
/*$('#pwd, #repwd').keydown(function (event) {
console.log(event.ctrlKey);
console.log(isPwd);
console.log(event.keyCode);
if (event.ctrlKey && isPwd && event.keyCode === 86) {
$(this).val(pwdVal);
}
});*/
$pwd
[
0
].
onpaste
=
function
()
{
return
false
;
};
//ajax表单提交
$registerBtn
.
click
(
function
()
{
...
...
web-static/sass/passport/_register.scss
View file @
ce994ea
...
...
@@ -27,7 +27,7 @@
outline
:
none
;
}
input
{
input
.input
{
height
:
43px
;
line-height
:
43px
;
font-size
:
16px
;
...
...
@@ -53,28 +53,26 @@
float
:
left
;
}
&
.send-captcha
{
top
:
0
;
background
:
#ff1901
;
position
:
absolute
;
width
:
100px
;
right
:
0
;
font-size
:
12px
;
text-indent
:
0
;
letter-spacing
:
0
;
&
.disable
{
background
:
#555
;
}
}
&
.agree-terms
{
width
:
initial
;
height
:
initial
;
vertical-align
:
middle
;
}
}
input
.send-captcha
{
top
:
0
;
background
:
#ff1901
;
position
:
absolute
;
width
:
100px
;
right
:
0
;
font-size
:
12px
;
text-indent
:
0
;
letter-spacing
:
0
;
&
.disable
{
background
:
#555
;
}
}
.link
{
text-decoration
:
underline
;
color
:
#ff1901
;
...
...
web-static/sass/product/_good.scss
View file @
ce994ea
...
...
@@ -52,6 +52,11 @@
>
.price
{
margin-top
:
10px
;
}
.market-price
{
text-decoration
:
line-through
;
color
:
#999
;
}
}
.col-btn
{
...
...
yohobuy/www.yohobuy.com/application/models/Product/Search.php
View file @
ce994ea
...
...
@@ -102,9 +102,6 @@ class SearchModel
if
(
!
isset
(
$condition
[
'order'
])
||
empty
(
$condition
[
'order'
]))
{
$condition
[
'order'
]
=
's_n_desc'
;
}
if
(
!
isset
(
$condition
[
'p_d'
])
||
empty
(
$condition
[
'p_d'
]))
{
$condition
[
'p_d'
]
=
'0,0.9'
;
}
$options
=
array
(
'imgSize'
=>
$imgSize
,
'minImgSize'
=>
$minImgSize
,
...
...
@@ -168,8 +165,10 @@ class SearchModel
// 组合搜索分类url
$urlList
[
'sort'
]
=
HelperSearch
::
getClassesUrl
(
$searchCondition
[
'condition'
]);
// 组合搜索店铺url
$param
[
'keyword'
]
=
$searchCondition
[
'condition'
][
'query'
];
$urlList
[
'shop'
]
=
HelperSearch
::
getShopUrl
(
$param
);
if
(
isset
(
$param
[
'keyword'
]))
{
$param
[
'keyword'
]
=
$searchCondition
[
'condition'
][
'query'
];
$urlList
[
'shop'
]
=
HelperSearch
::
getShopUrl
(
$param
);
}
//用户浏览记录
//$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
$result
=
Yohobuy
::
getMulti
(
$urlList
,
array
(),
true
);
...
...
yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register1.php
View file @
ce994ea
...
...
@@ -2,7 +2,7 @@
use
Action\AbstractAction
;
class
RegisterController
extends
AbstractAction
class
Register
1
Controller
extends
AbstractAction
{
/**
* 登录页
...
...
@@ -49,7 +49,7 @@ class RegisterController extends AbstractAction
'coverImg'
=>
'http://img12.static.yhbimg.com/yhb-img01/2015/12/01/07/020a0b6e7ff908d0c2bc4045b4fef42b9f.png?imageView/2/w/252/h/190'
)
);
$this
->
_view
->
display
(
'index'
,
$data
);
$this
->
_view
->
display
(
'
../register/
index'
,
$data
);
}
public
function
checkmobileAction
()
...
...
yohobuy/www.yohobuy.com/application/modules/Product/controllers/List.php
View file @
ce994ea
...
...
@@ -17,7 +17,11 @@ class ListController extends WebAction
*/
public
function
saleAction
()
{
$list
=
SearchModel
::
getListData
();
//排序
$condition
[
'order'
]
=
's_n_desc'
;
//打折
$condition
[
'p_d'
]
=
'0,0.9'
;
$list
=
SearchModel
::
getListData
(
$condition
);
$data
=
array
(
//初始化js
'productListPage'
=>
true
,
...
...
Please
register
or
login
to post a comment