Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
hf
9 years ago
Commit
da2dd89e32be5bb319141af09fe5b8f1404e192d
1 parent
e677bad0
master
...
develop
feature/4LevelAddr
feature/birthCoupon
feature/cartEvent
feature/colorLength
feature/commentImgShow
feature/deleteMark
feature/favShopDelAll
feature/help
feature/jitTip
feature/paySuccess
feature/seoUrl
feature/shoppingCart
feature/wholesaleFrom5.3
gray
hotfix/firefoxCart
hotfix/govLink
hotfix/newPy
hotfix/serviceSwitch
hotfix/studentSwitch
hotfix/yas2.1.2
release/5.3.1
release/5.4
release/5.4.1
release/5.5
5.4.3
5.4.2
5.4.1
5.4.0
5.3.8
5.3.7
5.3.6
5.3.5
5.3.4
5.3.3
5.3.2
5.3.1
5.3.0
5.2.4
5.2.3
5.2.2
5.2.1
5.2.0
5.1.5
5.1.4
5.1.2
5.1.1
5.1.0
5.0.4
5.0.3
5.0.2
5.0.1
5.0.0.before
4.9.24
4.9.23
4.9.22
4.9.21
4.9.20
4.9.19
4.9.18
4.9.17.encryBugsFenliu
4.9.16
4.9.15
4.9.15.pinyou
4.9.14
4.9.14.icon
4.9.13
4.9.12
4.9.11
4.9.10
4.9.1.1
4.9.1.0
4.9.1
4.8.15
4.8.13
4.8.12
4.8.8.2
4.8.8.1
4.8.8
4.8.5
4.8.3
4.8.2
4.8.bak
4.7.2
4.6.2.1
4.6.2
4.6
4
1.3.22
1.3.21
1.3.20
1.3.19
1.3.18
1.3.17
1.3.16
1.3.15
1.3.14
1.3.13
1.3.12
1.3.11
1.3.10
1.3.9
1.3.8
1.3.7
1.3.7.g
1.3.7.f
1.3.7.e
1.3.7.d
1.3.7.c
1.3.7.b
1.3.7.a
1.3.6
1.3.5
1.3.4
1.3.3
1.3.2
1.3.1
1.3.0
1.2.9
1.2.8
1.2.7
1.2.6
1.2.5
1.2.4
1.2.3
1.2.2
1.2.1
1.2.0
1.2.0.h
1.2.0.g
1.2.0.d
1.2.0.c
1.2.0.beta
1.2.0.b
1.2.0.a
wap.3.2.5
wap.1.4.22
wap.1.4.21
wap.1.4.20
wap.1.4.19
wap.1.4.18
wap.1.4.17
wap.1.4.16.3
wap.1.4.16.2
wap.1.4.16.1
wap.1.4.16
wap.1.4.15
wap.1.4.14
wap.1.4.13
wap.1.4.12
wap.1.4.11
wap.1.4.10
wap.1.4.9
wap.1.4.8
wap.1.4.7
wap.1.4.6
wap.1.4.5
wap.1.4.4
wap.1.4.3
wap.1.4.2
wap.1.4.1
wap.1.4.0
pchttps
pc4.8.9
pc4.5
pc.1.4.24
pc.1.4.23
pc.1.4.22
pc.1.4.21
pc.1.4.20
pc.1.4.19
pc.1.4.18
pc.1.4.17
pc.1.4.16
pc.1.4.15
pc.1.4.14
pc.1.4.13
pc.1.4.12
pc.1.4.11
pc.1.4.10
pc.1.4.9
pc.1.4.8
pc.1.4.7
pc.1.4.6
pc.1.0.7
pc.1.0.6
pc.1.0.5
pc.1.0.4
pc.1.0.3
pc.1.0.2
pc.1.0.1
pc.1.0.0
list
fix-ip-login-limit
fix-ip-limit
merge master css js code
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
36 deletions
yohobuy/m.yohobuy.com/application/controllers/Search.php
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
yohobuy/m.yohobuy.com/configs/application.developer.ini
yohobuy/m.yohobuy.com/configs/application.preview.ini
yohobuy/m.yohobuy.com/configs/application.production.ini
yohobuy/m.yohobuy.com/configs/application.testing.ini
yohobuy/m.yohobuy.com/application/controllers/Search.php
View file @
da2dd89
...
...
@@ -51,13 +51,10 @@ class SearchController extends AbstractAction
if
(
isset
(
$condition
[
'discount'
]))
{
$condition
[
'p_d'
]
=
rawurldecode
(
$condition
[
'discount'
]);
// unset($condition['discount']); 为了兼容js中传参的discount
<<<<<<<
HEAD
=======
}
// 为了兼容现在运营在用的p_d
if
(
isset
(
$condition
[
'p_d'
]))
{
$condition
[
'discount'
]
=
rawurldecode
(
$condition
[
'p_d'
]);
>>>>>>>
master
}
if
(
isset
(
$condition
[
'query'
]))
{
$condition
[
'query'
]
=
rawurlencode
(
$condition
[
'query'
]);
...
...
@@ -236,13 +233,10 @@ class SearchController extends AbstractAction
if
(
isset
(
$condition
[
'price'
]))
{
$condition
[
'price'
]
=
rawurldecode
(
$condition
[
'price'
]);
}
<<<<<<<
HEAD
=======
// 转义风格
if
(
isset
(
$condition
[
'style'
]))
{
$condition
[
'style'
]
=
rawurldecode
(
$condition
[
'style'
]);
}
>>>>>>>
master
// 转换折扣
if
(
isset
(
$condition
[
'discount'
]))
{
$condition
[
'p_d'
]
=
rawurldecode
(
$condition
[
'discount'
]);
...
...
@@ -331,13 +325,10 @@ class SearchController extends AbstractAction
if
(
isset
(
$condition
[
'price'
]))
{
$condition
[
'price'
]
=
rawurldecode
(
$condition
[
'price'
]);
}
<<<<<<<
HEAD
=======
// 转义风格
if
(
isset
(
$condition
[
'style'
]))
{
$condition
[
'style'
]
=
rawurldecode
(
$condition
[
'style'
]);
}
>>>>>>>
master
// 区别各种列表页面的筛选数据
$data
=
Product\SearchModel
::
getFilterData
(
$condition
);
...
...
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @
da2dd89
...
...
@@ -73,13 +73,10 @@ class IndexController extends AbstractAction
if
(
isset
(
$condition
[
'discount'
]))
{
$condition
[
'p_d'
]
=
rawurldecode
(
$condition
[
'discount'
]);
}
<<<<<<<
HEAD
=======
// 为了兼容现在运营在用的p_d
if
(
isset
(
$condition
[
'p_d'
]))
{
$condition
[
'discount'
]
=
rawurldecode
(
$condition
[
'p_d'
]);
}
>>>>>>>
master
// 性别参数,不传则从COOKIE获取
if
(
!
isset
(
$condition
[
'gender'
]))
{
$condition
[
'gender'
]
=
Helpers
::
getGenderByCookie
();
...
...
@@ -166,11 +163,6 @@ class IndexController extends AbstractAction
'gender'
=>
FILTER_DEFAULT
,
'p_d'
=>
FILTER_DEFAULT
,),
false
);
$condition
[
'brand'
]
=
$brandId
;
<<<<<<<
HEAD
=======
>>>>>>>
master
// 转义分类
if
(
isset
(
$condition
[
'sort'
]))
{
$condition
[
'sort'
]
=
rawurldecode
(
$condition
[
'sort'
]);
...
...
@@ -203,13 +195,10 @@ class IndexController extends AbstractAction
if
(
isset
(
$condition
[
'discount'
]))
{
$condition
[
'p_d'
]
=
rawurldecode
(
$condition
[
'discount'
]);
}
<<<<<<<
HEAD
=======
// 为了兼容现在运营在用的p_d
if
(
isset
(
$condition
[
'p_d'
]))
{
$condition
[
'discount'
]
=
rawurldecode
(
$condition
[
'p_d'
]);
}
>>>>>>>
master
if
(
$brandId
===
0
)
{
$condition
[
'query'
]
=
$domain
;
}
...
...
yohobuy/m.yohobuy.com/configs/application.developer.ini
View file @
da2dd89
...
...
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
application.version
=
"1.1.8"
; 网站SEO信息
<<<<<<<
HEAD
application.seo.title
=
"Yoho!Buy有货 | 年轻人潮流购物中心"
=======
application.seo.title
=
"Yoho!Buy有货 丨 年轻人潮流购物中心"
>>>>>>>
1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
application.seo.keywords
=
"Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
application.seo.description
=
"YOHO! 有货,年轻人潮流购物中心,中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。作为YOHO!旗下的购物平台,汇集了全球潮流时尚商品和中国最流行的商品,也是国内最大的原创文化商品平台,也是香港,台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌,带给您全新潮流购物体验。"
...
...
yohobuy/m.yohobuy.com/configs/application.preview.ini
View file @
da2dd89
...
...
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
application.version
=
"1.1.8"
; 网站SEO信息
<<<<<<<
HEAD
application.seo.title
=
"Yoho!Buy有货 | 年轻人潮流购物中心"
=======
application.seo.title
=
"Yoho!Buy有货 丨 年轻人潮流购物中心"
>>>>>>>
1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
application.seo.keywords
=
"Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
application.seo.description
=
"YOHO! 有货,年轻人潮流购物中心,中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。作为YOHO!旗下的购物平台,汇集了全球潮流时尚商品和中国最流行的商品,也是国内最大的原创文化商品平台,也是香港,台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌,带给您全新潮流购物体验。"
...
...
yohobuy/m.yohobuy.com/configs/application.production.ini
View file @
da2dd89
...
...
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
application.version
=
"1.1.8"
; 网站SEO信息
<<<<<<<
HEAD
application.seo.title
=
"Yoho!Buy有货 | 年轻人潮流购物中心"
=======
application.seo.title
=
"Yoho!Buy有货 丨 年轻人潮流购物中心"
>>>>>>>
1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
application.seo.keywords
=
"Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
application.seo.description
=
"YOHO! 有货,年轻人潮流购物中心,中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。作为YOHO!旗下的购物平台,汇集了全球潮流时尚商品和中国最流行的商品,也是国内最大的原创文化商品平台,也是香港,台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌,带给您全新潮流购物体验。"
...
...
yohobuy/m.yohobuy.com/configs/application.testing.ini
View file @
da2dd89
...
...
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
application.version
=
"1.1.8"
; 网站SEO信息
<<<<<<<
HEAD
application.seo.title
=
"Yoho!Buy有货 | 年轻人潮流购物中心"
=======
application.seo.title
=
"Yoho!Buy有货 丨 年轻人潮流购物中心"
>>>>>>>
1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
application.seo.keywords
=
"Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
application.seo.description
=
"YOHO! 有货,年轻人潮流购物中心,中国最大的潮流商品购物网站。100%品牌正品保证,支持货到付款。作为YOHO!旗下的购物平台,汇集了全球潮流时尚商品和中国最流行的商品,也是国内最大的原创文化商品平台,也是香港,台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌,带给您全新潮流购物体验。"
...
...
Please
register
or
login
to post a comment