chenchao / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit 9b1cff73da149b838e9f00675f7526297c375692 1 parent 9608382a

个人中心-优惠卷，yoho币

Inline Side-by-side
Showing 10 changed files with 148 additions and 9 deletions
... ... @@ -33,6 +33,4 @@ navHammer.on('tap', function(e) {
$curContainer.addClass('hide');
$curContainer = $orderContainer.children(':eq(' + index + ')').removeClass('hide');
});
});
\ No newline at end of file
... ...
@import "home", "vip-grade", "order", "personal-details";
\ No newline at end of file
@import "home", "vip-grade", "order", "personal-details", "coupons";
\ No newline at end of file
... ...
... ... @@ -42,6 +42,17 @@
display: inline-block;
margin-top: 25rem / $pxConvertRem;
}
.vip-3 {
@include rem-sprite($vip, vip-3);
}
.vip-2 {
@include rem-sprite($vip, vip-2);
}
.vip-1 {
@include rem-sprite($vip, vip-1);
}
&:last-of-type{
color: #b0b0b0;
text-align: right;
... ...
.employ{
width: 100%;
height: 90rem / $pxConvertRem;
overflow: hidden;
border-bottom:1px solid #e0e0e0;
span{
width: 49%;
height: 48rem / $pxConvertRem;
line-height: 48rem / $pxConvertRem;
overflow: hidden;
border-right: 2px solid #e0e0e0;
margin: 21rem / $pxConvertRem 0;
float: left;
text-align: center;
font-size: 48em / $pxConvertRem;
color: #b0b0b0;
&:last-of-type{
border:none;
}
&.active{
color: #444444;
}
}
}
.employ-list{
width:100%;
height: auto;
overflow:hidden;
.employ-main{
width: 90.625%;
height: 180rem / $pxConvertRem;
overflow: hidden;
margin: 20rem / $pxConvertRem auto;
background: url('../img/me/employ/employ.jpg') top center no-repeat;
background-size: 100% 100%;
color: #fff;
span{
width: 34.482759%;
height: 100%;
float: left;
text-align: center;
line-height: 180rem / $pxConvertRem;
font-size: 180em / $pxConvertRem;
}
p{
width: 55.517241%;
height: auto;
padding: 0 5% 10em / $pxConvertRem;;
float: left;
font-size: 44em / $pxConvertRem;
&:first-of-type{
padding-top:30em / $pxConvertRem;
font-size: 60em / $pxConvertRem;
}
}
}
}
.none{
display: none;
}
\ No newline at end of file
... ...
{{> layout/header}}
<div class="employ">
<span class="active">未使用</span>
<span>已使用</span>
</div>
<div class="employ-list">
<div class="employ-main">
<span>50</span>
<p>【summer sale】下装满￥399减￥50券</p>
<p>有效期:2014.07.28 - 2014.09.15</p>
</div>
</div>
<div class="employ-list not none">
<div class="employ-main">
<span>60</span>
<p>【summer sale】下装满￥399减￥60券</p>
<p>有效期:2014.07.28 - 2014.09.15</p>
</div>
</div>
{{> layout/not-footer}}
\ No newline at end of file
... ...
... ... @@ -3,9 +3,15 @@
<ul>
<li><span>头像</span><span><i class="head-portrait"><img src="{{ head_ico }}"></i></span></li>
<li><span>昵称</span><span>{{ username }}</span></li>
<li><span>性别</span><span>{{ sex }}</span></li>
<li><span>性别</span><span></span></li>
<li><span>生日</span><span>{{ birthday }}</span></li>
<li><span>会员等级</span><span><i class="grade vip-icon"></i></span></li>
<li><span>会员等级</span>
<span>
{{# vip_info}}
<i class="grade vip-icon vip-{{ next_level }}"></i>
{{/ vip_info}}
</span>
</li>
</ul>
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
{{#if hasWxShare}}
<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
{{/if}}
{{#if rlsEnv}}
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
{{/if}}
{{#if preEnv}}
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
{{/if}}
{{#if testEnv}}
<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/lib.js"></script>
<script src="http://static.buy.test.yoho.cn/dist/myohobuy/{{version}}/index-debug.js"></script>
{{/if}}
{{#if devEnv}}
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
{{/if}}
<script type="text/javascript">
(function(w,d,s,j,f){
w['YohoAcquisitionObject']=f;
w[f]=function(){w[f].p=arguments;};
var a=d.createElement(s);
var m=d.getElementsByTagName(s)[0];
a.async=1;
a.src=j;
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
</script>
{{> layout/use}}
{{> layout/analysis}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -115,6 +115,7 @@ class HomeController extends AbstractAction
// $uid = $this->getUid();
$uid = 967016;
$data = \Index\UserModel::getUserProfileData($uid);
$data['pageFooter'] = true;
$this->_view->display('personal-details', $data);
... ... @@ -125,8 +126,9 @@ class HomeController extends AbstractAction
*/
public function currencyAction()
{
$uid = $this->getUid();
// $uid = $this->getUid();
$uid = 967016;
$favBrands = \Index\UserModel::getYohoCoinData($uid);
print_r($favBrands);
... ... @@ -139,12 +141,15 @@ class HomeController extends AbstractAction
*/
public function couponsAction()
{
$uid = $this->getUid();
// $uid = $this->getUid();
$uid = 967016;
$status = $this->get('status', 0);
$coupons = \Index\UserModel::getCouponData($uid, $status);
print_r($coupons);
$this->_view->display('coupons', $coupons);
}
/**
... ...