wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by biao
Commit caff35718d9da1f39ad5170be8e69db34f4d4ff2 2 parents 466c6a32 fdf843ae

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

Inline Side-by-side
Showing 11 changed files with 16 additions and 9 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -54,4 +54,7 @@
返回
</a>
</div>
{{#if isApp}}
<input type="hidden" value="{{getCouponUrl}}" id="getCouponUrl">
{{/if}}
{{> cuxiao/xinshili/footer}}
... ...
... ... @@ -13,13 +13,18 @@
<li class="swiper-slide">
<div class="img-box">
<a href="{{url}}">
<img class="swiper-lazy" data-src="{{img}}" alt="">
<img class="" src="{{img}}" alt="">
</a>
<div class="swiper-lazy-preloader"></div>
<!-- <div class="swiper-lazy-preloader"></div> -->
</div>
<div class="fresh-info">
<p class="fresh-name"><a href="{{url}}">{{title}}</a></p>
<p class="price"><span class="cur-price">{{curPrice}}</span><span class="old-price">{{oldPrice}}<span></p>
<p class="price">
<span class="cur-price">¥{{curPrice}}</span>
{{# oldPrice}}
<span class="old-price">¥{{oldPrice}}<span>
{{/oldPrice}}
</p>
<span class="fresh-icon">新人价</span>
</div>
</li>
... ...
... ... @@ -9,14 +9,12 @@ use Plugin\Helpers;
*/
class XinshiliController extends HuodongAction
{
// const STATIC_FILE = 'http://localhost:2222/1.0.3';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.3';
// const STATIC_FILE = 'http://localhost:2222/1.0.4';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.4';
/**
* 检测登录状态
*
* @return int
*/
private function getLoggedUid()
{
... ... @@ -36,8 +34,7 @@ class XinshiliController extends HuodongAction
{
$playUrl = Helpers::url('/cuxiao/xinshili/index');
$uid = $this->getLoggedUid();
if (!$uid) {
if (!$this->getLoggedUid()) {
if (!$this->_isApp) {
$this->go(Helpers::url('/signin.html', array('refer' => $playUrl), 'default'));
} else {
... ... @@ -64,6 +61,8 @@ class XinshiliController extends HuodongAction
'home.js'
),
'couponUrl' => $myCouponUrl, // 个人中心优惠券地址
'isApp' => $this->_isApp,
'getCouponUrl' => Helpers::url('/cuxiao/xinshili/sendCoupon', array('uid' => $this->getLoggedUid())),
'banner' => array(
'img' => '',
'url' => 'http://feature.yoho.cn/0302/0302APPHOME/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】","url":"http://feature.yoho.cn/0302/0302APPHOME/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"386"},"param":{"share_id":"386"}}'
... ...