fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit bc5ac90344f88cd3d7d73fb2d07c85ce6a26b512 2 parents 74f21492 ae56491d

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

Inline Side-by-side
Showing 14 changed files with 250 additions and 219 deletions
@@ -19,7 +19,7 @@ class GradeData @@ -19,7 +19,7 @@ class GradeData
19 * @param string $uid 用户id 19 * @param string $uid 用户id
20 * @return array 接口返回的会员等级数据 20 * @return array 接口返回的会员等级数据
21 */ 21 */
22 - public function getGradeData($gender, $channel, $uid) { 22 + public static function getGradeData($gender, $channel, $uid) {
23 $urlList = array(); 23 $urlList = array();
24 //获取会员等级数据 24 //获取会员等级数据
25 $param = Yohobuy::param(); 25 $param = Yohobuy::param();
@@ -39,4 +39,39 @@ class OrderData @@ -39,4 +39,39 @@ class OrderData
39 return Yohobuy::get(Yohobuy::API_URL2, $param); 39 return Yohobuy::get(Yohobuy::API_URL2, $param);
40 } 40 }
41 41
  42 + /*
  43 + * 取消订单
  44 + * To change this template file, choose Tools | Templates
  45 + * and open the template in the editor.
  46 + */
  47 +
  48 + public function cancelOrderData($order_code, $uid, $gender, $yh_channel, $method) {
  49 + $param = Yohobuy::param();
  50 + $param['order_code'] = $order_code;
  51 + $param['uid'] = $uid;
  52 + $param['gender'] = $gender;
  53 + $param['yh_channel'] = $yh_channel;
  54 + $param['method'] = $method;
  55 + $param['client_secret'] = Sign::getSign($param);
  56 + return Yohobuy::get(Yohobuy::API_URL, $param);
  57 + }
  58 +
  59 + /*
  60 + * 删除订单
  61 + * To change this template file, choose Tools | Templates
  62 + * and open the template in the editor.
  63 + */
  64 +
  65 + public function deleteOrderData($order_code, $uid, $gender, $yh_channel, $method) {
  66 + $param = Yohobuy::param();
  67 + $param['order_code'] = $order_code;
  68 + $param['uid'] = $uid;
  69 + $param['gender'] = $gender;
  70 + $param['yh_channel'] = $yh_channel;
  71 + $param['method'] = $method;
  72 + $param['client_secret'] = Sign::getSign($param);
  73 +
  74 + return Yohobuy::get(Yohobuy::API_URL, $param);
  75 + }
  76 +
42 } 77 }
@@ -81,7 +81,7 @@ lazyLoad(); @@ -81,7 +81,7 @@ lazyLoad();
81 $navLi.width(100 / liCount + '%'); 81 $navLi.width(100 / liCount + '%');
82 }()); 82 }());
83 83
84 -loading.init(); 84 +loading.init($('body')); //满屏loading
85 85
86 //导航切换 86 //导航切换
87 navHammer = new Hammer(document.getElementById('order-nav')); 87 navHammer = new Hammer(document.getElementById('order-nav'));
1 var $ = require('jquery'), 1 var $ = require('jquery'),
2 Hammer = require('yoho.hammer'), 2 Hammer = require('yoho.hammer'),
3 Swiper = require('yoho.iswiper'), 3 Swiper = require('yoho.iswiper'),
4 - lazyLoad = require('yoho.lazyload')  
5 -  
6 -loading = require('../../plugin/loading');; 4 + lazyLoad = require('yoho.lazyload'),
  5 + loading = require('../../plugin/loading');
7 6
8 var page = 1, 7 var page = 1,
9 winH, 8 winH,
@@ -17,4 +17,4 @@ @@ -17,4 +17,4 @@
17 <p>有效期:2014.07.28 - 2014.09.15</p> 17 <p>有效期:2014.07.28 - 2014.09.15</p>
18 </div> 18 </div>
19 </div> 19 </div>
20 -{{> layout/not-footer}}  
  20 +{{> layout/footer}}
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
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 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></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>
8 <li><span>会员等级</span> 8 <li><span>会员等级</span>
9 <span> 9 <span>
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <div class="s-goods-nav goods-nav"> 2 <div class="s-goods-nav goods-nav">
3 <ul class="swiper-wrapper clearfix"> 3 <ul class="swiper-wrapper clearfix">
4 {{# tabs}} 4 {{# tabs}}
5 - {{# title}}  
6 - <li class="swiper-slide nav-item">  
7 - <span data-sort="{{ params}}" data-id="{{ id}}" >{{ name}}</span>  
8 - </li> 5 + {{# title}}
  6 + <li class="swiper-slide nav-item {{#if @first}} active{{/if}}">
  7 + <span data-sort="{{ params}}" data-id="{{ id}}" >{{ name}}</span>
  8 + </li>
9 {{/ title}} 9 {{/ title}}
10 {{/ tabs}} 10 {{/ tabs}}
11 </ul> 11 </ul>
1 -  
2 -{{#if hasWxShare}}  
3 - <script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>  
4 -{{/if}}  
5 -{{#if rlsEnv}}  
6 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
7 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>  
8 -{{/if}}  
9 -{{#if preEnv}}  
10 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
11 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>  
12 -{{/if}}  
13 -{{#if testEnv}}  
14 -<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script>  
15 -<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>  
16 -{{/if}}  
17 -{{#if devEnv}}  
18 -<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>  
19 -<script>seajs.config({base: 'http://localhost:8000/'});</script>  
20 -{{/if}}  
21 -  
22 -<script type="text/javascript">  
23 - (function(w,d,s,j,f){  
24 - w['YohoAcquisitionObject']=f;  
25 - w[f]=function(){w[f].p=arguments;};  
26 - var a=d.createElement(s);  
27 - var m=d.getElementsByTagName(s)[0];  
28 - a.async=1;  
29 - a.src=j;  
30 - m.parentNode.insertBefore(a,m);  
31 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas.js','_yas');  
32 -</script>  
33 -  
34 -{{> layout/use}}  
35 -  
36 -{{> layout/analysis}}  
37 -</body>  
38 -</html>  
@@ -4,6 +4,7 @@ use Action\AbstractAction; @@ -4,6 +4,7 @@ use Action\AbstractAction;
4 use home\GradeModel; 4 use home\GradeModel;
5 use home\OrderModel; 5 use home\OrderModel;
6 use Plugin\Helpers; 6 use Plugin\Helpers;
  7 +use LibModels\Wap\Home\OrderData;
7 8
8 /** 9 /**
9 * 个人中心相关的控制器 10 * 个人中心相关的控制器
@@ -25,10 +26,10 @@ class HomeController extends AbstractAction @@ -25,10 +26,10 @@ class HomeController extends AbstractAction
25 $this->setTitle('个人中心'); 26 $this->setTitle('个人中心');
26 $this->setNavHeader('个人中心', true, SITE_MAIN); 27 $this->setNavHeader('个人中心', true, SITE_MAIN);
27 28
28 - // $uid = $this->getUid();  
29 - $uid = 8826435;  
30 - $data = \Index\UserModel::getUserProfileData($uid);  
31 - $data += \Index\UserModel::getInfoNumData($uid); 29 + // $uid = $this->getUid();
  30 + $uid = 8826435;
  31 + $data = \Index\UserModel::getUserProfileData($uid);
  32 + $data += \Index\UserModel::getInfoNumData($uid);
32 33
33 // 优选新品数据 34 // 优选新品数据
34 $channel = Helpers::getChannelByCookie(); 35 $channel = Helpers::getChannelByCookie();
@@ -41,57 +42,6 @@ class HomeController extends AbstractAction @@ -41,57 +42,6 @@ class HomeController extends AbstractAction
41 $this->_view->display('index', $data); 42 $this->_view->display('index', $data);
42 } 43 }
43 44
44 - /**  
45 - * 用户订单  
46 - */  
47 - public function ordersAction()  
48 - {  
49 - // 设置网站标题  
50 - $this->setTitle('我的订单');  
51 - $this->setNavHeader('我的订单', true, SITE_MAIN);  
52 -  
53 - $uid = $this->getUid();  
54 - $uid = 8826435;  
55 - $type = $this->get('type', 1);  
56 -  
57 - $order = \Index\UserModel::getUserOrderData($uid, $type);  
58 -  
59 - $order = array(  
60 - 'orders' => array(  
61 - array(  
62 - 'orderNum' => '408539077',  
63 - 'tradingStatus' => '交易成功',  
64 - 'goods' => array(  
65 - array(  
66 - 'id' => 1,  
67 - 'thumb' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
68 - 'name' => 'Adidas Originals ZX FLUXM22508',  
69 - 'color' => '黄',  
70 - 'size' => '43',  
71 - 'price' => '699.00',  
72 - 'count' => '2'  
73 - ),  
74 - array(  
75 - 'id' => 1,  
76 - 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/11/04/05/0188f1aca49ac478a565ec029b5d2d4a6c.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
77 - 'name' => 'B.Duck浴室玩伴mini浮水鸭',  
78 - 'gift' => true,  
79 - 'color' => '黄',  
80 - 'size' => '43',  
81 - 'price' => '0.00',  
82 - 'count' => '1'  
83 - )  
84 - ),  
85 - 'count' => 2,  
86 - 'sumCost' => '699.00',  
87 - 'unpaid' => true,  
88 - )  
89 - )  
90 - );  
91 -  
92 - $this->_view->display('order', array('order' => $order, 'orderPage' => true));  
93 - }  
94 -  
95 /** 45 /**
96 * 用户收藏的商品 46 * 用户收藏的商品
97 */ 47 */
@@ -131,7 +81,7 @@ class HomeController extends AbstractAction @@ -131,7 +81,7 @@ class HomeController extends AbstractAction
131 ), 81 ),
132 'hasFavBrand' => array( 82 'hasFavBrand' => array(
133 '0' => array( 83 '0' => array(
134 - 'id'=> '1', 84 + 'id' => '1',
135 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', 85 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
136 'brandName' => 'VANS', 86 'brandName' => 'VANS',
137 'update' => 12, 87 'update' => 12,
@@ -161,7 +111,7 @@ class HomeController extends AbstractAction @@ -161,7 +111,7 @@ class HomeController extends AbstractAction
161 ) 111 )
162 ), 112 ),
163 '1' => array( 113 '1' => array(
164 - 'id'=> '2', 114 + 'id' => '2',
165 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', 115 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
166 'brandName' => 'VANS', 116 'brandName' => 'VANS',
167 'update' => 12, 117 'update' => 12,
@@ -191,7 +141,7 @@ class HomeController extends AbstractAction @@ -191,7 +141,7 @@ class HomeController extends AbstractAction
191 ) 141 )
192 ), 142 ),
193 '2' => array( 143 '2' => array(
194 - 'id'=> '3', 144 + 'id' => '3',
195 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90', 145 'brandImg' => 'http://img11.static.yhbimg.com/goodsimg/2015/11/04/05/01ce2aff32fc3c90584f516167cd526d91.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
196 'brandName' => 'VANS', 146 'brandName' => 'VANS',
197 'update' => 12, 147 'update' => 12,
@@ -237,26 +187,14 @@ class HomeController extends AbstractAction @@ -237,26 +187,14 @@ class HomeController extends AbstractAction
237 * YOHO币 187 * YOHO币
238 */ 188 */
239 public function currencyAction() { 189 public function currencyAction() {
240 - // $uid = $this->getUid();  
241 - $this->setNavHeader('YOHO币', true, false); 190 + $this->setTitle('YOHO币');
  191 + $this->setNavHeader('优惠券', true, SITE_MAIN);
242 192
243 $uid = 967016; 193 $uid = 967016;
244 $currency = \Index\UserModel::getYohoCoinData($uid); 194 $currency = \Index\UserModel::getYohoCoinData($uid);
245 195
246 - $this->setTitle('优惠券');  
247 - $this->setNavHeader('优惠券', true, SITE_MAIN);  
248 - // $uid = $this->getUid();  
249 - $uid = 8826435;  
250 - $coupons = array(  
251 - 'couponsUrl' => array(  
252 - \Index\UserModel::getCouponData($uid, 0),  
253 - \Index\UserModel::getCouponData($uid, 1),  
254 - ),  
255 - 'couponsPage' => true  
256 - );  
257 -  
258 - print_r($coupons);  
259 - $this->_view->display('coupons', $coupons); 196 + $currency['pageFooter'] = true;
  197 + $this->_view->display('currency', $currency);
260 } 198 }
261 199
262 /** 200 /**
@@ -403,19 +341,19 @@ class HomeController extends AbstractAction @@ -403,19 +341,19 @@ class HomeController extends AbstractAction
403 * 意见反馈 341 * 意见反馈
404 */ 342 */
405 public function suggestAction() { 343 public function suggestAction() {
  344 + // 设置网站标题
  345 + $this->setTitle('意见反馈');
  346 + $this->setNavHeader('意见反馈', true, SITE_MAIN);
  347 +
406 $udid = $this->getUdid(); 348 $udid = $this->getUdid();
407 $page = $this->get('page', 1); 349 $page = $this->get('page', 1);
408 $limit = $this->get('limit', 30); 350 $limit = $this->get('limit', 30);
409 351
410 $suggest = \Index\UserModel::getSuggestData($udid, $page, $limit); 352 $suggest = \Index\UserModel::getSuggestData($udid, $page, $limit);
411 353
412 - //print_r($suggest); 354 + print_r($suggest);
413 $this->_view->display('suggest', array( 355 $this->_view->display('suggest', array(
414 'suggestPage' => true, //加载js 356 'suggestPage' => true, //加载js
415 - 'pageHeader' => array(  
416 - 'navBack' => true,  
417 - 'navTitle' => '意见反馈'  
418 - ),  
419 'pageFooter' => true, 357 'pageFooter' => true,
420 'suggest' => true, 358 'suggest' => true,
421 'suggestContent' => array( 359 'suggestContent' => array(
@@ -441,12 +379,10 @@ class HomeController extends AbstractAction @@ -441,12 +379,10 @@ class HomeController extends AbstractAction
441 )); 379 ));
442 } 380 }
443 381
444 -  
445 /** 382 /**
446 * 意见反馈-提交表单 383 * 意见反馈-提交表单
447 */ 384 */
448 - public function suggest_subAction()  
449 - { 385 + public function suggest_subAction() {
450 $udid = $this->getUdid(); 386 $udid = $this->getUdid();
451 $page = $this->get('page', 1); 387 $page = $this->get('page', 1);
452 $limit = $this->get('limit', 30); 388 $limit = $this->get('limit', 30);
@@ -464,18 +400,16 @@ class HomeController extends AbstractAction @@ -464,18 +400,16 @@ class HomeController extends AbstractAction
464 'suggestSub' => true, 400 'suggestSub' => true,
465 'pageFooter' => true 401 'pageFooter' => true
466 )); 402 ));
467 -  
468 } 403 }
469 404
470 - /**  
471 - * 异步保存意见反馈数据  
472 - */  
473 - public function savesuggestAction()  
474 - {  
475 - if($this->isAjax()) {  
476 - $uid = $this->getUid();  
477 - $content = $this->post('content', '');  
478 - $suggest_type = $this->get('suggest_type', 2); 405 + /**
  406 + * 异步保存意见反馈数据
  407 + */
  408 + public function savesuggestAction() {
  409 + if ($this->isAjax()) {
  410 + $uid = $this->getUid();
  411 + $content = $this->post('content', '');
  412 + $suggest_type = $this->get('suggest_type', 2);
479 $result = \Index\UserModel::saveSuggestData($uid, $content, $suggest_type); 413 $result = \Index\UserModel::saveSuggestData($uid, $content, $suggest_type);
480 414
481 $this->echoJson($result); 415 $this->echoJson($result);
@@ -503,6 +437,7 @@ class HomeController extends AbstractAction @@ -503,6 +437,7 @@ class HomeController extends AbstractAction
503 /* 437 /*
504 * 会员特权查看页 438 * 会员特权查看页
505 */ 439 */
  440 +
506 public function preferentialAction() { 441 public function preferentialAction() {
507 //设置网站seo信息 442 //设置网站seo信息
508 $this->setTitle('会员等级'); 443 $this->setTitle('会员等级');
@@ -519,7 +454,32 @@ class HomeController extends AbstractAction @@ -519,7 +454,32 @@ class HomeController extends AbstractAction
519 /* 454 /*
520 * 我的订单页面 455 * 我的订单页面
521 */ 456 */
  457 +
522 public function orderAction() { 458 public function orderAction() {
  459 + //获得type值
  460 + $type = $this->get('type', 1);
  461 + $this->setTitle('我的订单');
  462 + $this->setNavHeader('我的订单');
  463 + $data = OrderModel::getNavs($type);
  464 + if (!empty($data)) {
  465 + $order['navs'] = $data;
  466 + $order['orderPage'] = true;
  467 + } else {
  468 + $this->error();
  469 + }
  470 +
  471 + $this->_view->display('order', array(
  472 + 'order' => $order,
  473 + 'pageFooter' => true
  474 + ));
  475 + }
  476 +
  477 + //ajax请求订单页面
  478 + public function getOrderAction() {
  479 + //判断是不是ajax请求
  480 + if (!$this->isAjax()) {
  481 + $this->error();
  482 + }
523 //获取基本参数:type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论 483 //获取基本参数:type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论
524 $type = $this->get('type', 1); 484 $type = $this->get('type', 1);
525 $page = $this->get('page', 1); 485 $page = $this->get('page', 1);
@@ -528,58 +488,68 @@ class HomeController extends AbstractAction @@ -528,58 +488,68 @@ class HomeController extends AbstractAction
528 $yh_channel = $this->get('yh_channel', 1); 488 $yh_channel = $this->get('yh_channel', 1);
529 $uid = $this->getUid(); 489 $uid = $this->getUid();
530 $uid = '7566245'; //测试用 490 $uid = '7566245'; //测试用
531 - $this -> setTitle('我的订单');  
532 - $this -> setNavHeader('我的订单');  
533 //调用模型层getOrder方法获得并处理数据 491 //调用模型层getOrder方法获得并处理数据
534 $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid); 492 $data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
535 //如果没有订单数据，就给一个随便逛逛链接 493 //如果没有订单数据，就给一个随便逛逛链接
536 $order = array(); 494 $order = array();
537 - // if (!empty($data)) {  
538 - // $order['orders'] = $data;  
539 - // } else {  
540 - // $order['walkwayUrl'] = 'http://www.baidu.com';  
541 - // }  
542 - $order['navs'] = array(  
543 - array(  
544 - 'name' => '全部',  
545 - 'active' => true,  
546 - 'typeId' => '1'  
547 - ),  
548 - array(  
549 - 'name' => '待付款',  
550 - 'typeId' => '2'  
551 - ),  
552 - array(  
553 - 'name' => '待发货',  
554 - 'typeId' => '3'  
555 - ),  
556 - array(  
557 - 'name' => '待收货',  
558 - 'typeId' => '4'  
559 - )  
560 - ); 495 + if (!empty($data)) {
  496 + $order['orders'] = $data;
  497 + } else {
  498 + $order['walkwayUrl'] = 'http://www.baidu.com';
  499 + }
561 //渲染模板 500 //渲染模板
562 - $this->_view->display('order', array(  
563 - 'order' => $order,  
564 - 'orderPage' => true,  
565 - 'pageFooter' => true  
566 - )); 501 + $this->_view->display('order-content', $order);
567 } 502 }
568 503
569 /* 504 /*
570 - * 我的订单-处理ajax请求页面(切换订单状态) 505 + * 我的订单-取消订单
571 */ 506 */
572 - public function getOrdersAction() { 507 +
  508 + public function cancelOrderAction() {
573 509
574 //判断是不是ajax请求 510 //判断是不是ajax请求
575 if (!$this->isAjax()) { 511 if (!$this->isAjax()) {
576 $this->error(); 512 $this->error();
577 } 513 }
578 - self::orderAction(); 514 + //传入order_code和uid以取消订单
  515 + $order_code = $this->get('orderCode');
  516 + $uid = $this->getUid();
  517 + $uid = '10267443'; //测试用
  518 + $gender = Helpers::getGenderByCookie();
  519 + $yh_channel = $this->get('yh_channel', 1);
  520 + $method = 'app.SpaceOrders.close';
  521 + $data = OrderData::cancelOrderData($order_code, $uid, $gender, $yh_channel, $method);
  522 + if ($data['code'] == 200) {
  523 + echo $data['message'];
  524 + }
579 } 525 }
580 526
581 - public function orderDetailAction()  
582 - { 527 + /*
  528 + * 我的订单-删除订单
  529 + */
  530 +
  531 + public function deleteOrderAction() {
  532 + //判断是不是ajax请求
  533 + if (!$this->isAjax()) {
  534 + $this->error();
  535 + }
  536 + //传入order_code和uid以删除订单
  537 + $order_code = $this->get('orderCode');
  538 + $uid = $this->getUid();
  539 + $uid = '10267443'; //测试用
  540 + $gender = Helpers::getGenderByCookie();
  541 + $yh_channel = $this->get('yh_channel', 1);
  542 + $method = 'app.SpaceOrders.delOrderByCode';
  543 + $data = OrderData::deleteOrderData($order_code, $uid, $gender, $yh_channel, $method);
  544 + if ($data['code'] == 200) {
  545 + echo $data['message'];
  546 + }
  547 + }
  548 +
  549 + /**
  550 + * 订单详情页
  551 + */
  552 + public function orderDetailAction() {
583 $data = array( 553 $data = array(
584 'name' => '毛毛莉Lydia', 554 'name' => '毛毛莉Lydia',
585 'phoneNum' => '18600001133', 555 'phoneNum' => '18600001133',
@@ -587,9 +557,7 @@ class HomeController extends AbstractAction @@ -587,9 +557,7 @@ class HomeController extends AbstractAction
587 'orderStatus' => '订单取消', 557 'orderStatus' => '订单取消',
588 'orderNum' => '418358063', 558 'orderNum' => '418358063',
589 'orderTime' => '2014-03-10 17:25:10', 559 'orderTime' => '2014-03-10 17:25:10',
590 -  
591 'orderCancel' => true, 560 'orderCancel' => true,
592 -  
593 'goods' => array( 561 'goods' => array(
594 array( 562 array(
595 'id' => 1, 563 'id' => 1,
@@ -611,7 +579,6 @@ class HomeController extends AbstractAction @@ -611,7 +579,6 @@ class HomeController extends AbstractAction
611 'count' => '1' 579 'count' => '1'
612 ) 580 )
613 ), 581 ),
614 -  
615 'sumPrice' => 799, 582 'sumPrice' => 799,
616 'salePrice' => 80, 583 'salePrice' => 80,
617 'freight' => 5, 584 'freight' => 5,
@@ -621,4 +588,5 @@ class HomeController extends AbstractAction @@ -621,4 +588,5 @@ class HomeController extends AbstractAction
621 ); 588 );
622 $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true)); 589 $this->_view->display('order-detail', array('orderDetail' => $data, 'orderDetailPage' => true));
623 } 590 }
  591 +
624 } 592 }
@@ -15,7 +15,7 @@ class GradeModel @@ -15,7 +15,7 @@ class GradeModel
15 * 获取个人中心-会员等级数据 15 * 获取个人中心-会员等级数据
16 */ 16 */
17 17
18 - public function getGrade($gender, $channel, $uid) { 18 + public static function getGrade($gender, $channel, $uid) {
19 $result = array(); 19 $result = array();
20 20
21 if (USE_CACHE) { 21 if (USE_CACHE) {
@@ -27,40 +27,42 @@ class GradeModel @@ -27,40 +27,42 @@ class GradeModel
27 } 27 }
28 //调用接口获取数据 28 //调用接口获取数据
29 $data = GradeData::getGradeData($gender, $channel, $uid); 29 $data = GradeData::getGradeData($gender, $channel, $uid);
30 - switch (intval($data['grade']['current_vip_level'])) {  
31 - case 0://普通会员  
32 - $result['vipGrade']['vip0'] = true;  
33 - break;  
34 - case 1://银卡会员  
35 - $result['vipGrade']['vip1'] = true;  
36 - break;  
37 - case 2://金卡会员  
38 - $result['vipGrade']['vip2'] = true;  
39 - break;  
40 - case 3://白金会员  
41 - $result['vipGrade']['vip3'] = true;  
42 - break;  
43 - }  
44 -  
45 - //今年总消费  
46 - $result['vipGrade']['costOfThisYear'] = $data['grade']['current_year_cost'];  
47 - //升级下一等级会员的进度;  
48 - $result['vipGrade']['percent'] = 100 * (round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));  
49 - //距离升级所需消费金额  
50 -  
51 - if ($data['grade']['current_vip_level'] != 3) {  
52 - $result['vipGrade']['costGap'] = $data['grade']['upgrade_need_cost'];  
53 - }  
54 - //消费总计  
55 - $result['vipGrade']['sumCost'] = $data['grade']['current_total_cost'];  
56 - //username 调用获取用户基本信息数据，获得username;  
57 - //$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);  
58 - $result['vipGrade']['name'] = $data['userProfile']['username'];  
59 - //跳转url(会员特权详情)  
60 - $result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential', null);  
61 - //当前vip等级享受的特权  
62 - $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];  
63 30
  31 + if (!empty($data['grade'])) {
  32 + switch (intval($data['grade']['current_vip_level'])) {
  33 + case 0://普通会员
  34 + $result['vipGrade']['vip0'] = true;
  35 + break;
  36 + case 1://银卡会员
  37 + $result['vipGrade']['vip1'] = true;
  38 + break;
  39 + case 2://金卡会员
  40 + $result['vipGrade']['vip2'] = true;
  41 + break;
  42 + case 3://白金会员
  43 + $result['vipGrade']['vip3'] = true;
  44 + break;
  45 + }
  46 +
  47 + //今年总消费
  48 + $result['vipGrade']['costOfThisYear'] = $data['grade']['current_year_cost'];
  49 + //升级下一等级会员的进度;
  50 + $result['vipGrade']['percent'] = 100 * (round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));
  51 + //距离升级所需消费金额
  52 +
  53 + if ($data['grade']['current_vip_level'] != 3) {
  54 + $result['vipGrade']['costGap'] = $data['grade']['upgrade_need_cost'];
  55 + }
  56 + //消费总计
  57 + $result['vipGrade']['sumCost'] = $data['grade']['current_total_cost'];
  58 + //username 调用获取用户基本信息数据，获得username;
  59 + //$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);
  60 + $result['vipGrade']['name'] = $data['userProfile']['username'];
  61 + //跳转url(会员特权详情)
  62 + $result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential', null);
  63 + //当前vip等级享受的特权
  64 + $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
  65 + }
64 66
65 if (USE_CACHE) { 67 if (USE_CACHE) {
66 // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据. 68 // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
@@ -121,5 +121,55 @@ class OrderModel @@ -121,5 +121,55 @@ class OrderModel
121 } 121 }
122 return $arr; 122 return $arr;
123 } 123 }
  124 +
  125 + //根据type值设置nav属性
  126 + public function getNavs($type){
  127 + $nav = array(
  128 + array(
  129 + 'name' => '全部',
  130 + 'typeId' => '1'
  131 + ),
  132 + array(
  133 + 'name' => '待付款',
  134 + 'typeId' => '2'
  135 + ),
  136 + array(
  137 + 'name' => '待发货',
  138 + 'typeId' => '3'
  139 + ),
  140 + array(
  141 + 'name' => '待收货',
  142 + 'typeId' => '4'
  143 + )
  144 + );
  145 + foreach($nav as $key => $vo){
  146 + switch ($type) {
  147 + case 1:
  148 + if($vo['typeId'] == 1){
  149 + $nav[$key]['active'] = true;
  150 + }
  151 + break;
  152 + case 2:
  153 + if($vo['typeId'] == 2){
  154 + $nav[$key]['active'] = true;
  155 + }
  156 + break;
  157 + case 3:
  158 + if($vo['typeId'] == 3){
  159 + $nav[$key]['active'] = true;
  160 + }
  161 + break;
  162 + case 4:
  163 + if($vo['typeId'] == 4){
  164 + $nav[$key]['active'] = true;
  165 + }
  166 + break;
  167 + default:
  168 + break;
  169 + }
  170 + }
  171 + return $nav;
  172 +
  173 + }
124 174
125 } 175 }
@@ -33,6 +33,7 @@ class UserModel @@ -33,6 +33,7 @@ class UserModel
33 // 处理个人详情数据 33 // 处理个人详情数据
34 if (isset($userData['data']) && !empty($userData['data'])) { 34 if (isset($userData['data']) && !empty($userData['data'])) {
35 $result = $userData['data']; 35 $result = $userData['data'];
  36 + $result['gender'] = $result['gender'] == 1 ? '男' : '女';
36 $result['head_ico'] = Images::getImageUrl($result['head_ico'], 128, 128); 37 $result['head_ico'] = Images::getImageUrl($result['head_ico'], 128, 128);
37 } 38 }
38 39
@@ -291,10 +292,10 @@ class UserModel @@ -291,10 +292,10 @@ class UserModel
291 } else if (empty($consignee)) { 292 } else if (empty($consignee)) {
292 $result['code'] = 403; 293 $result['code'] = 403;
293 $result['message'] = '请输入收件人姓名'; 294 $result['message'] = '请输入收件人姓名';
294 - } else if (!empty($email) && Helpers::verifyEmail($email)) { 295 + } else if (!empty($email) && !Helpers::verifyEmail($email)) {
295 $result['code'] = 404; 296 $result['code'] = 404;
296 $result['message'] = '输入的邮箱地址格式不正确'; 297 $result['message'] = '输入的邮箱地址格式不正确';
297 - } else if (!empty($mobile) && Helpers::verifyMobile($mobile)) { 298 + } else if (!empty($mobile) && !Helpers::verifyMobile($mobile)) {
298 $result['code'] = 404; 299 $result['code'] = 404;
299 $result['message'] = '输入的手机号码格式不正确'; 300 $result['message'] = '输入的手机号码格式不正确';
300 } else { 301 } else {
@@ -302,7 +303,8 @@ class UserModel @@ -302,7 +303,8 @@ class UserModel
302 $address = UserData::saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code); 303 $address = UserData::saveAddressData($uid, $address, $area_code, $consignee, $email, $id, $mobile, $zip_code);
303 // 处理返回结果 304 // 处理返回结果
304 if (isset($address['code']) && $address['code'] == 200) { 305 if (isset($address['code']) && $address['code'] == 200) {
305 - $result = $address['data']; 306 + $result['code'] = $address['code'];
  307 + $result['message'] = $address['message'];
306 } 308 }
307 } 309 }
308 310
@@ -348,7 +350,20 @@ class UserModel @@ -348,7 +350,20 @@ class UserModel
348 350
349 // 处理意见反馈数据 351 // 处理意见反馈数据
350 if (isset($suggest['data']) && !empty($suggest['data'])) { 352 if (isset($suggest['data']) && !empty($suggest['data'])) {
351 - $result = $suggest['data']; 353 + $one = array();
  354 + foreach ($suggest['data']['list'] as $val) {
  355 + $one = array();
  356 + $one['hasImage'] = $val['has_image'];
  357 + $one['imgUrl'] = Helpers::getImageUrl($val['cover_image'], 640, 240);
  358 + $one['title'] = $val['filter_content'];
  359 + $one['content'] = $val['reply_content'];
  360 + $one['good'] = $val['is_reliable'];
  361 + $one['bad'] = !$val['is_reliable'];
  362 + $one['goodNum'] = $val['reliable'];
  363 + $one['badNum'] = $val['unreliable'];
  364 +
  365 + $result[] = $one;
  366 + }
352 } 367 }
353 368
354 return $result; 369 return $result;
@@ -112,7 +112,6 @@ class NewsaleController extends AbstractAction @@ -112,7 +112,6 @@ class NewsaleController extends AbstractAction
112 $gender = Helpers::getGenderByCookie(); 112 $gender = Helpers::getGenderByCookie();
113 $result = \Product\NewsaleModel::selectTopData($gender, $sort, $tab_id, $notab, $limit, $page); 113 $result = \Product\NewsaleModel::selectTopData($gender, $sort, $tab_id, $notab, $limit, $page);
114 } 114 }
115 -  
116 if (empty($result)) { 115 if (empty($result)) {
117 echo ' '; 116 echo ' ';
118 } else { 117 } else {