fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit 91d0aa3e761e49a93c741232394670e5f23807c4 2 parents 674bc2cf b44b8bff

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

Inline Side-by-side
Showing 9 changed files with 67 additions and 52 deletions
@@ -802,19 +802,23 @@ @@ -802,19 +802,23 @@
802 { 802 {
803 id: 1, 803 id: 1,
804 chosed: true, 804 chosed: true,
805 - name: '黄色'  
806 - },  
807 - ...  
808 - ],  
809 - sizes: [  
810 - {  
811 - id: 2,  
812 - chosed: true,  
813 - name: 'X' 805 + name: '黄色'，
  806 + colorNum：10，
  807 + shortUrl：'',
  808 + sizes: [
  809 + {
  810 + id: 2,
  811 + chosed: true,
  812 + name: 'X',
  813 + sizeNum: 2
  814 + },
  815 + ...
  816 + ]
814 }, 817 },
815 ... 818 ...
816 ], 819 ],
817 - num: 2 820 +
  821 + totalNum: 20
818 } 822 }
819 823
820 ### 购物车商品 824 ### 购物车商品
@@ -1113,7 +1117,8 @@ @@ -1113,7 +1117,8 @@
1113 'feedbacks' : { 1117 'feedbacks' : {
1114 'commentsNum' : 0, 1118 'commentsNum' : 0,
1115 'consultsNum' : 1, 1119 'consultsNum' : 1,
1116 - 'link' : '', 1120 + 'commentsUrl' : '',
  1121 + 'consultsUrl' : '',
1117 'comments' : [ 1122 'comments' : [
1118 { 1123 {
1119 'userName' : 'Lynnic', 1124 'userName' : 'Lynnic',
@@ -1243,6 +1248,20 @@ @@ -1243,6 +1248,20 @@
1243 'id' : '', 1248 'id' : '',
1244 'preferenceUrl' :'' 1249 'preferenceUrl' :''
1245 } 1250 }
  1251 +### 评价列表页面
  1252 + {
  1253 + 'comments':{
  1254 + 'list' : [
  1255 + {
  1256 + 'userName':'',
  1257 + 'desc':'',
  1258 + 'content':'',
  1259 + 'time':''
  1260 + }
  1261 + ...
  1262 + ]
  1263 + }
  1264 + }
1246 ### 咨询列表页面 1265 ### 咨询列表页面
1247 { 1266 {
1248 'link' : '咨询表单跳转url', 1267 'link' : '咨询表单跳转url',
@@ -182,8 +182,8 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() { @@ -182,8 +182,8 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
182 $(this).addClass('highlight'); 182 $(this).addClass('highlight');
183 }).on('touchend touchcancel', '.tap-hightlight', function() { 183 }).on('touchend touchcancel', '.tap-hightlight', function() {
184 $(this).removeClass('highlight'); 184 $(this).removeClass('highlight');
  185 +});
185 186
186 -});  
187 $('.nav-home').on('touchstart', function() { 187 $('.nav-home').on('touchstart', function() {
188 $('.homebuttom').toggleClass('none'); 188 $('.homebuttom').toggleClass('none');
189 }); 189 });
@@ -9,10 +9,7 @@ var $ = require('jquery'), @@ -9,10 +9,7 @@ var $ = require('jquery'),
9 9
10 var commentsNum,consultsNum; 10 var commentsNum,consultsNum;
11 11
12 -var consultFooterEle = $('.consult-content-footer')[0],  
13 - consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),  
14 -  
15 - navtabEle = document.getElementById('nav-tab'), 12 +var navtabEle = document.getElementById('nav-tab'),
16 navtabHammer = navtabEle && new Hammer(navtabEle), 13 navtabHammer = navtabEle && new Hammer(navtabEle),
17 14
18 gotoConsultEle = document.getElementById('goto-consult'), 15 gotoConsultEle = document.getElementById('goto-consult'),
@@ -66,12 +63,6 @@ if (navtabHammer) { @@ -66,12 +63,6 @@ if (navtabHammer) {
66 }); 63 });
67 } 64 }
68 65
69 -if (consultFooterHammer) {  
70 - consultFooterHammer.on('tap', function() {  
71 - location.href = $(consultFooterEle).data('href');  
72 - });  
73 -}  
74 -  
75 if (gotoConsultHammer) { 66 if (gotoConsultHammer) {
76 gotoConsultHammer.on('tap', function() { 67 gotoConsultHammer.on('tap', function() {
77 location.href = $(gotoConsultEle).data('href'); 68 location.href = $(gotoConsultEle).data('href');
@@ -168,9 +168,6 @@ @@ -168,9 +168,6 @@
168 &.focus { 168 &.focus {
169 color: #000; 169 color: #000;
170 } 170 }
171 - .comments-num {  
172 - display: none;  
173 - }  
174 } 171 }
175 .comment-nav { 172 .comment-nav {
176 border-right: 1px solid #ccc; 173 border-right: 1px solid #ccc;
@@ -286,17 +283,16 @@ @@ -286,17 +283,16 @@
286 283
287 .comment-content-footer, 284 .comment-content-footer,
288 .consult-content-footer { 285 .consult-content-footer {
  286 + display: block;
289 min-height: pxToRem(88px); 287 min-height: pxToRem(88px);
290 text-align: center; 288 text-align: center;
291 background-color: #fff; 289 background-color: #fff;
292 border-bottom: 1px solid $borderC; 290 border-bottom: 1px solid $borderC;
293 line-height: pxToRem(88px); 291 line-height: pxToRem(88px);
294 font-size: pxToRem(28px); 292 font-size: pxToRem(28px);
295 - a {  
296 - color: #b0b0b0;  
297 - .iconfont {  
298 - font-size: inherit;  
299 - } 293 + color: #b0b0b0;
  294 + .iconfont {
  295 + font-size: inherit;
300 } 296 }
301 } 297 }
302 298
@@ -250,8 +250,15 @@ $basicBtnC:#eb0313; @@ -250,8 +250,15 @@ $basicBtnC:#eb0313;
250 padding-right: pxToRem(28px); 250 padding-right: pxToRem(28px);
251 border-bottom: 1px solid $borderC; 251 border-bottom: 1px solid $borderC;
252 background-color: $pageBgC; 252 background-color: $pageBgC;
253 - display: flex;  
254 - align-items: center; 253 + @include flexbox((
  254 + box-flex: 1.0,
  255 + display: box,
  256 + box-align: center
  257 + ), $version: 1);
  258 + @include flexbox((
  259 + display: flex,
  260 + align-items: center
  261 + ));
255 span{ 262 span{
256 // display: table-cell; 263 // display: table-cell;
257 display: -webkit-box; 264 display: -webkit-box;
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="iHelp"> 2 <div class="iHelp">
3 <ul> 3 <ul>
4 {{# iHelp}} 4 {{# iHelp}}
5 - <li><a href="/home/helpDetail?caption={{ caption}}"><span>{{ caption}}</span><i class="iconfont num">&#xe604;</i></a></li> 5 + <li><a href="/home/helpDetail?code={{ code}}"><span>{{ name}}</span><i class="iconfont num">&#xe604;</i></a></li>
6 {{/ iHelp}} 6 {{/ iHelp}}
7 </ul> 7 </ul>
8 </div> 8 </div>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{userName}} 8 {{userName}}
9 </span> 9 </span>
10 <span class="goods-spec"> 10 <span class="goods-spec">
11 - {{desc}} 11 + &nbsp;购买了&nbsp;&nbsp;{{desc}}
12 </span> 12 </span>
13 <p class="detail-content"> 13 <p class="detail-content">
14 {{content}} 14 {{content}}
1 <ul id="nav-tab" class="nav-tab clearfix"> 1 <ul id="nav-tab" class="nav-tab clearfix">
2 - <li class="comment-nav tap-hightlight">商品评价<span class="comments-num">{{commentsNum}}</span></li> 2 + <li class="comment-nav tap-hightlight">商品评价(<span class="comments-num">{{commentsNum}}</span>)</li>
3 <li class="consult-nav tap-hightlight">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li> 3 <li class="consult-nav tap-hightlight">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
4 </ul> 4 </ul>
5 <div id="feedback-content" > 5 <div id="feedback-content" >
@@ -21,6 +21,10 @@ @@ -21,6 +21,10 @@
21 </span> 21 </span>
22 {{/ comments}} 22 {{/ comments}}
23 </div> 23 </div>
  24 + <a class="comment-content-footer tap-hightlight" href="{{commentsUrl}}">
  25 + 查看更多
  26 + <span class="iconfont">&#xe604;</span>
  27 + </a>
24 {{^}} 28 {{^}}
25 <div class="comment-content-main content-main no-item"> 29 <div class="comment-content-main content-main no-item">
26 <span class="iconfont">&#xe63d;</span>暂无评论 30 <span class="iconfont">&#xe63d;</span>暂无评论
@@ -46,17 +50,16 @@ @@ -46,17 +50,16 @@
46 </div> 50 </div>
47 {{/ consults}} 51 {{/ consults}}
48 </div> 52 </div>
49 - <div class="consult-content-footer tap-hightlight" data-href="{{link}}">  
50 - <a href="javascript:;">  
51 - 查看更多  
52 - <span class="iconfont">&#xe604;</span></a>  
53 - </div> 53 + <a class="consult-content-footer tap-hightlight" href="{{consultsUrl}}">
  54 + 查看更多
  55 + <span class="iconfont">&#xe604;</span>
  56 + </a>
54 {{else}} 57 {{else}}
55 <div class="consult-content-main content-main no-item"> 58 <div class="consult-content-main content-main no-item">
56 <span class="iconfont">&#xe63f;</span>暂无咨询 59 <span class="iconfont">&#xe63f;</span>暂无咨询
57 </div> 60 </div>
58 61
59 - <div class="consult-content-footer tap-hightlight" data-href="{{link}}"> 62 + <div class="consult-content-footer tap-hightlight" data-href="{{commentsLink}}">
60 <a href="javascript:;"> 63 <a href="javascript:;">
61 我要咨询 64 我要咨询
62 <span class="iconfont">&#xe604;</span></a> 65 <span class="iconfont">&#xe604;</span></a>
@@ -874,17 +874,16 @@ class HomeController extends AbstractAction @@ -874,17 +874,16 @@ class HomeController extends AbstractAction
874 /** 874 /**
875 * 帮助列表页 875 * 帮助列表页
876 */ 876 */
877 - public function helpAction()  
878 - {  
879 - $this->setTitle('帮助中心');  
880 - $this->setNavHeader('帮助中心');  
881 - $data = array(  
882 - 'iHelp' => array(  
883 - array('caption' => '新用户注册'),  
884 - )  
885 - );  
886 - $this->_view->display('i-help', $data);  
887 - } 877 + public function helpAction()
  878 + {
  879 + $service = Home\HelpModel::serviceInfo();
  880 + $this->setTitle('帮助中心');
  881 + $this->setNavHeader('帮助中心');
  882 + $data = array(
  883 + 'iHelp' =>$service,
  884 + );
  885 + $this->_view->display('i-help', $data);
  886 + }
888 887
889 /** 888 /**
890 * 帮助列表页 889 * 帮助列表页