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 @@ @@ -297,7 +297,7 @@
297 </div> 297 </div>
298 <div class="gobuy-notempty-footer"> 298 <div class="gobuy-notempty-footer">
299 <h3> 299 <h3>
300 - <a href="<?php print QConfigs_Site_Config::$site_url;?>/shopping/cart">去购物车结算</a> 300 + <a href="http://www.yohobuy.com/shopping/cart">去购物车结算</a>
301 </h3> 301 </h3>
302 </div> 302 </div>
303 \{\{/carData\}\} 303 \{\{/carData\}\}
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 \{\{# head_ico \}\} 307 \{\{# head_ico \}\}
308 <div class="myyoho-photo" ><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div> 308 <div class="myyoho-photo" ><img src="" alt="" data-url ="\{\{it.head_ico\}\}"></div>
309 \{\{/ head_ico\}\} 309 \{\{/ head_ico\}\}
310 - <h3 class="user-email"><a href="<?php print QConfigs_Site_Config::$site_url?>/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3> 310 + <h3 class="user-email"><a href="http://www.yohobuy.com/home?t=\{\{random\}\}">\{\{profile_name\}\}</a></h3>
311 <h3 class="user-level"> 311 <h3 class="user-level">
312 VIP: 312 VIP:
313 <span class="leveldetail">\{\{vip.curVipInfo.title\}\}</span> 313 <span class="leveldetail">\{\{vip.curVipInfo.title\}\}</span>
@@ -328,37 +328,37 @@ @@ -328,37 +328,37 @@
328 <ul class="myyoho-info-content"> 328 <ul class="myyoho-info-content">
329 <li class="item"> 329 <li class="item">
330 <span class="itemdetail float-left"> 330 <span class="itemdetail float-left">
331 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/orders?t=<?php print microtime(true);?>">待处理的订单</a> 331 + <a href="http://www.yohobuy.com/home/orders?t=\{\{timestamp\}\}">待处理的订单</a>
332 </span> 332 </span>
333 <span class="itemnum float-right">\{\{orderCount\}\}</span> 333 <span class="itemnum float-right">\{\{orderCount\}\}</span>
334 </li> 334 </li>
335 <li class="item"> 335 <li class="item">
336 <span class="itemdetail float-left"> 336 <span class="itemdetail float-left">
337 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/favorite?t=<?php print microtime(true);?>">我的收藏</a> 337 + <a href="http://www.yohobuy.com/home/favorite?t=\{\{timestamp\}\}">我的收藏</a>
338 </span> 338 </span>
339 <span class="itemnum float-right"></span> 339 <span class="itemnum float-right"></span>
340 </li> 340 </li>
341 <li class="item"> 341 <li class="item">
342 <span class="itemdetail float-left"> 342 <span class="itemdetail float-left">
343 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/coupons?t=<?php print microtime(true);?>">我的优惠券</a> 343 + <a href="http://www.yohobuy.com/home/coupons?t=\{\{timestamp\}\}">我的优惠券</a>
344 </span> 344 </span>
345 <span class="itemnum float-right">\{\{couponCount\}\}</span> 345 <span class="itemnum float-right">\{\{couponCount\}\}</span>
346 </li> 346 </li>
347 <li class="item"> 347 <li class="item">
348 <span class="itemdetail float-left"> 348 <span class="itemdetail float-left">
349 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/currency?t=<?php print microtime(true);?>">我的YOHO币</a> 349 + <a href="http://www.yohobuy.com/home/currency?t=\{\{timestamp\}\}">我的YOHO币</a>
350 </span> 350 </span>
351 <span class="itemnum float-right">\{\{YohocoinCount\}\}</span> 351 <span class="itemnum float-right">\{\{YohocoinCount\}\}</span>
352 </li> 352 </li>
353 <li class="item"> 353 <li class="item">
354 <span class="itemdetail float-left"> 354 <span class="itemdetail float-left">
355 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/returns?t=<?php print microtime(true);?>">我的退货换货</a> 355 + <a href="http://www.yohobuy.com/home/returns?t=\{\{timestamp\}\}">我的退货换货</a>
356 </span> 356 </span>
357 <span class="itemnum float-right">\{\{refundCount\}\}</span> 357 <span class="itemnum float-right">\{\{refundCount\}\}</span>
358 </li> 358 </li>
359 </ul> 359 </ul>
360 <div class="myyoho-info-footer"> 360 <div class="myyoho-info-footer">
361 - <a href="<?php print QConfigs_Site_Config::$site_url?>/home/user?t=<?php print microtime(true);?>">完善资料</a> 361 + <a href="http://www.yohobuy.com/home/user?t=\{\{timestamp\}\}">完善资料</a>
362 </div> 362 </div>
363 </script> 363 </script>
364 </div> 364 </div>
@@ -279,6 +279,15 @@ handlebars.registerHelper('equalone', function(v1, options) { @@ -279,6 +279,15 @@ handlebars.registerHelper('equalone', function(v1, options) {
279 } 279 }
280 }); 280 });
281 /** 281 /**
  282 + * 时间戳
  283 + * @param {[type]} v1 [description]
  284 + * @param {[type]} options) { if (v1 [description]
  285 + * @return {[type]} [description]
  286 + */
  287 +handlebars.registerHelper('timestamp', function() {
  288 + return new Date().getTime();
  289 +});
  290 +/**
282 * 判断等级为3的helper 291 * 判断等级为3的helper
283 * @param {[type]} v1 [description] 292 * @param {[type]} v1 [description]
284 * @param {[type]} options) { if (v1 [description] 293 * @param {[type]} options) { if (v1 [description]
@@ -70,13 +70,14 @@ class HomeModel @@ -70,13 +70,14 @@ class HomeModel
70 $thirdnav = array(); 70 $thirdnav = array();
71 $indexMain = 0; 71 $indexMain = 0;
72 $indexSub = 0; 72 $indexSub = 0;
  73 +
73 foreach ($data['data'] as $val) { 74 foreach ($data['data'] as $val) {
74 $item = array( 75 $item = array(
75 'name_cn' => $val['sort_name'], // 父级 76 'name_cn' => $val['sort_name'], // 父级
76 'name_en' => $val['sort_name_en'], 77 'name_en' => $val['sort_name_en'],
77 'link' => $val['sort_url'], 78 'link' => $val['sort_url'],
78 'icon' => $val['sort_ico'], 79 'icon' => $val['sort_ico'],
79 - 'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel : '', 80 + 'classname' => str_replace(' ', '', strtolower($val['sort_name_en'])) == $channel ? $channel .' cure' : '',
80 'index_main' => $indexMain ++, 81 'index_main' => $indexMain ++,
81 'content_code' => $val['content_code'], 82 'content_code' => $val['content_code'],
82 'is_hot' => $val['is_hot'] == 'Y' ? true : false, 83 'is_hot' => $val['is_hot'] == 'Y' ? true : false,