Showing
2 changed files
with
5 additions
and
16 deletions
@@ -13,7 +13,6 @@ var $addressForm = $('.edit-address'), | @@ -13,7 +13,6 @@ var $addressForm = $('.edit-address'), | ||
13 | $submit = $('.submit'), | 13 | $submit = $('.submit'), |
14 | $editAddressPage = $('.my-edit-address-page'), | 14 | $editAddressPage = $('.my-edit-address-page'), |
15 | $addressListPage = $('.my-address-list-page'), | 15 | $addressListPage = $('.my-address-list-page'), |
16 | - $footer = $('#yoho-footer'), | ||
17 | $backBtn = $('.nav-back'), | 16 | $backBtn = $('.nav-back'), |
18 | $navTitle = $('.nav-title'), | 17 | $navTitle = $('.nav-title'), |
19 | $input = $('input, textarea'), | 18 | $input = $('input, textarea'), |
@@ -111,12 +110,6 @@ $submit.on('touchend', function() { | @@ -111,12 +110,6 @@ $submit.on('touchend', function() { | ||
111 | $(this).removeClass('highlight'); | 110 | $(this).removeClass('highlight'); |
112 | }); | 111 | }); |
113 | 112 | ||
114 | -$input.on('focus', function() { | ||
115 | - $footer.hide(); | ||
116 | -}).on('blur', function() { | ||
117 | - $footer.show(); | ||
118 | -}); | ||
119 | - | ||
120 | // 省市区列表异步加载 | 113 | // 省市区列表异步加载 |
121 | $.get('/home/locationList').then(function(html) { | 114 | $.get('/home/locationList').then(function(html) { |
122 | $addressListPage.html(html); | 115 | $addressListPage.html(html); |
@@ -124,9 +117,7 @@ $.get('/home/locationList').then(function(html) { | @@ -124,9 +117,7 @@ $.get('/home/locationList').then(function(html) { | ||
124 | // 省市区 | 117 | // 省市区 |
125 | $area.on('touchend', function() { | 118 | $area.on('touchend', function() { |
126 | $editAddressPage.hide(); | 119 | $editAddressPage.hide(); |
127 | - $addressListPage.show(1, function() { | ||
128 | - $footer.hide(); | ||
129 | - }); | 120 | + $addressListPage.show(); |
130 | currentPage = 'list'; | 121 | currentPage = 'list'; |
131 | $navTitle.html('地区选择'); | 122 | $navTitle.html('地区选择'); |
132 | }); | 123 | }); |
@@ -165,7 +156,6 @@ $.get('/home/locationList').then(function(html) { | @@ -165,7 +156,6 @@ $.get('/home/locationList').then(function(html) { | ||
165 | $editAddressPage.show(); | 156 | $editAddressPage.show(); |
166 | currentPage = 'edit'; | 157 | currentPage = 'edit'; |
167 | $navTitle.html(navTitle); | 158 | $navTitle.html(navTitle); |
168 | - $footer.show(); | ||
169 | 159 | ||
170 | // 恢复默认的三级选择 | 160 | // 恢复默认的三级选择 |
171 | $addressListPage.hide(); | 161 | $addressListPage.hide(); |
@@ -22,7 +22,7 @@ class HomeController extends AbstractAction | @@ -22,7 +22,7 @@ class HomeController extends AbstractAction | ||
22 | 22 | ||
23 | /** | 23 | /** |
24 | * 通过当前用户审判是否跳到登录 | 24 | * 通过当前用户审判是否跳到登录 |
25 | - * | 25 | + * |
26 | * @param int $useSession (true:从服务端session中检查, false:从客户端cookie中检查) | 26 | * @param int $useSession (true:从服务端session中检查, false:从客户端cookie中检查) |
27 | * @return void | 27 | * @return void |
28 | */ | 28 | */ |
@@ -351,7 +351,6 @@ class HomeController extends AbstractAction | @@ -351,7 +351,6 @@ class HomeController extends AbstractAction | ||
351 | $id = $this->get('id', null); | 351 | $id = $this->get('id', null); |
352 | $data = array( | 352 | $data = array( |
353 | 'addressActionPage' => true, | 353 | 'addressActionPage' => true, |
354 | - 'pageFooter' => true, | ||
355 | 'addressList' => UserModel::getAddressListData($uid) | 354 | 'addressList' => UserModel::getAddressListData($uid) |
356 | ); | 355 | ); |
357 | 356 | ||
@@ -627,7 +626,7 @@ class HomeController extends AbstractAction | @@ -627,7 +626,7 @@ class HomeController extends AbstractAction | ||
627 | 626 | ||
628 | /* | 627 | /* |
629 | * 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页(getOrders) | 628 | * 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页(getOrders) |
630 | - * | 629 | + * |
631 | */ | 630 | */ |
632 | 631 | ||
633 | public function orderAction() | 632 | public function orderAction() |
@@ -763,7 +762,7 @@ class HomeController extends AbstractAction | @@ -763,7 +762,7 @@ class HomeController extends AbstractAction | ||
763 | /* | 762 | /* |
764 | * 我的订单-付款跳转页 | 763 | * 我的订单-付款跳转页 |
765 | */ | 764 | */ |
766 | - public function payAction() | 765 | + public function payAction() |
767 | { | 766 | { |
768 | $this->_view->display('pay', array( | 767 | $this->_view->display('pay', array( |
769 | 'payAppInfo' => array( | 768 | 'payAppInfo' => array( |
@@ -774,7 +773,7 @@ class HomeController extends AbstractAction | @@ -774,7 +773,7 @@ class HomeController extends AbstractAction | ||
774 | 'hint' => '需下载微信客户端', | 773 | 'hint' => '需下载微信客户端', |
775 | 'subHint' => '推荐使用', | 774 | 'subHint' => '推荐使用', |
776 | ), | 775 | ), |
777 | - | 776 | + |
778 | ), | 777 | ), |
779 | )); | 778 | )); |
780 | } | 779 | } |
-
Please register or login to post a comment