fe / YOHOBUYPC · Commits

Go to a project

Authored by 郭成尧
Commit db0cb7afdd19d569abb0f775fc880f2b50d08e49 1 parent c95fc831

'页面调整'

Inline Side-by-side
Showing 5 changed files with 116 additions and 70 deletions
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="default-me-page me-page yoho-page clearfix"> 2 <div class="default-me-page me-page yoho-page clearfix">
3 {{# me}} 3 {{# me}}
4 - {{> home/path}} 4 + {{> home/path}}
5 5
6 - {{> home/navigation}} 6 + {{> home/navigation}}
7 7
8 - <div class="me-main">  
9 - {{# content}}  
10 - {{#if messages}}  
11 - <p class="message-tip">  
12 - 消息提示：  
13 - {{# messages}}  
14 - <a href="{{href}}">{{name}}</a>  
15 - <b>({{count}})</b>  
16 - {{/ messages}} 8 + <div class="me-main">
  9 + {{# content}}
  10 + {{#if messages}}
  11 + <p class="message-tip">
  12 + 消息提示：
  13 + {{# messages}}
  14 + <a href="{{href}}">{{name}}</a>
  15 + <b>({{count}})</b>
  16 + {{/ messages}}
17 17
18 - <span id="close-message" class="close iconfont">&#xe602;</span>  
19 - </p>  
20 - {{/if}} 18 + <span id="close-message" class="close iconfont">&#xe602;</span>
  19 + </p>
  20 + {{/if}}
21 21
22 - {{# latestOrders}}  
23 - <div class="latest-orders block">  
24 - <h2 class="title">  
25 - <a class="more-orders more" href="{{more}}">  
26 - 更多订单  
27 - </a>  
28 - </h2>  
29 - {{> home/order-block}}  
30 - </div>  
31 - {{/ latestOrders}} 22 + {{# latestOrders}}
  23 + <div class="latest-orders block">
  24 + <h2 class="title">
  25 + <a class="more-orders more" href="{{more}}">
  26 + 更多订单
  27 + </a>
  28 + </h2>
  29 + {{> home/order-block}}
  30 + </div>
  31 + {{/ latestOrders}}
32 32
33 - {{# favBrand}}  
34 - <div class="brands block">  
35 - <h2 class="title">  
36 - <a class="more-orders more" href="{{more}}">  
37 - 更多品牌  
38 - </a>  
39 - </h2>  
40 - <ul class="clearfix">  
41 - {{# brands}}  
42 - <li>  
43 - <a href="{{href}}">  
44 - <img class="brand-logo" src="{{logo}}">  
45 - <span class="brand-name">{{name}}</span>  
46 - </a>  
47 - </li>  
48 - {{/ brands}}  
49 - </ul>  
50 - </div>  
51 - {{/ favBrand}} 33 + {{# favBrand}}
  34 + <div class="brands block">
  35 + <h2 class="title">
  36 + <a class="more-orders more" href="{{more}}">
  37 + 更多品牌
  38 + </a>
  39 + </h2>
  40 + <ul class="clearfix">
  41 + {{# brands}}
  42 + <li>
  43 + <a href="{{href}}">
  44 + <img class="brand-logo" src="{{logo}}">
  45 + <span class="brand-name">{{name}}</span>
  46 + </a>
  47 + </li>
  48 + {{/ brands}}
  49 + </ul>
  50 + </div>
  51 + {{/ favBrand}}
52 52
53 - {{#if newArrival}}  
54 - <div class="new-arrival block">  
55 - <h2 class="title">  
56 - <p class="na-pager-wrap"> 53 + {{#if newArrival}}
  54 + <div class="new-arrival block">
  55 + <h2 class="title">
  56 + <p class="na-pager-wrap">
57 <span class="na-pager pre no-visible"> 57 <span class="na-pager pre no-visible">
58 <i class="iconfont">&#xe622;</i> 58 <i class="iconfont">&#xe622;</i>
59 </span> 59 </span>
60 <span class="na-pager next"> 60 <span class="na-pager next">
61 <i class="iconfont">&#xe621;</i> 61 <i class="iconfont">&#xe621;</i>
62 </span> 62 </span>
63 - </p>  
64 - </h2>  
65 - <ul class="clearfix">  
66 - {{# newArrival}}  
67 - <li>  
68 - <a href="{{href}}">  
69 - <img class="thumb" src="{{thumb}}">  
70 - <p class="name">{{name}}</p>  
71 - <span class="price">￥{{price}}</span>  
72 - </a>  
73 - </li>  
74 - {{/ newArrival}}  
75 - </ul>  
76 - </div>  
77 - {{/if}} 63 + </p>
  64 + </h2>
  65 + <ul class="clearfix">
  66 + {{# newArrival}}
  67 + <li>
  68 + <a href="{{href}}">
  69 + <img class="thumb" src="{{thumb}}">
  70 + <p class="name">{{name}}</p>
  71 + <span class="price">￥{{price}}</span>
  72 + </a>
  73 + </li>
  74 + {{/ newArrival}}
  75 + </ul>
  76 + </div>
  77 + {{/if}}
78 78
79 - {{{banner}}}  
80 - {{/ content}}  
81 79
82 - {{> home/help-us}}  
83 - </div> 80 + {{/ content}}
  81 +
  82 +
  83 + </div>
  84 + <!--recommend-for-you-->
  85 + {{#if recommend}}
  86 + <div class="recommend block">
  87 + <h2 class="title">
  88 + <p class="na-pager-wrap">
  89 + <span class="rc-pager pre no-visible">
  90 + <i class="iconfont">&#xe622;</i>
  91 + </span>
  92 + <span class="rc-pager next">
  93 + <i class="iconfont">&#xe621;</i>
  94 + </span>
  95 + </p>
  96 + </h2>
  97 + <ul class="clearfix">
  98 + {{# recommend}}
  99 + <li>
  100 + <a href="{{href}}">
  101 + <img class="thumb" src="{{thumb}}">
  102 + <p class="name">{{name}}</p>
  103 + <span class="price">￥{{price}}</span>
  104 + </a>
  105 + </li>
  106 + {{/ recommend}}
  107 + </ul>
  108 + </div>
  109 + {{/if}}
  110 + <!--recommend-for-you-->
  111 + <div class="ho-btm">
  112 + {{{banner}}}
  113 + {{> home/help-us}}
  114 + </div>
84 {{/ me}} 115 {{/ me}}
85 </div> 116 </div>
86 {{> layout/footer}} 117 {{> layout/footer}}
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 } 81 }
82 } 82 }
83 83
84 - .new-arrival { 84 + .new-arrival,.recommend {
85 overflow: hidden; 85 overflow: hidden;
86 86
87 .na-pager-wrap { 87 .na-pager-wrap {
@@ -144,6 +144,15 @@ @@ -144,6 +144,15 @@
144 } 144 }
145 } 145 }
146 146
  147 + .recommend {
  148 + margin-bottom: 10px;
  149 + }
  150 +
  151 + .ho-btm{
  152 + float: right;
  153 + width: 800px;
  154 + }
  155 +
147 .banner { 156 .banner {
148 display: block; 157 display: block;
149 width: 800px; 158 width: 800px;
@@ -161,4 +170,8 @@ @@ -161,4 +170,8 @@
161 .new-arrival .title { 170 .new-arrival .title {
162 background-image: resolve(/home/new-arrival.png); 171 background-image: resolve(/home/new-arrival.png);
163 } 172 }
  173 +
  174 + .recommend .title {
  175 + background-image: resolve(/home/recommend.png);
  176 + }
164 } 177 }
@@ -139,6 +139,7 @@ @@ -139,6 +139,7 @@
139 .me-main { 139 .me-main {
140 float: left; 140 float: left;
141 width: 800px; 141 width: 800px;
  142 + min-height: 945px;
142 } 143 }
143 144
144 .me-pager { 145 .me-pager {
@@ -31,7 +31,7 @@ class IndexController extends WebAction @@ -31,7 +31,7 @@ class IndexController extends WebAction
31 'name' => '个人中心' 31 'name' => '个人中心'
32 ), 32 ),
33 ); 33 );
34 - $leftNav = UserModel::getCenterLeftNav('',$uid); 34 + $leftNav = UserModel::getCenterLeftNav('', $uid);
35 $data = IndexModel::homeData(); 35 $data = IndexModel::homeData();
36 $udid = $uid . $this->getUdid(); 36 $udid = $uid . $this->getUdid();
37 //取消订单原因列表 37 //取消订单原因列表
@@ -54,10 +54,11 @@ class IndexController extends WebAction @@ -54,10 +54,11 @@ class IndexController extends WebAction
54 'more' => '/brands', 54 'more' => '/brands',
55 'brands' => $data['brand'] 55 'brands' => $data['brand']
56 ), 56 ),
57 - 'newArrival' => $data['new'],  
58 - 'banner' => IndexModel::getFooterBanner() 57 + 'newArrival' => $data['new']
59 ) 58 )
60 ), 59 ),
  60 + 'recommend' => $data['new'], //待处理
  61 + 'banner' => IndexModel::getFooterBanner(),
61 'helpUsUrl' => '' 62 'helpUsUrl' => ''
62 ); 63 );
63 $this->_view->display('index', array('meIndexPage' => true, 'me' => $data)); 64 $this->_view->display('index', array('meIndexPage' => true, 'me' => $data));