fe / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit 2c83e5aa0ba10f81ab3180b453bf6821617e7b6a 2 parents 922f0e57 a6bb6c59

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

Inline Side-by-side
Showing 11 changed files with 87 additions and 67 deletions
@@ -943,7 +943,8 @@ @@ -943,7 +943,8 @@
943 { 943 {
944 name: '', 944 name: '',
945 active: true, 945 active: true,
946 - typeId: 1 946 + typeId: 1,
  947 + url: ''
947 }, 948 },
948 ... 949 ...
949 ] 950 ]
@@ -24,11 +24,12 @@ class Yohobuy @@ -24,11 +24,12 @@ class Yohobuy
24 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 24 const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 /* 测试环境 */ 26 /* 测试环境 */
27 -// const API_URL = 'http://test2.open.yohobuy.com/';  
28 -// const SERVICE_URL = 'http://test.service.api.yohobuy.com/';  
29 -// const YOHOBUY_URL = 'http://www.yohobuy.com/';  
30 -// const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL  
31 -// const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL 27 + // const API_URL = 'http://test2.open.yohobuy.com/';
  28 + // const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
  29 + // const YOHOBUY_URL = 'http://www.yohobuy.com/';
  30 + // const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
  31 + // const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
  32 +
32 33
33 /** 34 /**
34 * 私钥列表 35 * 私钥列表
  1 +/**
  2 + * 我的逛
  3 + * @author xuqi<qi.xu@yoho.cn>
  4 + * @date: 2015/11/17
  5 + */
  6 +
  7 +var $ = require('jquery');
  8 +
  9 +var info = require('../guang/info');
  10 +
  11 +info.initInfoEvt($('#info-list'));
@@ -17,27 +17,32 @@ var winH = $(window).height(); @@ -17,27 +17,32 @@ var winH = $(window).height();
17 17
18 var activeType = $navLi.filter('.active').data('type'); //当前active的项的index 18 var activeType = $navLi.filter('.active').data('type'); //当前active的项的index
19 19
20 -var orderPage = {}; 20 +var order = {
  21 + page: 0,
  22 + end: false
  23 +};
21 24
22 var inAjax = false; 25 var inAjax = false;
23 26
24 var loading = require('../plugin/loading'); 27 var loading = require('../plugin/loading');
25 28
26 -var navHammer, orderHammer; 29 +var orderHammer;
27 30
28 //加载订单 31 //加载订单
29 -function getOrders() { 32 +function getOrders(option) {
30 var opt = { 33 var opt = {
31 type: activeType, 34 type: activeType,
32 - page: orderPage[activeType] ? (orderPage[activeType] + 1) : 1 35 + page: order.page + 1
33 }; 36 };
34 37
  38 + var show = option && option.showLoadingMask;
  39 +
35 if (inAjax) { 40 if (inAjax) {
36 return; 41 return;
37 } 42 }
38 43
39 inAjax = true; 44 inAjax = true;
40 - loading.showLoadingMask(); 45 + show && loading.showLoadingMask();
41 46
42 $.ajax({ 47 $.ajax({
43 type: 'GET', 48 type: 'GET',
@@ -46,23 +51,27 @@ function getOrders() { @@ -46,23 +51,27 @@ function getOrders() {
46 success: function(data) { 51 success: function(data) {
47 var num; 52 var num;
48 53
49 - if (data.code === 200) {  
50 - orderPage[opt.type] = opt.page; 54 + if (data !== ' ') {
  55 + order.page = opt.page;
51 56
52 if (opt.page === 1) { 57 if (opt.page === 1) {
53 - $curContainer.html(data.data); 58 + $curContainer.html(data);
54 lazyLoad($curContainer.find('.lazy')); 59 lazyLoad($curContainer.find('.lazy'));
55 } else { 60 } else {
56 num = $curContainer.children('.order').length; 61 num = $curContainer.children('.order').length;
57 - $curContainer.append(data.data); 62 + $curContainer.append(data);
58 63
59 //lazyload 64 //lazyload
60 - lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ') .lazy')); 65 + lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ')').find('.lazy'));
61 } 66 }
  67 +
  68 + window.rePosFooter(); //重新计算底部位置
  69 + } else {
  70 + order.end = true;
62 } 71 }
63 72
64 inAjax = false; 73 inAjax = false;
65 - loading.hideLoadingMask(); 74 + show && loading.hideLoadingMask();
66 } 75 }
67 }); 76 });
68 } 77 }
@@ -83,33 +92,6 @@ lazyLoad(); @@ -83,33 +92,6 @@ lazyLoad();
83 92
84 loading.init($('body')); //满屏loading 93 loading.init($('body')); //满屏loading
85 94
86 -//导航切换  
87 -navHammer = new Hammer(document.getElementById('order-nav'));  
88 -navHammer.on('tap', function(e) {  
89 - var $cur = $(e.target).closest('li'),  
90 - index;  
91 -  
92 - if ($cur.length === 0 || $cur.hasClass('active')) {  
93 - return;  
94 - }  
95 -  
96 - index = $cur.index();  
97 -  
98 - $navLi.filter('.active').removeClass('active');  
99 - $cur.addClass('active');  
100 -  
101 - $curContainer.addClass('hide');  
102 - $curContainer = $orderContainer.children(':eq(' + index + ')').removeClass('hide');  
103 -  
104 - activeType = $cur.data('type');  
105 -  
106 - if (orderPage[activeType]) {  
107 - return;  
108 - } else {  
109 - getOrders();  
110 - }  
111 -});  
112 -  
113 //点击订单区域跳转订单详情页 95 //点击订单区域跳转订单详情页
114 orderHammer = new Hammer(document.getElementById('order-container')); 96 orderHammer = new Hammer(document.getElementById('order-container'));
115 orderHammer.on('tap', function(e) { 97 orderHammer.on('tap', function(e) {
@@ -168,9 +150,13 @@ orderHammer.on('tap', function(e) { @@ -168,9 +150,13 @@ orderHammer.on('tap', function(e) {
168 }); 150 });
169 151
170 $(window).scroll(function() { 152 $(window).scroll(function() {
171 - if ($(window).scrollTop() + winH > 153 + if (order.end === false && $(window).scrollTop() + winH >
172 $(document).height() - 0.25 * $orderContainer.height()) { 154 $(document).height() - 0.25 * $orderContainer.height()) {
173 - getOrders(); 155 +
  156 + //下拉请求时不显示mask
  157 + getOrders({
  158 + noLoadingMask: true
  159 + });
174 } 160 }
175 }); 161 });
176 162
@@ -11,7 +11,8 @@ var page = 1, @@ -11,7 +11,8 @@ var page = 1,
11 navSwiper, 11 navSwiper,
12 notab = 0, 12 notab = 0,
13 sort = '', 13 sort = '',
14 - id = ''; 14 + id = '',
  15 + noResult = '<p class="no-result">未找到相关搜索结果</p>';
15 16
16 function hotrank(page, sort, tabId, notab) { 17 function hotrank(page, sort, tabId, notab) {
17 loading.showLoadingMask(); 18 loading.showLoadingMask();
@@ -28,7 +29,11 @@ function hotrank(page, sort, tabId, notab) { @@ -28,7 +29,11 @@ function hotrank(page, sort, tabId, notab) {
28 if (page === 1) { 29 if (page === 1) {
29 $('.rank-main').remove(); 30 $('.rank-main').remove();
30 } 31 }
  32 + if (data === ' ') {
  33 + $('#hotRank').html(noResult);
  34 + } else {
31 $('#hotRank').append(data); 35 $('#hotRank').append(data);
  36 + }
32 lazyLoad($('img.lazy')); 37 lazyLoad($('img.lazy'));
33 $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top'); 38 $('.rank-main ul li:gt(2)').find('.item-content i').removeClass('top');
34 winH = $(window).height(); 39 winH = $(window).height();
@@ -45,9 +45,8 @@ @@ -45,9 +45,8 @@
45 p{ 45 p{
46 width: 55.517241%; 46 width: 55.517241%;
47 height: auto; 47 height: auto;
48 - padding: 0 5% 10em / $pxConvertRem;; 48 + padding: 0 5% 18em / $pxConvertRem;;
49 float: left; 49 float: left;
50 - font-size: 44em / $pxConvertRem;  
51 &:first-of-type{ 50 &:first-of-type{
52 padding-top:30em / $pxConvertRem; 51 padding-top:30em / $pxConvertRem;
53 font-size: 60em / $pxConvertRem; 52 font-size: 60em / $pxConvertRem;
@@ -106,7 +106,14 @@ @@ -106,7 +106,14 @@
106 border-bottom: 1px solid #e0e0e0; 106 border-bottom: 1px solid #e0e0e0;
107 background: #fff; 107 background: #fff;
108 108
109 - > li{ 109 + a {
  110 + display: block;
  111 + height: 100%;
  112 + width: 100%;
  113 + color: #b0b0b0;
  114 + }
  115 +
  116 + > li {
110 float: left; 117 float: left;
111 height: 90rem / $pxConvertRem; 118 height: 90rem / $pxConvertRem;
112 width: 25%; 119 width: 25%;
@@ -115,7 +122,7 @@ @@ -115,7 +122,7 @@
115 font-size: 26rem / $pxConvertRem; 122 font-size: 26rem / $pxConvertRem;
116 text-align: center; 123 text-align: center;
117 124
118 - &.active { 125 + &.active a {
119 color: #000; 126 color: #000;
120 } 127 }
121 } 128 }
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
3 <span class="active">未使用</span> 3 <span class="active">未使用</span>
4 <span>已使用</span> 4 <span>已使用</span>
5 </div> 5 </div>
  6 +{{# couponsUrl}}
6 <div class="employ-list"> 7 <div class="employ-list">
  8 +
  9 +{{# unused}}
7 <div class="employ-main"> 10 <div class="employ-main">
8 <span>50</span> 11 <span>50</span>
9 <p>【summer sale】下装满￥399减￥50券</p> 12 <p>【summer sale】下装满￥399减￥50券</p>
10 <p>有效期:2014.07.28 - 2014.09.15</p> 13 <p>有效期:2014.07.28 - 2014.09.15</p>
11 </div> 14 </div>
  15 +{{/ unused}}
12 </div> 16 </div>
13 <div class="employ-list not none"> 17 <div class="employ-list not none">
  18 +{{# used}}
14 <div class="employ-main"> 19 <div class="employ-main">
15 - <span>60</span>  
16 - <p>【summer sale】下装满￥399减￥60券</p>  
17 - <p>有效期:2014.07.28 - 2014.09.15</p> 20 + <span>{{ money }}</span>
  21 + <p>{{ coupon_name }}</p>
  22 + <p>{{ couponValidity }}</p>
18 </div> 23 </div>
  24 +{{/ used}}
19 </div> 25 </div>
  26 +{{/ couponsUrl}}
20 {{> layout/footer}} 27 {{> layout/footer}}
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <ul id="order-nav" class="order-nav clearfix"> 4 <ul id="order-nav" class="order-nav clearfix">
5 {{#each navs}} 5 {{#each navs}}
6 <li {{#if active}}class="active"{{/if}} data-type="{{typeId}}"> 6 <li {{#if active}}class="active"{{/if}} data-type="{{typeId}}">
7 - {{name}} 7 + <a href="{{url}}">{{name}}</a>
8 </li> 8 </li>
9 {{/each}} 9 {{/each}}
10 </ul> 10 </ul>
@@ -212,8 +212,6 @@ class HomeController extends AbstractAction @@ -212,8 +212,6 @@ class HomeController extends AbstractAction
212 'couponsUrl' => \Index\UserModel::getCouponData($uid, $status), 212 'couponsUrl' => \Index\UserModel::getCouponData($uid, $status),
213 'couponsPage' => true 213 'couponsPage' => true
214 ); 214 );
215 - print_r($coupons);  
216 -  
217 $this->_view->display('coupons', $coupons); 215 $this->_view->display('coupons', $coupons);
218 } 216 }
219 217
@@ -361,26 +359,31 @@ class HomeController extends AbstractAction @@ -361,26 +359,31 @@ class HomeController extends AbstractAction
361 } 359 }
362 360
363 /** 361 /**
364 - * 意见反馈-提交表单 362 + * 意见反馈-提交表单页面
365 */ 363 */
366 - public function suggest_subAction() {  
367 - $udid = $this->getUdid();  
368 - $page = $this->get('page', 1);  
369 - $limit = $this->get('limit', 30); 364 + public function suggestSubAction() {
370 365
371 - $suggest = \Index\UserModel::getSuggestData($udid, $page, $limit); 366 + // 设置网站标题
  367 + $this->setTitle('反馈问题');
372 368
373 - //print_r($suggest);  
374 - $this->_view->display('suggest_sub', array( 369 + $param = \Api\Yohobuy::param();
  370 + unset($param['private_key']);
  371 + $param['project'] = 'suggest';
  372 + $param['client_secret'] = 'e7807a9522ab99af8b8fd926e1ebbd9a';
  373 + $data = array(
375 'suggestPage' => true, //加载js 374 'suggestPage' => true, //加载js
376 'pageHeader' => array( 375 'pageHeader' => array(
377 'navBack' => true, 376 'navBack' => true,
378 'navTitle' => '反馈问题', 377 'navTitle' => '反馈问题',
379 'navBtn' => '提交' 378 'navBtn' => '提交'
380 ), 379 ),
  380 + 'param' => $param,
381 'suggestSub' => true, 381 'suggestSub' => true,
382 'pageFooter' => true 382 'pageFooter' => true
383 - )); 383 + );
  384 + print_r($data);
  385 +
  386 + $this->_view->display('suggest_sub', $data);
384 } 387 }
385 388
386 /** 389 /**
@@ -456,7 +459,7 @@ class HomeController extends AbstractAction @@ -456,7 +459,7 @@ class HomeController extends AbstractAction
456 } 459 }
457 460
458 //ajax请求订单页面 461 //ajax请求订单页面
459 - public function getOrderAction() { 462 + public function getOrdersAction() {
460 //判断是不是ajax请求 463 //判断是不是ajax请求
461 if (!$this->isAjax()) { 464 if (!$this->isAjax()) {
462 $this->error(); 465 $this->error();