fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit 7a56632d4821c593736457b8a5a2042d5f8ba772 2 parents d211a197 0e77f74e

Merge branch 'release/4.9.1.0' of git.yoho.cn:fe/YOHOBUYWAP into release/4.9.1.0

Inline Side-by-side
Showing 14 changed files with 58 additions and 23 deletions
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.
... ... @@ -7184,7 +7184,7 @@ var $input = $('#search-input input'),
$buriedpoint = $('.buriedpoint'),
$search = $('#search');
var shopId,sort,brand,outlets;
var shopId,sort,brand,outlets,app_type;
//默认筛选条件
var defaultOpt = require("js/product/query-param");
... ... @@ -7304,7 +7304,8 @@ function getQueryString(name) {
shopId = getQueryString('shop_id');
sort = getQueryString('sort');
outlets = getQueryString('outlets');
age_level = outlets = getQueryString('ageLevel');
age_level = getQueryString('ageLevel');
app_type = getQueryString('app_type');
/**
* 筛选注册的回调，筛选子项点击后逻辑
... ... @@ -7439,6 +7440,10 @@ function search(opt) {
params.outlets = outlets;
}
if (app_type) {
params.app_type = app_type;
}
$.extend(setting, defaultOpt, params);
searching = true;
... ...
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.
... ... @@ -33,7 +33,7 @@ var $input = $('#search-input input'),
$buriedpoint = $('.buriedpoint'),
$search = $('#search');
var shopId,sort,brand,outlets;
var shopId,sort,brand,outlets,app_type;
//默认筛选条件
var defaultOpt = require('./query-param');
... ... @@ -153,7 +153,8 @@ function getQueryString(name) {
shopId = getQueryString('shop_id');
sort = getQueryString('sort');
outlets = getQueryString('outlets');
age_level = outlets = getQueryString('ageLevel');
age_level = getQueryString('ageLevel');
app_type = getQueryString('app_type');
/**
* 筛选注册的回调，筛选子项点击后逻辑
... ... @@ -288,6 +289,10 @@ function search(opt) {
params.outlets = outlets;
}
if (app_type) {
params.app_type = app_type;
}
$.extend(setting, defaultOpt, params);
searching = true;
... ...
... ... @@ -104,6 +104,7 @@
color: #444;
font-size: 22px;
line-height: 30px;
height: 60px;
padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */
}
.price {
... ...
... ... @@ -14,12 +14,10 @@
{{/if}}
<div class="iconfont more-icon tap-hightlight">&#xe604;</div>
</a>
{{^students}}
{{#unless students}}
<a class="students-entry" href="{{verifyUrl}}">学生认证</a>
{{/students}}
{{/isLogin}}
{{^isLogin}}
{{/unless}}
{{^}}
<div class="user-info">
<a class="login-btn" href="{{signinUrl}}">
登录/注册
... ...
... ... @@ -4,12 +4,18 @@
</div>
{{#if students}}
<div class="float-layer students-layer">
<div class="float-layer-left">
<p>快来认证吧，认证通过即可享受专属优惠！</p>
</div>
<a href="{{students}}" class="students-btn">
立即认证
</a>
{{#if oldApp}}
<div class="float-layer-left">
<p>请升级最新APP版本，完成认证</p>
</div>
{{^}}
<div class="float-layer-left">
<p>快来认证吧，认证通过即可享受专属优惠！</p>
</div>
<a href="{{students}}" class="students-btn">
立即认证
</a>
{{/if}}
</div>
{{/if}}
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -34,14 +34,17 @@
</div>
<div class="price {{#if students}}student-price{{/if}}">
{{#if students}}
<span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
<span class="students-price-tag">学生价</span>
<span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
<span class="students-price-tag">学生价</span>
{{#salePrice}}
<span class="market-price">¥{{.}}</span>
{{/salePrice}}
{{^}}
<span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
<span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
{{#price}}
<span class="market-price">¥{{.}}</span>
{{/price}}
{{/if}}
{{#price}}
<span class="market-price">¥{{.}}</span>
{{/price}}
</div>
</div>
</div>
... ...
... ... @@ -67,6 +67,7 @@ class SearchController extends AbstractAction
'ageLevel' => FILTER_DEFAULT,
'p_d' => FILTER_DEFAULT,
'students' => FILTER_DEFAULT,
'app_type' => FILTER_DEFAULT,
'filter_poolId' => FILTER_DEFAULT), false);
if (isset($condition['shop_id'])) {
... ... @@ -243,8 +244,8 @@ class SearchController extends AbstractAction
if (isset($condition['students'])) {
// 获取用户信息判断是否为学生
// 获取用户信息判断是否为学生
$data['students'] = Helpers::url('/activity/student/register');
if ($uid) {
$userInfo = UserData::userData($uid);
... ... @@ -253,8 +254,16 @@ class SearchController extends AbstractAction
}
}
$data['showDownloadApp'] = false;
if ($isApp) {
//判断app版本是否低于4.9.1,用于显示下方的提示
$appVersion = str_replace('.', '', $this->get('app_version'));
if (intval(substr($appVersion, 0, 3)) < 491) {
$data['oldApp'] = true;
}
}
}
$this->_view->display('list', $data);
}
... ... @@ -294,7 +303,8 @@ class SearchController extends AbstractAction
'age_level' => FILTER_DEFAULT,
'page' => FILTER_VALIDATE_INT,
'students' => FILTER_DEFAULT,
'filter_poolId' => FILTER_DEFAULT), false);
'app_type' => FILTER_DEFAULT,
'filter_poolId' => FILTER_DEFAULT), false);
if (!empty($condition['shop_id'])) {
$condition['shop'] = $condition['shop_id'];
... ... @@ -456,6 +466,7 @@ class SearchController extends AbstractAction
'ageLevel' => FILTER_DEFAULT,
'p_d' => FILTER_DEFAULT,
'students' => FILTER_DEFAULT,
'app_type' => FILTER_DEFAULT,
'filter_poolId' => FILTER_DEFAULT
), false);
... ...
... ... @@ -74,6 +74,12 @@ routes.brands.match = "/brands$"
routes.brands.route.module = Category
routes.brands.route.controller = Brand
routes.brands.route.action = Index
; 品牌一览(兼容APP连接)
routes.brand.type = "rewrite"
routes.brand.match = "/brand$"
routes.brand.route.module = Category
routes.brand.route.controller = Brand
routes.brand.route.action = Index
; 品牌一览搜索页
routes.brandsearch.type = "rewrite"
... ...