Authored by 毕凯

code review by chenglong.wang

... ... @@ -13,7 +13,6 @@ var $addressForm = $('.edit-address'),
$submit = $('.submit'),
$editAddressPage = $('.my-edit-address-page'),
$addressListPage = $('.my-address-list-page'),
$footer = $('#yoho-footer'),
$backBtn = $('.nav-back'),
$navTitle = $('.nav-title'),
$input = $('input, textarea'),
... ... @@ -111,12 +110,6 @@ $submit.on('touchend', function() {
$(this).removeClass('highlight');
});
$input.on('focus', function() {
$footer.hide();
}).on('blur', function() {
$footer.show();
});
// 省市区列表异步加载
$.get('/home/locationList').then(function(html) {
$addressListPage.html(html);
... ... @@ -124,9 +117,7 @@ $.get('/home/locationList').then(function(html) {
// 省市区
$area.on('touchend', function() {
$editAddressPage.hide();
$addressListPage.show(1, function() {
$footer.hide();
});
$addressListPage.show();
currentPage = 'list';
$navTitle.html('地区选择');
});
... ... @@ -165,7 +156,6 @@ $.get('/home/locationList').then(function(html) {
$editAddressPage.show();
currentPage = 'edit';
$navTitle.html(navTitle);
$footer.show();
// 恢复默认的三级选择
$addressListPage.hide();
... ...
... ... @@ -22,7 +22,7 @@ class HomeController extends AbstractAction
/**
* 通过当前用户审判是否跳到登录
*
*
* @param int $useSession (true:从服务端session中检查, false:从客户端cookie中检查)
* @return void
*/
... ... @@ -351,7 +351,6 @@ class HomeController extends AbstractAction
$id = $this->get('id', null);
$data = array(
'addressActionPage' => true,
'pageFooter' => true,
'addressList' => UserModel::getAddressListData($uid)
);
... ... @@ -627,7 +626,7 @@ class HomeController extends AbstractAction
/*
* 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页(getOrders)
*
*
*/
public function orderAction()
... ... @@ -763,7 +762,7 @@ class HomeController extends AbstractAction
/*
* 我的订单-付款跳转页
*/
public function payAction()
public function payAction()
{
$this->_view->display('pay', array(
'payAppInfo' => array(
... ... @@ -774,7 +773,7 @@ class HomeController extends AbstractAction
'hint' => '需下载微信客户端',
'subHint' => '推荐使用',
),
),
));
}
... ...