fe / YOHOBUYPC · Commits

Go to a project

Authored by biao
Commit 7329ac32b139016e4f21c15ce298954926e5d04b 2 parents 36c3a27b 722d1aa1

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

Inline Side-by-side
Showing 3 changed files with 19 additions and 9 deletions
... ... @@ -297,7 +297,7 @@
</div>
<div class="gobuy-notempty-footer">
<h3>
<a href="<?php print QConfigs_Site_Config::$site_url;?>/shopping/cart">去购物车结算</a>
<a href="http://www.yohobuy.com/shopping/cart">去购物车结算</a>
</h3>
</div>
\{\{/carData\}\}
... ... @@ -307,7 +307,7 @@
\{\{# head_ico \}\}
<div class="myyoho-photo" ><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
\{\{/ head_ico\}\}
<h3 class="user-email"><a href="<?php print QConfigs_Site_Config::$site_url?>/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
<h3 class="user-email"><a href="http://www.yohobuy.com/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
<h3 class="user-level">
VIP:
<span class="leveldetail">\{\{vip.curVipInfo.title\}\}</span>
... ... @@ -328,37 +328,37 @@
<ul class="myyoho-info-content">
<li class="item">
<span class="itemdetail float-left">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/orders?t=<?php print microtime(true);?>">待处理的订单</a>
<a href="http://www.yohobuy.com/home/orders?t=\{\{timestamp\}\}">待处理的订单</a>
</span>
<span class="itemnum float-right">\{\{orderCount\}\}</span>
</li>
<li class="item">
<span class="itemdetail float-left">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/favorite?t=<?php print microtime(true);?>">我的收藏</a>
<a href="http://www.yohobuy.com/home/favorite?t=\{\{timestamp\}\}">我的收藏</a>
</span>
<span class="itemnum float-right"></span>
</li>
<li class="item">
<span class="itemdetail float-left">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/coupons?t=<?php print microtime(true);?>">我的优惠券</a>
<a href="http://www.yohobuy.com/home/coupons?t=\{\{timestamp\}\}">我的优惠券</a>
</span>
<span class="itemnum float-right">\{\{couponCount\}\}</span>
</li>
<li class="item">
<span class="itemdetail float-left">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/currency?t=<?php print microtime(true);?>">我的YOHO币</a>
<a href="http://www.yohobuy.com/home/currency?t=\{\{timestamp\}\}">我的YOHO币</a>
</span>
<span class="itemnum float-right">\{\{YohocoinCount\}\}</span>
</li>
<li class="item">
<span class="itemdetail float-left">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/returns?t=<?php print microtime(true);?>">我的退货换货</a>
<a href="http://www.yohobuy.com/home/returns?t=\{\{timestamp\}\}">我的退货换货</a>
</span>
<span class="itemnum float-right">\{\{refundCount\}\}</span>
</li>
</ul>
<div class="myyoho-info-footer">
<a href="<?php print QConfigs_Site_Config::$site_url?>/home/user?t=<?php print microtime(true);?>">完善资料</a>
<a href="http://www.yohobuy.com/home/user?t=\{\{timestamp\}\}">完善资料</a>
</div>
</script>
</div>
... ...
... ... @@ -279,6 +279,15 @@ handlebars.registerHelper('equalone', function(v1, options) {
}
});
/**
* 时间戳
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
* @return {[type]} [description]
*/
handlebars.registerHelper('timestamp', function() {
return new Date().getTime();
});
/**
* 判断等级为3的helper
* @param {[type]} v1 [description]
* @param {[type]} options) { if (v1 [description]
... ...
... ... @@ -70,13 +70,14 @@ class HomeModel
$thirdnav = array();
$indexMain = 0;
$indexSub = 0;
foreach ($data['data'] as $val) {
$item = array(
'name_cn' => $val['sort_name'], // 父级
'name_en' => $val['sort_name_en'],
'link' => $val['sort_url'],
'icon' => $val['sort_ico'],
'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel : '',
'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel .' cure' : '',
'index_main' => $indexMain ++,
'content_code' => $val['content_code'],
'is_hot' => $val['is_hot'] == 'Y' ? true : false,
... ...