fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 9cb6944ea59db8f2958f10de518db079aa0bc3ad 2 parents 09500b4d bfaf6f7d

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

Inline Side-by-side
Showing 4 changed files with 151 additions and 58 deletions
.my-address-page {
position: absolute;
bottom: 0;
top: pxToRem(90px);
background: #f0f0f0;
.address-item {
padding: pxToRem(20px) pxToRem(30px);
color: #b0b0b0;
background: #fff;
border-bottom: 1px solid #e0e0e0;
.name, .tel {
font-size: pxToRem(30px);
line-height: pxToRem(56px);
color: #444;
font-weight: bold;
}
.tel {
float: right;
}
.address-info {
font-size: pxToRem(24px);
line-height: pxToRem(38px);
}
.action {
font-size: pxToRem(28px);
line-height: pxToRem(40px);
text-align: right;
.edit {
margin-right: pxToRem(30px);
}
}
}
.add-address {
display: block;
margin-top: pxToRem(30px);
font-size: pxToRem(32px);
line-height: pxToRem(88px);
color: #444;
background: #fff;
text-align: center;
font-weight: bold;
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
}
.confim-mask {
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
background: rgba(0, 0, 0, .5);
z-index: 5;
}
.confim-box {
position: absolute;
left: 50%;
top: 50%;
margin-left: pxToRem(-270px);
margin-top: pxToRem(-144px);
width: pxToRem(540px);
text-align: center;
color: #444;
background: #fff;
font-size: pxToRem(32px);
font-weight: bold;
border-radius: pxToRem(10px);
.content {
line-height: pxToRem(200px);
}
.action {
line-height: pxToRem(88px);
border-top: 1px solid #e0e0e0;
span {
display: inline-block;
width: pxToRem(260px);
&:first-child {
border-right: 1px solid #e0e0e0;
}
}
}
.confim {
color: #d0021b;
}
}
}
\ No newline at end of file
... ...
@import "home", "vip-grade", "order", "coupons", "personal-details", "yoho-coin", "recommend-for-you", "fav", "suggest";
\ No newline at end of file
@import "home", "vip-grade", "order", "coupons", "personal-details", "yoho-coin", "recommend-for-you", "fav", "suggest", "address";
\ No newline at end of file
... ...
{{> layout/header}}
<div class="my-address-page yoho-page">
<div class="address-item">
<span class="name">张三</span>
<span class="tel">13509877890</span>
<p class="address-info">发的就看过环境是电话是多少姐发的就看过环境是电话是多少姐</p>
<div class="action iconfont">
<span class="edit">&#xe61e;</span>
<span class="del">&#xe621;</span>
</div>
</div>
<div class="address-item">
<span class="name">张三</span>
<span class="tel">13509877890</span>
<p class="address-info">发的就看过环境是电话是多少姐发的就看过环境是电话是多少姐</p>
<div class="action iconfont">
<span class="edit">&#xe61e;</span>
<span class="del">&#xe621;</span>
</div>
</div>
<a class="add-address">
添加新地址
</a>
<div class="confim-mask hide">
<div class="confim-box">
<div class="content">
你确定要删除地址吗？
</div>
<div class="action">
<span class="cencel">
取消
</span>
<span class="confim">
确认
</span>
</div>
</div>
</div>
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -34,60 +34,6 @@ class HomeController extends AbstractAction
$data['recommendForYou'] = \Index\UserModel::getPreferenceData($channel);
// print_r($data);
$data['homeHeader'] = array(
'myHomePage' => true,
'searchUrl' => Helpers::url('/search', null, 'search')
);
/*$data['recommendForYou'] = array(
'recommendList' => array(
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => ''
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
),
array(
'img' => '',
'salePrice' => '567.44',
'oldPrice' => '876.44'
)
)
);*/
$data['myIndexPage'] = true;
$data['pageFooter'] = true;
... ... @@ -245,11 +191,22 @@ class HomeController extends AbstractAction
*/
public function addressAction()
{
$uid = $this->getUid();
// 设置网站标题
$this->setTitle('地址管理');
$this->setNavHeader('地址管理', true, SITE_MAIN);
// $uid = $this->getUid();
$uid = 967016;
$address = \Index\UserModel::getAddressData($uid);
print_r($address);
// print_r($address);
$this->_view->display('address', array(
'myIndexPage' => true,
'pageFooter' => true,
'address' => $address
));
}
/**
... ...