Toggle navigation
Toggle navigation
This project
Loading...
Sign in
chenchao
/
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
xuqi
9 years ago
Commit
bf60eb92a433c7e590264c91687c9230cb8a671c
2 parents
c2af5d49
fdcb7cd3
Merge branch 'develop' of
http://git.dev.yoho.cn/web/yohobuy
into develop
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
16 deletions
docs/web-data-structure.md
template/www.yohobuy.com/actions/index/index/index.phtml
template/www.yohobuy.com/partials/product/filter-box.phtml
yohobuy/www.yohobuy.com/application/models/Index/Home.php
yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register.php
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index1.php
docs/web-data-structure.md
View file @
bf60eb9
...
...
@@ -489,6 +489,10 @@
},
...
],
customPrice: {
min: 1,
max: 99
},
color:
[
{
href: '',
...
...
template/www.yohobuy.com/actions/index/index/index.phtml
View file @
bf60eb9
...
...
@@ -15,8 +15,8 @@
{
{#
list
}
}
{
{#unless
@last
}
}
<li>
<a
href=
"{{href}}"
>
<img
class=
"lazy"
data-original=
"{{img}}"
alt=
""
>
<a
href=
"{{href}}"
target=
"_blank"
>
<img
class=
"lazy"
data-original=
"{{img}}"
alt=
""
>
</a>
</li>
{
{/unless
}
}
...
...
@@ -26,7 +26,7 @@
{
{#
list
}
}
{
{#if
@last
}
}
<div
class=
"last-item"
>
<a
href=
"{{href}}"
>
<a
href=
"{{href}}"
target=
"_blank"
>
<img
class=
"lazy"
data-original=
"{{img}}"
alt=
""
>
</a>
</div>
...
...
@@ -43,7 +43,7 @@
<ul
class=
"img-list clearfix"
>
{
{#
imgBrand
}
}
<li
class=
"img-item"
>
<a
href=
"{{href}}"
>
<a
href=
"{{href}}"
target=
"_blank"
>
<img
src=
"{{img}}"
alt=
""
>
</a>
</li>
...
...
@@ -70,7 +70,7 @@
{
{!
广告
}
}
{
{#
adbanner
}
}
<div
class=
"floor-ad"
>
<a
href=
"{{href}}"
target=
"_blank"
><img
class=
"lazy"
data-original=
"{{img}}"
/></a>
<a
href=
"{{href}}"
target=
"_blank"
><img
class=
"lazy"
data-original=
"{{img}}"
/></a>
</div>
{
{/
adbanner
}
}
...
...
template/www.yohobuy.com/partials/product/filter-box.phtml
View file @
bf60eb9
...
...
@@ -133,9 +133,9 @@
<div class="ud-price-range">
¥
<input type="text" class="min limit">
<input type="text" class="min limit"
value="{{customPrice.min}}"
>
<span class="price-sep">-</span>
<input type="text" class="max limit">
<input type="text" class="max limit"
value="{{customPrice.max}}"
>
<button class="price-sure hide">确定</button>
</div>
...
...
yohobuy/www.yohobuy.com/application/models/Index/Home.php
View file @
bf60eb9
...
...
@@ -74,7 +74,7 @@ class HomeModel
'index_main'
=>
0
,
'is_hot'
=>
$val
[
'is_hot'
]
==
'Y'
?
true
:
false
,
'is_new'
=>
$val
[
'is_new'
]
==
'Y'
?
true
:
false
,
'subnav'
=>
array
()
//
'subnav' => array()
);
foreach
(
$val
[
'sub'
]
as
$sub
)
{
// 二级
$index_sub
=
0
;
...
...
@@ -84,7 +84,7 @@ class HomeModel
'link'
=>
$sub
[
'sort_url'
],
'is_hot'
=>
$sub
[
'is_hot'
]
==
'Y'
?
true
:
false
,
'is_new'
=>
$sub
[
'is_new'
]
==
'Y'
?
true
:
false
,
'thirdnav'
=>
array
(),
//
'thirdnav' => array(),
'index_sub'
=>
$index_sub
++
);
if
(
isset
(
$sub
[
'sub'
]))
{
...
...
@@ -93,7 +93,7 @@ class HomeModel
'title'
=>
$thirdsub
[
'sort_name'
],
'name_en'
=>
$thirdsub
[
'sort_name_en'
],
'link'
=>
$thirdsub
[
'sort_url'
],
'branditems'
=>
array
()
//
'branditems' => array()
);
if
(
isset
(
$thirdsub
[
'sub'
]))
{
foreach
(
$thirdsub
[
'sub'
]
as
$fourthnav
)
{
// 四级
...
...
@@ -107,6 +107,7 @@ class HomeModel
$subnav
[
'thirdnav'
][]
=
$thirdnav
;
}
}
$item
[
'subnav'
][]
=
$subnav
;
}
$menu
[]
=
$item
;
...
...
@@ -236,12 +237,13 @@ class HomeModel
$val
[
'price'
]
=
$val
[
'salePrice'
];
}
//TODO 字段要调整
$val
[
'tags'
][
'isFew'
]
=
$val
[
'is_soon_sold_out'
];
$val
[
'tags'
][
'isLimit'
]
=
$val
[
'tags'
][
'is_discount'
];
$val
[
'tags'
][
'is_discount'
]
=
$val
[
'is_soon_sold_out'
];
$val
[
'tags'
][
'isNew'
]
=
false
;
//$val['tags']['is_new'];
$val
[
'isFew'
]
=
$val
[
'is_soon_sold_out'
];
$val
[
'tags'
][
'isLimit'
]
=
$val
[
'tags'
][
'is_limited'
];
$val
[
'tags'
][
'isSale'
]
=
false
;
//$val['tags']['is_discount'];暂时不显示
$val
[
'tags'
][
'isNew'
]
=
false
;
//$val['tags']['is_new'];暂时不显示
$val
[
'tags'
][
'isYearMidPromotion'
]
=
$val
[
'tags'
][
'midYear'
];
$val
[
'tags'
][
'isYearEndPromotion'
]
=
$val
[
'tags'
][
'yearEnd'
];
$val
[
'tags'
][
'isReNew'
]
=
false
;
//$val['tags']['is_advance'];暂时不显示
unset
(
$val
[
'tags'
][
'is_advance'
],
$val
[
'tags'
][
'is_discount'
],
$val
[
'tags'
][
'is_limited'
],
$val
[
'tags'
][
'is_new'
],
$val
[
'tags'
][
'is_yohood'
],
$val
[
'tags'
][
'midYear'
],
$val
[
'tags'
][
'yearEnd'
]);
if
(
!
empty
(
$val
))
{
...
...
yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register.php
View file @
bf60eb9
...
...
@@ -20,7 +20,7 @@ class RegisterController extends WebAction
'actionUrl'
=>
'/passport/register/mobileregister'
,
'region'
=>
RegData
::
getAreasData
(),
'location'
=>
'+86'
,
'captchaUrl'
=>
'
http://web.dev.yohobuy.com
/passport/images?t=1449799445'
,
'captchaUrl'
=>
'/passport/images?t=1449799445'
,
'itemUrl'
=>
'##'
,
'referUrl'
=>
$refer
,
'loginUrl'
=>
'/signin.html?refer='
.
$refer
,
...
...
@@ -48,7 +48,7 @@ class RegisterController extends WebAction
'actionUrl'
=>
'/passport/register/mobileregister'
,
'region'
=>
RegData
::
getAreasData
(),
'location'
=>
'+86'
,
'captchaUrl'
=>
'
http://web.dev.yohobuy.com
/passport/images?t=1449799445'
,
'captchaUrl'
=>
'/passport/images?t=1449799445'
,
'itemUrl'
=>
'##'
,
'referUrl'
=>
$refer
,
'skipUrl'
=>
'/signin.html?refer='
.
$refer
,
...
...
yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index1.php
View file @
bf60eb9
...
...
@@ -198,6 +198,10 @@ class Index1Controller extends AbstractAction
'name'
=>
'240-329'
)
),
'customPrice'
=>
array
(
'min'
=>
1
,
'max'
=>
99
),
'color'
=>
array
(
array
(
'href'
=>
''
,
...
...
Please
register
or
login
to post a comment