fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by hf
Commit 10207514799401fa41aa1ad078deba0e4ac73524 1 parent ebda7935

do modify template name use _ to -

Inline Side-by-side
Showing 5 changed files with 33 additions and 46 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="my-page yoho-page"> 2 <div class="my-page yoho-page">
3 <div class="my-header"> 3 <div class="my-header">
4 {{#isLogin}} 4 {{#isLogin}}
5 - <a class="user-info" href="/home/personaldetails"> 5 + <a class="user-info" href="/home/mydetails">
6 <img class="user-avatar" src="{{head_ico}}"> 6 <img class="user-avatar" src="{{head_ico}}">
7 <span class="username">{{profile_name}}</span> 7 <span class="username">{{profile_name}}</span>
8 {{#vip_info}} 8 {{#vip_info}}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 {{/isLogin}} 13 {{/isLogin}}
14 {{^isLogin}} 14 {{^isLogin}}
15 <div class="user-info"> 15 <div class="user-info">
16 - <a class="login-btn" href="http://m.dev.yohobuy.com/signin.html"> 16 + <a class="login-btn" href="/signin.html">
17 登录/注册 17 登录/注册
18 </a> 18 </a>
19 </div> 19 </div>
@@ -41,15 +41,15 @@ @@ -41,15 +41,15 @@
41 </a> 41 </a>
42 </div> 42 </div>
43 <div class="order-type clearfix"> 43 <div class="order-type clearfix">
44 - <a class="type-item" href="/home/order"> 44 + <a class="type-item" href="/home/order?type=2">
45 <span class="iconfont">&#xe634;</span> 45 <span class="iconfont">&#xe634;</span>
46 <br>待付款 46 <br>待付款
47 </a> 47 </a>
48 - <a class="type-item" href="/home/order"> 48 + <a class="type-item" href="/home/order?type=3">
49 <span class="iconfont">&#xe63b;</span> 49 <span class="iconfont">&#xe63b;</span>
50 <br>待发货 50 <br>待发货
51 </a> 51 </a>
52 - <a class="type-item" href="/home/order"> 52 + <a class="type-item" href="/home/order?type=4">
53 <span class="iconfont">&#xe633;</span> 53 <span class="iconfont">&#xe633;</span>
54 <br>待收货 54 <br>待收货
55 </a> 55 </a>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </a> 94 </a>
95 </div> 95 </div>
96 <div class="group-list"> 96 <div class="group-list">
97 - <a class="list-item" href="/home/"> 97 + <a class="list-item" href="/help.html">
98 <span class="iconfont icon">&#xe639;</span> 98 <span class="iconfont icon">&#xe639;</span>
99 帮助 99 帮助
100 <span class="iconfont num">&#xe604;</span> 100 <span class="iconfont num">&#xe604;</span>
1 -{{> layout/header}}  
2 -<div class="yoho-suggest-sub-page yoho-page">  
3 - {{# suggestSub}}  
4 - <div class="suggest-sub-form">  
5 - <textarea name="" id="suggest-textarea" placeholder="请输入意见反馈，我们会以消息形式回复您的建议或意见，改进产品体验，谢谢！"></textarea>  
6 - <div id="img-form" class="img-form">  
7 - <ul class="upload-img-list"></ul>  
8 - <span class="img-add">  
9 - <input id="upload-img" type="file" />  
10 - </span>  
11 - </div>  
12 - </div>  
13 - {{/ suggestSub}}  
14 -</div>  
15 -{{> layout/footer}}  
@@ -51,12 +51,12 @@ class HomeController extends AbstractAction @@ -51,12 +51,12 @@ class HomeController extends AbstractAction
51 ); 51 );
52 $uid = $this->getUid(); 52 $uid = $this->getUid();
53 if ($uid) { 53 if ($uid) {
  54 + // 优选新品数据
  55 + $channel = Helpers::getChannelByCookie();
  56 +
54 $data['isLogin'] = true; 57 $data['isLogin'] = true;
55 $data += UserModel::getUserProfileData($uid); 58 $data += UserModel::getUserProfileData($uid);
56 $data += UserModel::getInfoNumData($uid); 59 $data += UserModel::getInfoNumData($uid);
57 -  
58 - // 优选新品数据  
59 - $channel = Helpers::getChannelByCookie();  
60 $data['recommendForYou'] = UserModel::getPreferenceData($channel); 60 $data['recommendForYou'] = UserModel::getPreferenceData($channel);
61 } 61 }
62 62
@@ -120,10 +120,10 @@ class HomeController extends AbstractAction @@ -120,10 +120,10 @@ class HomeController extends AbstractAction
120 /** 120 /**
121 * 个人信息 121 * 个人信息
122 */ 122 */
123 - public function personalDetailsAction() 123 + public function mydetailsAction()
124 { 124 {
125 $this->setTitle('个人信息'); 125 $this->setTitle('个人信息');
126 - $this->setNavHeader('个人信息', true, SITE_MAIN); 126 + $this->setNavHeader('个人信息');
127 127
128 $uid = $this->getUid(); 128 $uid = $this->getUid();
129 $data = UserModel::getUserProfileData($uid); 129 $data = UserModel::getUserProfileData($uid);
@@ -165,16 +165,16 @@ class HomeController extends AbstractAction @@ -165,16 +165,16 @@ class HomeController extends AbstractAction
165 165
166 /** 166 /**
167 * 我的消息 167 * 我的消息
  168 + *
  169 + * 暂时使用老的，因后面APP、PC、WAP会进行一次改版
168 */ 170 */
169 public function messageAction() 171 public function messageAction()
170 { 172 {
171 - $uid = $this->getUid();  
172 - $page = $this->get('page', 0);  
173 - $size = $this->get('size', 10);  
174 -  
175 - $messages = UserModel::getMessageData($uid, $page, $size);  
176 -  
177 - print_r($messages); 173 +// $uid = $this->getUid();
  174 +// $page = $this->get('page', 0);
  175 +// $size = $this->get('size', 10);
  176 +//
  177 +// $messages = UserModel::getMessageData($uid, $page, $size);
178 } 178 }
179 179
180 /** 180 /**
@@ -266,7 +266,9 @@ class HomeController extends AbstractAction @@ -266,7 +266,9 @@ class HomeController extends AbstractAction
266 } 266 }
267 } 267 }
268 268
269 - //在线客服 269 + /**
  270 + * 在线客服
  271 + */
270 public function onlineServiceAction() 272 public function onlineServiceAction()
271 { 273 {
272 // 设置网站标题 274 // 设置网站标题
@@ -282,7 +284,9 @@ class HomeController extends AbstractAction @@ -282,7 +284,9 @@ class HomeController extends AbstractAction
282 )); 284 ));
283 } 285 }
284 286
285 - //在线客服-具体详情 287 + /**
  288 + * 在线客服-具体详情
  289 + */
286 public function onlineServiceDetailAction() 290 public function onlineServiceDetailAction()
287 { 291 {
288 $service = array(); 292 $service = array();
@@ -299,7 +303,7 @@ class HomeController extends AbstractAction @@ -299,7 +303,7 @@ class HomeController extends AbstractAction
299 /** 303 /**
300 * 我的逛 304 * 我的逛
301 */ 305 */
302 - public function myGuangAction() 306 + public function myguangAction()
303 { 307 {
304 $page = $this->get('page', 1); 308 $page = $this->get('page', 1);
305 $limit = $this->get('limit', 10); 309 $limit = $this->get('limit', 10);
@@ -308,7 +312,6 @@ class HomeController extends AbstractAction @@ -308,7 +312,6 @@ class HomeController extends AbstractAction
308 $yh_channel = Helpers::getChannelByCookie(); 312 $yh_channel = Helpers::getChannelByCookie();
309 $guangInfo = \Home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit); 313 $guangInfo = \Home\GuangModel::getMyGuang($uid, $page, $yh_channel, $gender, $limit);
310 $totalPage = $guangInfo['totalPage']; 314 $totalPage = $guangInfo['totalPage'];
311 - unset($guangInfo['totalPage']);  
312 if ($page == 1) { 315 if ($page == 1) {
313 $this->setTitle('我收藏的'); 316 $this->setTitle('我收藏的');
314 $this->setNavHeader('我收藏的', true, ''); 317 $this->setNavHeader('我收藏的', true, '');
@@ -362,7 +365,7 @@ class HomeController extends AbstractAction @@ -362,7 +365,7 @@ class HomeController extends AbstractAction
362 'pageFooter' => true 365 'pageFooter' => true
363 ); 366 );
364 367
365 - $this->_view->display('suggest_sub', $data); 368 + $this->_view->display('suggest-sub', $data);
366 } 369 }
367 370
368 /** 371 /**
@@ -422,6 +425,7 @@ class HomeController extends AbstractAction @@ -422,6 +425,7 @@ class HomeController extends AbstractAction
422 $uid = $this->getUid(); 425 $uid = $this->getUid();
423 $data = GradeModel::getGrade($gender, $channel, $uid); 426 $data = GradeModel::getGrade($gender, $channel, $uid);
424 $data['pageFooter'] = true; 427 $data['pageFooter'] = true;
  428 +
425 $this->_view->display('vip-grade', $data); 429 $this->_view->display('vip-grade', $data);
426 } 430 }
427 431
@@ -466,7 +470,9 @@ class HomeController extends AbstractAction @@ -466,7 +470,9 @@ class HomeController extends AbstractAction
466 )); 470 ));
467 } 471 }
468 472
469 - //ajax请求订单页面 473 + /**
  474 + * ajax请求订单页面
  475 + */
470 public function getOrdersAction() 476 public function getOrdersAction()
471 { 477 {
472 //判断是不是ajax请求 478 //判断是不是ajax请求
@@ -504,10 +510,8 @@ class HomeController extends AbstractAction @@ -504,10 +510,8 @@ class HomeController extends AbstractAction
504 /* 510 /*
505 * 我的订单-取消订单 511 * 我的订单-取消订单
506 */ 512 */
507 -  
508 public function cancelOrderAction() 513 public function cancelOrderAction()
509 { 514 {
510 -  
511 //判断是不是ajax请求 515 //判断是不是ajax请求
512 if (!$this->isAjax()) { 516 if (!$this->isAjax()) {
513 $this->error(); 517 $this->error();
@@ -526,7 +530,6 @@ class HomeController extends AbstractAction @@ -526,7 +530,6 @@ class HomeController extends AbstractAction
526 /* 530 /*
527 * 我的订单-删除订单 531 * 我的订单-删除订单
528 */ 532 */
529 -  
530 public function delOrderAction() 533 public function delOrderAction()
531 { 534 {
532 //判断是不是ajax请求 535 //判断是不是ajax请求
@@ -547,7 +550,6 @@ class HomeController extends AbstractAction @@ -547,7 +550,6 @@ class HomeController extends AbstractAction
547 /* 550 /*
548 * 我的订单-支付链接获取 551 * 我的订单-支付链接获取
549 */ 552 */
550 -  
551 private function paymentAction() 553 private function paymentAction()
552 { 554 {
553 $gender = Helpers::getGenderByCookie(); 555 $gender = Helpers::getGenderByCookie();
@@ -558,7 +560,6 @@ class HomeController extends AbstractAction @@ -558,7 +560,6 @@ class HomeController extends AbstractAction
558 /* 560 /*
559 * 我的订单-随便逛逛链接获取 561 * 我的订单-随便逛逛链接获取
560 */ 562 */
561 -  
562 private function strollAction() 563 private function strollAction()
563 { 564 {
564 //获取性别、频道数据 565 //获取性别、频道数据
@@ -193,7 +193,7 @@ class DetailModel @@ -193,7 +193,7 @@ class DetailModel
193 193
194 if (is_numeric($productSkn)) { 194 if (is_numeric($productSkn)) {
195 // 调用服务 195 // 调用服务
196 - $sizeInfo = DetailData::sizeInfo($productSkn); 196 + $sizeInfo = DetailData::sizeInfo($productSkn); var_dump($sizeInfo); exit;
197 197
198 // 商品信息 198 // 商品信息
199 if (isset($sizeInfo['productDescBo']['erpProductId'])) { 199 if (isset($sizeInfo['productDescBo']['erpProductId'])) {
@@ -49,10 +49,11 @@ class DetailController extends AbstractAction @@ -49,10 +49,11 @@ class DetailController extends AbstractAction
49 public function introAction() 49 public function introAction()
50 { 50 {
51 $productSkn = $this->param('productSkn'); 51 $productSkn = $this->param('productSkn');
  52 + $productSkn = 50027715;
52 if (!is_numeric($productSkn)) { 53 if (!is_numeric($productSkn)) {
53 $this->error(); 54 $this->error();
54 } 55 }
55 - $data = \Product\DetailModel::getSizeInfo($productSkn); 56 + $data = \Product\DetailModel::getSizeInfo($productSkn); var_dump($data);
56 if (array() === $data) { 57 if (array() === $data) {
57 echo ' '; 58 echo ' ';
58 exit(); 59 exit();