fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by xuqi
Commit 5923969943aa4d3f03ca1c1a36aa89e23b82e349 2 parents 0b43a346 35016cbe

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

Inline Side-by-side
Showing 7 changed files with 53 additions and 41 deletions
@@ -18,17 +18,17 @@ class Yohobuy @@ -18,17 +18,17 @@ class Yohobuy
18 { 18 {
19 19
20 // /* 正式环境 */ 20 // /* 正式环境 */
21 -// const API_URL = 'http://api2.open.yohobuy.com/';  
22 -// const API_URL2 = 'http://api.open.yohobuy.com/';  
23 -// const SERVICE_URL = 'http://service.api.yohobuy.com/';  
24 -// const YOHOBUY_URL = 'http://www.yohobuy.com/'; 21 + const API_URL = 'http://api2.open.yohobuy.com/';
  22 + const API_URL2 = 'http://api.open.yohobuy.com/';
  23 + const SERVICE_URL = 'http://service.api.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 * 私钥列表
@@ -27,7 +27,9 @@ function editAddress(data) { @@ -27,7 +27,9 @@ function editAddress(data) {
27 $addressForm.find('[name="area"]').val(data.area || ''); 27 $addressForm.find('[name="area"]').val(data.area || '');
28 $addressForm.find('[name="address"]').val(data.address || ''); 28 $addressForm.find('[name="address"]').val(data.address || '');
29 $editAddressPage.show(); 29 $editAddressPage.show();
30 - $addressForm.find('[name="consignee"]').focus(); 30 +
  31 + // $addressForm.find('[name="address"]').blur();
  32 + // $addressForm.find('[name="consignee"]').focus();
31 } 33 }
32 34
33 function deleteAddress(data) { 35 function deleteAddress(data) {
@@ -142,8 +142,8 @@ @@ -142,8 +142,8 @@
142 input, textarea { 142 input, textarea {
143 position: absolute; 143 position: absolute;
144 top: 0; 144 top: 0;
145 - right: 0;  
146 - width: pxToRem(400px); 145 + right: pxToRem(40px);
  146 + width: pxToRem(360px);
147 height: pxToRem(88px); 147 height: pxToRem(88px);
148 color: #444; 148 color: #444;
149 padding: 0; 149 padding: 0;
@@ -156,6 +156,8 @@ @@ -156,6 +156,8 @@
156 } 156 }
157 157
158 textarea { 158 textarea {
  159 + right: 0;
  160 + width: pxToRem(400px);
159 height: pxToRem(58px) * 2; 161 height: pxToRem(58px) * 2;
160 padding: pxToRem(20px) 0; 162 padding: pxToRem(20px) 0;
161 } 163 }
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 font-size: pxToRem(32px); 78 font-size: pxToRem(32px);
79 line-height: pxToRem(88px); 79 line-height: pxToRem(88px);
80 80
81 - span { 81 + a {
82 color: #e0e0e0; 82 color: #e0e0e0;
83 float: right; 83 float: right;
84 } 84 }
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
110 background: #fff; 110 background: #fff;
111 111
112 .list-item { 112 .list-item {
  113 + display: block;
113 position: relative; 114 position: relative;
114 padding: 0 pxToRem(30px); 115 padding: 0 pxToRem(30px);
115 font-size: pxToRem(32px); 116 font-size: pxToRem(32px);
@@ -11,15 +11,15 @@ @@ -11,15 +11,15 @@
11 </div> 11 </div>
12 </div> 12 </div>
13 <div class="my-link clearfix"> 13 <div class="my-link clearfix">
14 - <a class="link-item" href="/home"> 14 + <a class="link-item" href="/home/">
15 {{product_favorite_total}} 15 {{product_favorite_total}}
16 <p>收藏的商品</p> 16 <p>收藏的商品</p>
17 </a> 17 </a>
18 - <a class="link-item" href="/home"> 18 + <a class="link-item" href="/home/">
19 {{brand_favorite_total}} 19 {{brand_favorite_total}}
20 <p>收藏的品牌</p> 20 <p>收藏的品牌</p>
21 </a> 21 </a>
22 - <a class="link-item" href="/home"> 22 + <a class="link-item" href="/home/">
23 {{product_browse}} 23 {{product_browse}}
24 <p>浏览记录</p> 24 <p>浏览记录</p>
25 </a> 25 </a>
@@ -27,9 +27,9 @@ @@ -27,9 +27,9 @@
27 <div class="my-order"> 27 <div class="my-order">
28 <div class="order-title"> 28 <div class="order-title">
29 我的订单 29 我的订单
30 - <span class="iconfont"> 30 + <a class="iconfont" href="/home/order">
31 查看全部订单 &#xe604; 31 查看全部订单 &#xe604;
32 - </span> 32 + </a>
33 </div> 33 </div>
34 <div class="order-type clearfix"> 34 <div class="order-type clearfix">
35 <a class="type-item" href="/home/order"> 35 <a class="type-item" href="/home/order">
@@ -47,44 +47,44 @@ @@ -47,44 +47,44 @@
47 </div> 47 </div>
48 </div> 48 </div>
49 <div class="group-list"> 49 <div class="group-list">
50 - <div class="list-item"> 50 + <a class="list-item" href="/home/address">
51 <span class="iconfont icon">&#xe637;</span> 51 <span class="iconfont icon">&#xe637;</span>
52 地址管理 52 地址管理
53 <span class="iconfont num">3 &#xe604;</span> 53 <span class="iconfont num">3 &#xe604;</span>
54 - </div> 54 + </a>
55 </div> 55 </div>
56 <div class="group-list"> 56 <div class="group-list">
57 - <div class="list-item"> 57 + <a class="list-item" href="/home/">
58 <span class="iconfont icon">&#xe63a;</span> 58 <span class="iconfont icon">&#xe63a;</span>
59 优惠券 59 优惠券
60 <span class="iconfont num">{{coupon_num}} &#xe604;</span> 60 <span class="iconfont num">{{coupon_num}} &#xe604;</span>
61 - </div>  
62 - <div class="list-item"> 61 + </a>
  62 + <a class="list-item" href="/home/">
63 <span class="iconfont icon">&#xe635;</span> 63 <span class="iconfont icon">&#xe635;</span>
64 YOHO 币 64 YOHO 币
65 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span> 65 <span class="iconfont num">{{yoho_coin_num}} &#xe604;</span>
66 - </div> 66 + </a>
67 </div> 67 </div>
68 <div class="group-list"> 68 <div class="group-list">
69 - <div class="list-item"> 69 + <a class="list-item" href="/home/">
70 <span class="iconfont icon">&#xe636;</span> 70 <span class="iconfont icon">&#xe636;</span>
71 消息 71 消息
72 <span class="iconfont num">{{inbox_total}} &#xe604;</span> 72 <span class="iconfont num">{{inbox_total}} &#xe604;</span>
73 - </div> 73 + </a>
74 </div> 74 </div>
75 <div class="group-list"> 75 <div class="group-list">
76 - <div class="list-item"> 76 + <a class="list-item" href="/home/">
77 <span class="iconfont icon">&#xe63c;</span> 77 <span class="iconfont icon">&#xe63c;</span>
78 在线客服 78 在线客服
79 <span class="iconfont num">&#xe604;</span> 79 <span class="iconfont num">&#xe604;</span>
80 - </div> 80 + </a>
81 </div> 81 </div>
82 <div class="group-list"> 82 <div class="group-list">
83 - <div class="list-item"> 83 + <a class="list-item" href="/home/">
84 <span class="iconfont icon">&#xe639;</span> 84 <span class="iconfont icon">&#xe639;</span>
85 帮助 85 帮助
86 <span class="iconfont num">&#xe604;</span> 86 <span class="iconfont num">&#xe604;</span>
87 - </div> 87 + </a>
88 </div> 88 </div>
89 89
90 {{> product/recommend-for-you}} 90 {{> product/recommend-for-you}}
@@ -476,8 +476,12 @@ class HomeController extends AbstractAction @@ -476,8 +476,12 @@ class HomeController extends AbstractAction
476 if (!empty($data)) { 476 if (!empty($data)) {
477 $order['orders'] = $data; 477 $order['orders'] = $data;
478 } else { 478 } else {
  479 + if ($page > 1) {
  480 + echo " ";
  481 + } else {
479 $order['walkwayUrl'] = 'http://www.baidu.com'; 482 $order['walkwayUrl'] = 'http://www.baidu.com';
480 } 483 }
  484 + }
481 //渲染模板 485 //渲染模板
482 $this->_view->display('order-content', $order); 486 $this->_view->display('order-content', $order);
483 } 487 }
@@ -123,44 +123,48 @@ class OrderModel @@ -123,44 +123,48 @@ class OrderModel
123 } 123 }
124 124
125 //根据type值设置nav属性 125 //根据type值设置nav属性
126 - public function getNavs($type){ 126 + public function getNavs($type) {
127 $nav = array( 127 $nav = array(
128 array( 128 array(
129 'name' => '全部', 129 'name' => '全部',
130 - 'typeId' => '1' 130 + 'typeId' => '1',
  131 + 'url' => '/home/order?type=1'
131 ), 132 ),
132 array( 133 array(
133 'name' => '待付款', 134 'name' => '待付款',
134 - 'typeId' => '2' 135 + 'typeId' => '2',
  136 + 'url' => '/home/order?type=2'
135 ), 137 ),
136 array( 138 array(
137 'name' => '待发货', 139 'name' => '待发货',
138 - 'typeId' => '3' 140 + 'typeId' => '3',
  141 + 'url' => '/home/order?type=3'
139 ), 142 ),
140 array( 143 array(
141 'name' => '待收货', 144 'name' => '待收货',
142 - 'typeId' => '4' 145 + 'typeId' => '4',
  146 + 'url' => '/home/order?type=4'
143 ) 147 )
144 ); 148 );
145 - foreach($nav as $key => $vo){ 149 + foreach ($nav as $key => $vo) {
146 switch ($type) { 150 switch ($type) {
147 case 1: 151 case 1:
148 - if($vo['typeId'] == 1){ 152 + if ($vo['typeId'] == 1) {
149 $nav[$key]['active'] = true; 153 $nav[$key]['active'] = true;
150 } 154 }
151 break; 155 break;
152 case 2: 156 case 2:
153 - if($vo['typeId'] == 2){ 157 + if ($vo['typeId'] == 2) {
154 $nav[$key]['active'] = true; 158 $nav[$key]['active'] = true;
155 } 159 }
156 break; 160 break;
157 case 3: 161 case 3:
158 - if($vo['typeId'] == 3){ 162 + if ($vo['typeId'] == 3) {
159 $nav[$key]['active'] = true; 163 $nav[$key]['active'] = true;
160 } 164 }
161 break; 165 break;
162 case 4: 166 case 4:
163 - if($vo['typeId'] == 4){ 167 + if ($vo['typeId'] == 4) {
164 $nav[$key]['active'] = true; 168 $nav[$key]['active'] = true;
165 } 169 }
166 break; 170 break;
@@ -169,7 +173,6 @@ class OrderModel @@ -169,7 +173,6 @@ class OrderModel
169 } 173 }
170 } 174 }
171 return $nav; 175 return $nav;
172 -  
173 } 176 }
174 177
175 } 178 }