Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
15 changed files
with
485 additions
and
81 deletions
static/img/me/index/user-avatar.png
0 → 100644

4.37 KB
@@ -3,5 +3,12 @@ | @@ -3,5 +3,12 @@ | ||
3 | * @author: bikai<kai.bi@yoho.cn> | 3 | * @author: bikai<kai.bi@yoho.cn> |
4 | * @date: 2015/11/12 | 4 | * @date: 2015/11/12 |
5 | */ | 5 | */ |
6 | +var $ = require('jquery'); | ||
7 | +var $userAvatar = $('.user-avatar'); | ||
8 | +var myImage = new Image(); | ||
6 | 9 | ||
7 | -require('../product/recommend-for-you.js'); | ||
10 | +require('../product/recommend-for-you.js'); | ||
11 | +myImage.src = $userAvatar.attr('src'); | ||
12 | +myImage.onerror = function() { | ||
13 | + $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png'); | ||
14 | +}; |
static/js/me/personal-details.js
0 → 100644
1 | +/** | ||
2 | + * 个人信息 | ||
3 | + * @author: bikai<kai.bi@yoho.cn> | ||
4 | + * @date: 2015/11/19 | ||
5 | + */ | ||
6 | +var $ = require('jquery'); | ||
7 | +var $userAvatar = $('.user-avatar'); | ||
8 | +var myImage = new Image(); | ||
9 | + | ||
10 | +myImage.src = $userAvatar.attr('src'); | ||
11 | +myImage.onerror = function() { | ||
12 | + $userAvatar.attr('src', 'http://static.dev.yohobuy.com/img/me/index/user-avatar.png'); | ||
13 | +}; |
static/js/product/detail/comments.js
0 → 100644
@@ -153,6 +153,7 @@ a { | @@ -153,6 +153,7 @@ a { | ||
153 | @import "home/index"; | 153 | @import "home/index"; |
154 | @import "category/index"; | 154 | @import "category/index"; |
155 | @import "product/index"; | 155 | @import "product/index"; |
156 | +@import "product/comments-consults"; | ||
156 | @import "index/index"; | 157 | @import "index/index"; |
157 | @import "shopping-cart/index"; | 158 | @import "shopping-cart/index"; |
158 | @import "me/index"; //个人中心 | 159 | @import "me/index"; //个人中心 |
static/sass/product/_comments-consults.scss
0 → 100644
1 | +.goods-comments-page{ | ||
2 | + .goods-comments{ | ||
3 | + .comment-item{ | ||
4 | + border: 1px solid $borderC; | ||
5 | + padding: 0 pxToRem(28px); | ||
6 | + .user-name{ | ||
7 | + font-size: pxToRem(24px); | ||
8 | + line-height: pxToRem(62px); | ||
9 | + color:$mainFontC; | ||
10 | + } | ||
11 | + .goods-spec, | ||
12 | + .comment-time{ | ||
13 | + font-size: pxToRem(24px); | ||
14 | + line-height: pxToRem(62px); | ||
15 | + } | ||
16 | + .detail-content{ | ||
17 | + font-size: pxToRem(24px); | ||
18 | + line-height: pxToRem(62px); | ||
19 | + color:$mainFontC; | ||
20 | + } | ||
21 | + .goods-spec, | ||
22 | + .comment-time{ | ||
23 | + font-size: pxToRem(24px); | ||
24 | + line-height: pxToRem(62px); | ||
25 | + } | ||
26 | + .detail-content{ | ||
27 | + font-size: pxToRem(28px); | ||
28 | + line-height: pxToRem(36px); | ||
29 | + } | ||
30 | + .goods-spec, | ||
31 | + .detail-content{ | ||
32 | + color:$mainFontC; | ||
33 | + } | ||
34 | + .comment-time{ | ||
35 | + color:#c1c1c1; | ||
36 | + } | ||
37 | + } | ||
38 | + } | ||
39 | +} | ||
40 | + | ||
41 | +.goods-consults-page{ | ||
42 | + .goto-consult{ | ||
43 | + padding: 0 pxToRem(28px); | ||
44 | + height: pxToRem(120px); | ||
45 | + background-color: #ffffff; | ||
46 | + i,span{ | ||
47 | + line-height: pxToRem(120px); | ||
48 | + font-size: pxToRem(28px); | ||
49 | + color:$mainFontC; | ||
50 | + } | ||
51 | + .consult-logo{ | ||
52 | + padding-right: pxToRem(15px); | ||
53 | + } | ||
54 | + .enter-consult-page{ | ||
55 | + float: right; | ||
56 | + color:$subFontC; | ||
57 | + } | ||
58 | + } | ||
59 | + .goods-consults{ | ||
60 | + .consult-item{ | ||
61 | + padding: pxToRem(20px) pxToRem(28px); | ||
62 | + background-color: #fff; | ||
63 | + .question{ | ||
64 | + font-size: pxToRem(24px); | ||
65 | + color:$mainFontC; | ||
66 | + span{ | ||
67 | + display: block; | ||
68 | + float: left; | ||
69 | + font-size: inherit; | ||
70 | + padding-right: pxToRem(15px); | ||
71 | + } | ||
72 | + p{ | ||
73 | + overflow: hidden; | ||
74 | + padding-bottom: pxToRem(15px); | ||
75 | + border-bottom: 1px solid $borderC; | ||
76 | + } | ||
77 | + } | ||
78 | + .time{ | ||
79 | + font-size: pxToRem(22px); | ||
80 | + color:$subFontC; | ||
81 | + } | ||
82 | + .answer{ | ||
83 | + font-size: pxToRem(24px); | ||
84 | + line-height: pxToRem(36px); | ||
85 | + color:$subFontC; | ||
86 | + margin-top: pxToRem(14px); | ||
87 | + span{ | ||
88 | + display: block; | ||
89 | + float: left; | ||
90 | + font-size: inherit; | ||
91 | + color:$mainFontC; | ||
92 | + padding-right: pxToRem(15px); | ||
93 | + } | ||
94 | + p{ | ||
95 | + overflow: hidden; | ||
96 | + } | ||
97 | + } | ||
98 | + } | ||
99 | + } | ||
100 | + | ||
101 | + .gap-block{ | ||
102 | + min-height: 30rem/$pxConvertRem; | ||
103 | + background-color: #f0f0f0; | ||
104 | + } | ||
105 | +} | ||
106 | + | ||
107 | +.consult-form-page{ | ||
108 | + padding: pxToRem(28px); | ||
109 | + text-align: center; | ||
110 | + textarea{ | ||
111 | + box-sizing:border-box; | ||
112 | + width: 100%; | ||
113 | + height: pxToRem(400px); | ||
114 | + font-size: pxToRem(28px); | ||
115 | + padding:pxToRem(10px); | ||
116 | + color:$mainFontC; | ||
117 | + } | ||
118 | + a{ | ||
119 | + display: inline-block; | ||
120 | + height: pxToRem(80px); | ||
121 | + width: pxToRem(360px); | ||
122 | + color: #fff; | ||
123 | + background-color: #444; | ||
124 | + font-size: pxToRem(40px); | ||
125 | + line-height: pxToRem(80px); | ||
126 | + text-align: center; | ||
127 | + margin-top: pxToRem(20px); | ||
128 | + } | ||
129 | +} |
@@ -67,7 +67,7 @@ overflow: hidden; | @@ -67,7 +67,7 @@ overflow: hidden; | ||
67 | font-size: pxToRem(20px); | 67 | font-size: pxToRem(20px); |
68 | line-height: pxToRem(35px); | 68 | line-height: pxToRem(35px); |
69 | background-color: #7cd881; | 69 | background-color: #7cd881; |
70 | - z-index: 16; | 70 | + // z-index: 16; |
71 | } | 71 | } |
72 | } | 72 | } |
73 | .banner-top{ | 73 | .banner-top{ |
@@ -280,62 +280,107 @@ overflow: hidden; | @@ -280,62 +280,107 @@ overflow: hidden; | ||
280 | .comment-nav { | 280 | .comment-nav { |
281 | border-right: 1px solid #ccc; | 281 | border-right: 1px solid #ccc; |
282 | } | 282 | } |
283 | - .comment-content{ | ||
284 | - .comment-content-main{ | 283 | + .content{ |
284 | + .content-main{ | ||
285 | background-color: #fff; | 285 | background-color: #fff; |
286 | border-bottom: 1px solid $borderC; | 286 | border-bottom: 1px solid $borderC; |
287 | - .user-name{ | ||
288 | - font-size: pxToRem(24px); | ||
289 | - line-height: pxToRem(62px); | ||
290 | - color:$mainFontC; | ||
291 | - padding-left: pxToRem(28px); | ||
292 | - padding-right: pxToRem(18px); | ||
293 | - } | ||
294 | - .goods-spec, | ||
295 | - .comment-time{ | ||
296 | - font-size: pxToRem(24px); | ||
297 | - line-height: pxToRem(62px); | ||
298 | - } | ||
299 | - .detail-content{ | ||
300 | - font-size: pxToRem(28px); | ||
301 | - line-height: pxToRem(36px); | ||
302 | - font-size: pxToRem(24px); | ||
303 | - line-height: pxToRem(62px); | ||
304 | - color:$mainFontC; | ||
305 | - padding-left: pxToRem(28px); | ||
306 | - padding-right: pxToRem(18px); | ||
307 | - } | ||
308 | - .goods-spec, | ||
309 | - .comment-time{ | ||
310 | - font-size: pxToRem(24px); | ||
311 | - line-height: pxToRem(62px); | ||
312 | - } | ||
313 | - .detail-content{ | ||
314 | - font-size: pxToRem(28px); | ||
315 | - line-height: pxToRem(36px); | ||
316 | - } | ||
317 | - .goods-spec, | ||
318 | - .detail-content{ | ||
319 | - color:$mainFontC; | ||
320 | - } | ||
321 | - .detail-content, | ||
322 | - .comment-time{ | ||
323 | - padding-left: pxToRem(28px); | 287 | + &.comment-content-main{ |
288 | + .user-name{ | ||
289 | + font-size: pxToRem(24px); | ||
290 | + line-height: pxToRem(62px); | ||
291 | + color:$mainFontC; | ||
292 | + padding-left: pxToRem(28px); | ||
293 | + padding-right: pxToRem(18px); | ||
294 | + } | ||
295 | + .goods-spec, | ||
296 | + .comment-time{ | ||
297 | + font-size: pxToRem(24px); | ||
298 | + line-height: pxToRem(62px); | ||
299 | + } | ||
300 | + .detail-content{ | ||
301 | + // font-size: pxToRem(28px); | ||
302 | + // line-height: pxToRem(36px); | ||
303 | + font-size: pxToRem(24px); | ||
304 | + line-height: pxToRem(62px); | ||
305 | + color:$mainFontC; | ||
306 | + padding-left: pxToRem(28px); | ||
307 | + padding-right: pxToRem(18px); | ||
308 | + } | ||
309 | + .goods-spec, | ||
310 | + .comment-time{ | ||
311 | + font-size: pxToRem(24px); | ||
312 | + line-height: pxToRem(62px); | ||
313 | + } | ||
314 | + .detail-content{ | ||
315 | + font-size: pxToRem(28px); | ||
316 | + line-height: pxToRem(36px); | ||
317 | + } | ||
318 | + .goods-spec, | ||
319 | + .detail-content{ | ||
320 | + color:$mainFontC; | ||
321 | + } | ||
322 | + .detail-content, | ||
323 | + .comment-time{ | ||
324 | + padding-left: pxToRem(28px); | ||
324 | 325 | ||
326 | + } | ||
327 | + .detail-content{ | ||
328 | + padding-right: pxToRem(28px); | ||
329 | + padding-left: pxToRem(28px); | ||
330 | + } | ||
331 | + .detail-content{ | ||
332 | + padding-right: pxToRem(28px); | ||
333 | + } | ||
334 | + .comment-time{ | ||
335 | + color:#c1c1c1; | ||
336 | + } | ||
325 | } | 337 | } |
326 | - .detail-content{ | ||
327 | - padding-right: pxToRem(28px); | ||
328 | - padding-left: pxToRem(28px); | ||
329 | - } | ||
330 | - .detail-content{ | ||
331 | - padding-right: pxToRem(28px); | ||
332 | - } | ||
333 | - .comment-time{ | ||
334 | - color:#c1c1c1; | 338 | + &.consult-content-main{ |
339 | + padding-right: pxToRem(28px); | ||
340 | + padding-left: pxToRem(28px); | ||
341 | + padding-top: pxToRem(20px); | ||
342 | + padding-bottom: pxToRem(20px); | ||
343 | + .question{ | ||
344 | + font-size: pxToRem(24px); | ||
345 | + color:$mainFontC; | ||
346 | + span{ | ||
347 | + display: block; | ||
348 | + float: left; | ||
349 | + font-size: inherit; | ||
350 | + padding-right: pxToRem(15px); | ||
351 | + } | ||
352 | + p{ | ||
353 | + overflow: hidden; | ||
354 | + } | ||
355 | + } | ||
356 | + .time{ | ||
357 | + font-size: pxToRem(22px); | ||
358 | + color:$subFontC; | ||
359 | + } | ||
360 | + .answer{ | ||
361 | + font-size: pxToRem(24px); | ||
362 | + line-height: pxToRem(36px); | ||
363 | + color:$subFontC; | ||
364 | + margin-top: pxToRem(14px); | ||
365 | + span{ | ||
366 | + display: block; | ||
367 | + float: left; | ||
368 | + font-size: inherit; | ||
369 | + color:$mainFontC; | ||
370 | + padding-right: pxToRem(15px); | ||
371 | + } | ||
372 | + p{ | ||
373 | + overflow: hidden; | ||
374 | + } | ||
375 | + } | ||
335 | } | 376 | } |
377 | + | ||
336 | } | 378 | } |
337 | 379 | ||
338 | - .comment-content-footer{ | 380 | + |
381 | +} | ||
382 | +.comment-content-footer, | ||
383 | +.consult-content-footer{ | ||
339 | 384 | ||
340 | min-height: pxToRem(88px); | 385 | min-height: pxToRem(88px); |
341 | text-align: center; | 386 | text-align: center; |
@@ -350,9 +395,7 @@ overflow: hidden; | @@ -350,9 +395,7 @@ overflow: hidden; | ||
350 | .iconfont{ | 395 | .iconfont{ |
351 | font-size: inherit; | 396 | font-size: inherit; |
352 | } | 397 | } |
353 | - } | ||
354 | -} | ||
355 | - | 398 | + } |
356 | 399 | ||
357 | } | 400 | } |
358 | 401 | ||
@@ -527,7 +570,7 @@ overflow: hidden; | @@ -527,7 +570,7 @@ overflow: hidden; | ||
527 | position:fixed; | 570 | position:fixed; |
528 | bottom: 0; | 571 | bottom: 0; |
529 | background-color: #fff; | 572 | background-color: #fff; |
530 | - z-index: 64; | 573 | + z-index:2; |
531 | padding:pxToRem(20px) pxToRem(28px); | 574 | padding:pxToRem(20px) pxToRem(28px); |
532 | text-align: center; | 575 | text-align: center; |
533 | a{ | 576 | a{ |
1 | {{> layout/header}} | 1 | {{> layout/header}} |
2 | <div class="personal-details"> | 2 | <div class="personal-details"> |
3 | <ul> | 3 | <ul> |
4 | - <li><span>头像</span><span><i class="head-portrait"><img src="{{ head_ico }}"></i></span></li> | 4 | + <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li> |
5 | <li><span>昵称</span><span>{{ username }}</span></li> | 5 | <li><span>昵称</span><span>{{ username }}</span></li> |
6 | <li><span>性别</span><span>{{ gender }}</span></li> | 6 | <li><span>性别</span><span>{{ gender }}</span></li> |
7 | <li><span>生日</span><span>{{ birthday }}</span></li> | 7 | <li><span>生日</span><span>{{ birthday }}</span></li> |
1 | +{{> layout/header}} | ||
2 | +<div class="goods-comments-page yoho-page"> | ||
3 | + {{#comments}} | ||
4 | + <div class="goods-comments"> | ||
5 | + {{#list}} | ||
6 | + <div class="comment-item"> | ||
7 | + <span class="user-name"> | ||
8 | + {{userName}} | ||
9 | + </span> | ||
10 | + <span class="goods-spec"> | ||
11 | + {{desc}} | ||
12 | + </span> | ||
13 | + <p class="detail-content"> | ||
14 | + {{content}} | ||
15 | + </p> | ||
16 | + <span class="comment-time"> | ||
17 | + {{time}} | ||
18 | + </span> | ||
19 | + </div> | ||
20 | + {{/list}} | ||
21 | + </div> | ||
22 | + {{/comments}} | ||
23 | + | ||
24 | +</div> | ||
25 | + | ||
26 | +{{> layout/footer}} |
1 | +{{> layout/header}} | ||
2 | +<div class="goods-consults-page yoho-page"> | ||
3 | + <div class="goto-consult"> | ||
4 | + <i class="iconfont consult-logo"></i> | ||
5 | + <span>我要咨询</span> | ||
6 | + <i class="iconfont enter-consult-page"></i> | ||
7 | + </div> | ||
8 | + {{# consults}} | ||
9 | + <div class="goods-consults"> | ||
10 | + {{#list}} | ||
11 | + <div class="gap-block"></div> | ||
12 | + <div class="consult-item"> | ||
13 | + <div class="question"> | ||
14 | + <span class="iconfont"></span> | ||
15 | + <p> | ||
16 | + {{question}} | ||
17 | + <span class="time"> | ||
18 | + {{time}} | ||
19 | + </span> | ||
20 | + </p> | ||
21 | + </div> | ||
22 | + | ||
23 | + <div class="answer"> | ||
24 | + <span class="iconfont"></span> | ||
25 | + <p>{{answer}}</p> | ||
26 | + </div> | ||
27 | + </div> | ||
28 | + | ||
29 | + {{/list}} | ||
30 | + </div> | ||
31 | + {{/ consults}} | ||
32 | +</div> | ||
33 | +{{> layout/footer}} |
@@ -50,12 +50,12 @@ | @@ -50,12 +50,12 @@ | ||
50 | <div class="feedback-list-page "> | 50 | <div class="feedback-list-page "> |
51 | {{# feedbacks}} | 51 | {{# feedbacks}} |
52 | <ul id="nav-tab" class="nav-tab clearfix"> | 52 | <ul id="nav-tab" class="nav-tab clearfix"> |
53 | - <li class="comment-nav focus">{{commentName}}</li> | ||
54 | - <li class="consult-nav">{{consultName}}</li> | 53 | + <li class="comment-nav focus">{{commentName}}({{commentsNum}})</li> |
54 | + <li class="consult-nav">{{consultName}}({{consultsNum}})</li> | ||
55 | </ul> | 55 | </ul> |
56 | <div id="feedback-content" > | 56 | <div id="feedback-content" > |
57 | <div class="comment-content content "> | 57 | <div class="comment-content content "> |
58 | - <div class="comment-content-main"> | 58 | + <div class="comment-content-main content-main"> |
59 | {{# comments}} | 59 | {{# comments}} |
60 | <span class="user-name"> | 60 | <span class="user-name"> |
61 | {{userName}} | 61 | {{userName}} |
@@ -75,10 +75,27 @@ | @@ -75,10 +75,27 @@ | ||
75 | <a href="{{moreComments}}">查看更多 <span class="iconfont"></span></a> | 75 | <a href="{{moreComments}}">查看更多 <span class="iconfont"></span></a> |
76 | </div> | 76 | </div> |
77 | </div> | 77 | </div> |
78 | - <div class="consult-content content hide"> | ||
79 | - {{# consults}} | ||
80 | - <!-- {{> guang/ps_item}} --> | ||
81 | - {{/ consults}} | 78 | + <div class="consult-content content hide "> |
79 | + <div class="consult-content-main content-main"> | ||
80 | + {{# consults}} | ||
81 | + <div class="question"> | ||
82 | + <span class="iconfont"></span> | ||
83 | + <p>{{question}} | ||
84 | + <span class="time"> | ||
85 | + {{time}} | ||
86 | + </span> | ||
87 | + </p> | ||
88 | + </div> | ||
89 | + | ||
90 | + <div class="answer"> | ||
91 | + <span class="iconfont"></span> | ||
92 | + <p>{{answer}}</p> | ||
93 | + </div> | ||
94 | + {{/ consults}} | ||
95 | + </div> | ||
96 | + <div class="consult-content-footer"> | ||
97 | + <a href="{{moreComments}}">查看更多 <span class="iconfont"></span></a> | ||
98 | + </div> | ||
82 | </div> | 99 | </div> |
83 | </div> | 100 | </div> |
84 | {{/ feedbacks}} | 101 | {{/ feedbacks}} |
@@ -163,6 +163,12 @@ | @@ -163,6 +163,12 @@ | ||
163 | seajs.use('js/product/detail/detail'); | 163 | seajs.use('js/product/detail/detail'); |
164 | </script> | 164 | </script> |
165 | {{/if}} | 165 | {{/if}} |
166 | +{{!-- 商品详情评论 --}} | ||
167 | +{{#if goodsCommentsPage}} | ||
168 | +<script> | ||
169 | + seajs.use('js/product/detail/comments'); | ||
170 | +</script> | ||
171 | +{{/if}} | ||
166 | {{!-- 品类 --}} | 172 | {{!-- 品类 --}} |
167 | {{#if categoryPage}} | 173 | {{#if categoryPage}} |
168 | <script> | 174 | <script> |
@@ -247,4 +253,9 @@ | @@ -247,4 +253,9 @@ | ||
247 | <script> | 253 | <script> |
248 | seajs.use('js/me/my-guang'); | 254 | seajs.use('js/me/my-guang'); |
249 | </script> | 255 | </script> |
256 | +{{/if}} | ||
257 | +{{#if personalDetailsPage}} | ||
258 | +<script> | ||
259 | + seajs.use('js/me/personal-details'); | ||
260 | +</script> | ||
250 | {{/if}} | 261 | {{/if}} |
@@ -27,7 +27,8 @@ class HomeController extends AbstractAction | @@ -27,7 +27,8 @@ class HomeController extends AbstractAction | ||
27 | // { | 27 | // { |
28 | // // 检查用户是否登录, 未登录则跳转到登录页 | 28 | // // 检查用户是否登录, 未登录则跳转到登录页 |
29 | // $uid = $this->getUid(true); | 29 | // $uid = $this->getUid(true); |
30 | -// if (!$uid) { | 30 | +// $action = $this->getRequest()->getActionName(); |
31 | +// if (!$uid && $action !== 'index') { | ||
31 | // $this->go(Helpers::url('/signin.html')); | 32 | // $this->go(Helpers::url('/signin.html')); |
32 | // } | 33 | // } |
33 | // | 34 | // |
@@ -43,18 +44,22 @@ class HomeController extends AbstractAction | @@ -43,18 +44,22 @@ class HomeController extends AbstractAction | ||
43 | $this->setTitle('个人中心'); | 44 | $this->setTitle('个人中心'); |
44 | $this->setNavHeader('个人中心'); | 45 | $this->setNavHeader('个人中心'); |
45 | 46 | ||
46 | - // $uid = $this->getUid(); | ||
47 | - $uid = 8826435; | ||
48 | - $data = \Index\UserModel::getUserProfileData($uid); | ||
49 | - $data += \Index\UserModel::getInfoNumData($uid); | ||
50 | - | ||
51 | - // 优选新品数据 | ||
52 | - $channel = Helpers::getChannelByCookie(); | ||
53 | - $data['recommendForYou'] = \Index\UserModel::getPreferenceData($channel); | ||
54 | - // print_r($data); | ||
55 | - | ||
56 | - $data['myIndexPage'] = true; | ||
57 | - $data['pageFooter'] = true; | 47 | + $data = array( |
48 | + 'myIndexPage' => true, | ||
49 | + 'pageFooter' => true | ||
50 | + ); | ||
51 | + echo $this->getRequest()->getActionName(); | ||
52 | + $uid = $this->getUid(); | ||
53 | + if ($uid) { | ||
54 | + $data['isLogin'] = true; | ||
55 | + $uid = 8826435; | ||
56 | + $data += \Index\UserModel::getUserProfileData($uid); | ||
57 | + $data += \Index\UserModel::getInfoNumData($uid); | ||
58 | + | ||
59 | + // 优选新品数据 | ||
60 | + $channel = Helpers::getChannelByCookie(); | ||
61 | + $data['recommendForYou'] = \Index\UserModel::getPreferenceData($channel); | ||
62 | + } | ||
58 | 63 | ||
59 | $this->_view->display('index', $data); | 64 | $this->_view->display('index', $data); |
60 | } | 65 | } |
@@ -127,6 +132,7 @@ class HomeController extends AbstractAction | @@ -127,6 +132,7 @@ class HomeController extends AbstractAction | ||
127 | // $uid = $this->getUid(); | 132 | // $uid = $this->getUid(); |
128 | $uid = 967016; | 133 | $uid = 967016; |
129 | $data = \Index\UserModel::getUserProfileData($uid); | 134 | $data = \Index\UserModel::getUserProfileData($uid); |
135 | + $data['personalDetailsPage'] = true; | ||
130 | $data['pageFooter'] = true; | 136 | $data['pageFooter'] = true; |
131 | $this->_view->display('personal-details', $data); | 137 | $this->_view->display('personal-details', $data); |
132 | } | 138 | } |
@@ -520,7 +526,7 @@ class HomeController extends AbstractAction | @@ -520,7 +526,7 @@ class HomeController extends AbstractAction | ||
520 | { | 526 | { |
521 | echo " "; | 527 | echo " "; |
522 | } | 528 | } |
523 | - elseif ($page = 1) | 529 | + elseif ($page == 1) |
524 | { | 530 | { |
525 | $order['walkwayUrl'] = self::strollAction(); | 531 | $order['walkwayUrl'] = self::strollAction(); |
526 | } | 532 | } |
@@ -20,6 +20,7 @@ class DetailController extends AbstractAction | @@ -20,6 +20,7 @@ class DetailController extends AbstractAction | ||
20 | 'navHome' => 'sss ', | 20 | 'navHome' => 'sss ', |
21 | 'navTitle' => '商品详情TEST' | 21 | 'navTitle' => '商品详情TEST' |
22 | ), | 22 | ), |
23 | + | ||
23 | 'bannerTop' => array ( | 24 | 'bannerTop' => array ( |
24 | 'list' => array ( | 25 | 'list' => array ( |
25 | array ( | 26 | array ( |
@@ -65,11 +66,13 @@ SHOE BQT KEN BLOCK', | @@ -65,11 +66,13 @@ SHOE BQT KEN BLOCK', | ||
65 | ), | 66 | ), |
66 | 'goodsDiscount'=>'【summer final sale】满¥499立享6.8折', | 67 | 'goodsDiscount'=>'【summer final sale】满¥499立享6.8折', |
67 | 'feedbacks'=>array( | 68 | 'feedbacks'=>array( |
68 | - 'commentName'=>'商品评价(15)', | ||
69 | - 'consultName' =>'购买咨询(2)', | 69 | + 'commentsNum'=>2, |
70 | + 'consultsNum'=>10, | ||
71 | + 'commentName'=>'商品评价', | ||
72 | + 'consultName' =>'购买咨询', | ||
70 | 'moreComments'=>'http://www.baidu.com', | 73 | 'moreComments'=>'http://www.baidu.com', |
74 | + 'moreConsults'=>'http://www.baidu.com', | ||
71 | 'comments'=>array( | 75 | 'comments'=>array( |
72 | - | ||
73 | array( | 76 | array( |
74 | 'userName'=>'Lynnic', | 77 | 'userName'=>'Lynnic', |
75 | 'desc'=>'购买了白色Mate7', | 78 | 'desc'=>'购买了白色Mate7', |
@@ -79,8 +82,14 @@ SHOE BQT KEN BLOCK', | @@ -79,8 +82,14 @@ SHOE BQT KEN BLOCK', | ||
79 | ) | 82 | ) |
80 | ), | 83 | ), |
81 | 'consults'=>array( | 84 | 'consults'=>array( |
85 | + array( | ||
86 | + 'question' =>'您好 我一米七七 140斤 穿M的行吗', | ||
87 | + 'time'=>'2014-08-12 10:24:26', | ||
88 | + 'answer'=>'您好,建议您参考XL的款式,由于版型和个人穿衣风格不同,需要' | ||
89 | + ) | ||
82 | ) | 90 | ) |
83 | ), | 91 | ), |
92 | + | ||
84 | 'enterStore'=>array( | 93 | 'enterStore'=>array( |
85 | 'img'=>'http://static.dev.yohobuy.com/img/product/store.png', | 94 | 'img'=>'http://static.dev.yohobuy.com/img/product/store.png', |
86 | 'storeName'=>'Stussy', | 95 | 'storeName'=>'Stussy', |
@@ -224,9 +233,109 @@ SHOE BQT KEN BLOCK', | @@ -224,9 +233,109 @@ SHOE BQT KEN BLOCK', | ||
224 | ); | 233 | ); |
225 | 234 | ||
226 | $this->_view->assign('title', '商品详情'); | 235 | $this->_view->assign('title', '商品详情'); |
227 | - //$this->_view->display('brand', compact('brands')); | 236 | + // $this->_view->display('brand', compact('brands')); |
228 | 237 | ||
229 | // 渲染模板 | 238 | // 渲染模板 |
230 | $this->_view->display('index', $data); | 239 | $this->_view->display('index', $data); |
231 | } | 240 | } |
241 | + | ||
242 | + public function commentsAction(){ | ||
243 | + $data = array( | ||
244 | + 'goodsCommentsPage' =>true, | ||
245 | + 'pageHeader' => array ( | ||
246 | + 'navBack' => 'sss ', | ||
247 | + // 'navHome' => 'sss ', | ||
248 | + 'navTitle' => '购买评价(6)' | ||
249 | + ), | ||
250 | + 'pageFooter' => true, | ||
251 | + 'comments'=>array( | ||
252 | + 'list' =>array( | ||
253 | + array( | ||
254 | + 'userName'=>'Lynnic', | ||
255 | + 'desc'=>'购买了白色Mate7', | ||
256 | + 'content'=>'活动时买的,挺超值。上身效果也不错。质量 | ||
257 | + 很好,买送人的,很满意。而且物流相当给...', | ||
258 | + 'time'=>'2014-08-12 10:24:26' | ||
259 | + ), | ||
260 | + array( | ||
261 | + 'userName'=>'Lynnic', | ||
262 | + 'desc'=>'购买了白色Mate7', | ||
263 | + 'content'=>'活动时买的,挺超值。上身效果也不错。质量 | ||
264 | + 很好,买送人的,很满意。而且物流相当给...', | ||
265 | + 'time'=>'2014-08-12 10:24:26' | ||
266 | + ), | ||
267 | + array( | ||
268 | + 'userName'=>'Lynnic', | ||
269 | + 'desc'=>'购买了白色Mate7', | ||
270 | + 'content'=>'活动时买的,挺超值。上身效果也不错。质量 | ||
271 | + 很好,买送人的,很满意。而且物流相当给...', | ||
272 | + 'time'=>'2014-08-12 10:24:26' | ||
273 | + ) | ||
274 | + | ||
275 | + ) | ||
276 | + ), | ||
277 | + ); | ||
278 | + | ||
279 | + $this->_view->assign('title', '购买评价'); | ||
280 | + //$this->_view->display('brand', compact('brands')); | ||
281 | + | ||
282 | + // 渲染模板 | ||
283 | + $this->_view->display('comments', $data); | ||
284 | + } | ||
285 | + | ||
286 | + | ||
287 | + public function consultsAction(){ | ||
288 | + $data = array( | ||
289 | + 'goodsConsultsPage' =>true, | ||
290 | + 'pageHeader' => array ( | ||
291 | + 'navBack' => 'sss ', | ||
292 | + // 'navHome' => 'sss ', | ||
293 | + 'navTitle' => '购买咨询(6)' | ||
294 | + ), | ||
295 | + 'pageFooter' => true, | ||
296 | + 'consults'=>array( | ||
297 | + 'list' =>array( | ||
298 | + array( | ||
299 | + 'question' =>'您好 我一米七七 140斤 穿M的行吗', | ||
300 | + 'time'=>'2014-08-12 10:24:26', | ||
301 | + 'answer'=>'您好,建议您参考XL的款式,由于版型和个人穿衣风格不同,需要' | ||
302 | + ), | ||
303 | + array( | ||
304 | + 'question' =>'您好 我一米七七 140斤 穿M的行吗', | ||
305 | + 'time'=>'2014-08-12 10:24:26', | ||
306 | + 'answer'=>'您好,建议您参考XL的款式,由于版型和个人穿衣风格不同,需要' | ||
307 | + ), | ||
308 | + array( | ||
309 | + 'question' =>'您好 我一米七七 140斤 穿M的行吗', | ||
310 | + 'time'=>'2014-08-12 10:24:26', | ||
311 | + 'answer'=>'您好,建议您参考XL的款式,由于版型和个人穿衣风格不同,需要' | ||
312 | + ) | ||
313 | + | ||
314 | + ) | ||
315 | + ), | ||
316 | + ); | ||
317 | + | ||
318 | + $this->_view->assign('title', '购买咨询'); | ||
319 | + //$this->_view->display('brand', compact('brands')); | ||
320 | + | ||
321 | + // 渲染模板 | ||
322 | + $this->_view->display('consults', $data); | ||
323 | + } | ||
324 | + | ||
325 | + public function consultformAction(){ | ||
326 | + $data = array( | ||
327 | + 'consultform' =>true, | ||
328 | + 'pageHeader' => array ( | ||
329 | + 'navBack' => 'sss ', | ||
330 | + // 'navHome' => 'sss ', | ||
331 | + 'navTitle' => '我要咨询' | ||
332 | + ) | ||
333 | + ); | ||
334 | + | ||
335 | + $this->_view->assign('title', '我要咨询'); | ||
336 | + //$this->_view->display('brand', compact('brands')); | ||
337 | + | ||
338 | + // 渲染模板 | ||
339 | + $this->_view->display('consultform', $data); | ||
340 | + } | ||
232 | } | 341 | } |
-
Please register or login to post a comment