fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 5783dae48045a232b58522532d69d66dc320824b 2 parents 34d310f8 30a90892

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

Inline Side-by-side
Showing 3 changed files with 4 additions and 24 deletions
@@ -430,6 +430,8 @@ @@ -430,6 +430,8 @@
430 //列表页 430 //列表页
431 { 431 {
432 ps: { 432 ps: {
  433 + sName: '',
  434 + pName: '',
433 star: [ 435 star: [
434 { 436 {
435 deps: '', 437 deps: '',
1 -{{>layout/header}}  
2 -<div class="ps-list-page ps-page yoho-page">  
3 - {{# ps}}  
4 - <ul id="nav-tab" class="nav-tab clearfix">  
5 - <li class="star-nav focus">设计师</li>  
6 - <li class="plus-nav">经典潮牌</li>  
7 - </ul>  
8 - <div id="ps-content" class="ps-content">  
9 - <ul class="star-content content">  
10 - {{# star}}  
11 - {{> guang/ps_item}}  
12 - {{/ star}}  
13 - </ul>  
14 - <ul class="plus-content content hide">  
15 - {{# plus}}  
16 - {{> guang/ps_item}}  
17 - {{/ plus}}  
18 - </ul>  
19 - </div>  
20 - {{/ ps}}  
21 -</div>  
22 -{{>layout/footer}}  
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <div class="ps-list-page ps-page yoho-page"> 2 <div class="ps-list-page ps-page yoho-page">
3 {{# ps}} 3 {{# ps}}
4 <ul id="nav-tab" class="nav-tab clearfix"> 4 <ul id="nav-tab" class="nav-tab clearfix">
5 - <li class="star-nav focus">明星潮品</li>  
6 - <li class="plus-nav">原创潮牌</li> 5 + <li class="star-nav focus">{{sName}}</li>
  6 + <li class="plus-nav">{{pName}}</li>
7 </ul> 7 </ul>
8 <div id="ps-content" class="ps-content"> 8 <div id="ps-content" class="ps-content">
9 <ul class="star-content content"> 9 <ul class="star-content content">