fe / YOHOBUYWAP · Commits

Go to a project

Authored by 徐祁xuqi
Commit b119cc5808a78394bf91b519208f63c91a3665fd 2 parents 6c8b449f 9ebebd70

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

Inline Side-by-side
Showing 8 changed files with 42 additions and 38 deletions
... ... @@ -354,8 +354,8 @@ class Helpers
$result['showTags'] = $showTag;
$result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
//逛详情页app跳转url处理 20160601
$result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
//$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
$result['url'] = $isApp ? self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'http:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}' : $articleData['url'];
//$result['url'] = $articleData['url']; // ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {
$result['url'] = self::transHttpsUrl($result['url']);
... ...
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.
... ... @@ -206,26 +206,23 @@
visibility: hidden;
.reason-box {
border-bottom: solid 1px #CCCCCC;
border-bottom: 1px solid #ccc;
font: inherit;
vertical-align: baseline;
position: absolute;
left: 50%;
top: 50%;
margin-left: -270px;
margin-top: -290px;
width: 540px;
height:580px;
bottom: 0;
width: 100%;
height: 380px;
color: #444;
background: #fff;
border-radius: 10px;
padding-bottom: 20px;
.box-head {
height: 60px;
line-height: 60px;
text-align: right;
font-size: 36px;
font-size: 24px;
background: rgb(240, 240, 240);
padding-right: 30px;
}
... ... @@ -233,15 +230,17 @@
.box-main {
background: #FFFFFF;
padding: 20px;
height:480px;
height:300px;
.active-mask {
width: 500px;
height: 60px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -44px;
height: 88px;
margin-top: -18px;
margin-left: -250px;
z-index: 8;
width: 500px;
background: rgba(255, 255, 255, 0.1);
border-bottom: 1px solid rgb(223,224,224);
border-top: 1px solid rgb(223,224,224);
... ... @@ -252,18 +251,16 @@
text-align: center;
background: #FFF;
color: rgba(0, 0, 0, .5);
font-size: 38px;
font-size: 28px;
}
.swiper-slide-active {
padding-top: 0;
font-style: normal;
font-size: 38px;
color: rgb(0,0,0);
line-height: 78px;
font-size: 32px;
color: rgb(0, 0, 0);
line-height: 58px;
}
}
}
}
... ...
... ... @@ -12,19 +12,15 @@
visibility: hidden;
.reason-box {
border-bottom: solid 1px #CCCCCC;
border-bottom: 1px solid #ccc;
font: inherit;
vertical-align: baseline;
position: absolute;
left: 50%;
top: 50%;
margin-left: -270px;
margin-top: -290px;
width: 540px;
height:580px;
bottom: 0;
width: 100%;
height: 380px;
color: #444;
background: #fff;
border-radius: 10px;
padding-bottom: 20px;
.box-head {
... ... @@ -39,15 +35,17 @@
.box-main {
background: #FFFFFF;
padding: 20px;
height:480px;
height:300px;
.active-mask {
width: 500px;
height: 60px;
position: absolute;
left: 50%;
top: 50%;
margin-top: -44px;
height: 88px;
margin-top: -18px;
margin-left: -250px;
z-index: 8;
width: 500px;
background: rgba(255, 255, 255, 0.1);
border-bottom: 1px solid rgb(223,224,224);
border-top: 1px solid rgb(223,224,224);
... ... @@ -58,15 +56,15 @@
text-align: center;
background: #FFF;
color: rgba(0, 0, 0, .5);
font-size: 38px;
font-size: 28px;
}
.swiper-slide-active {
padding-top: 0;
font-style: normal;
font-size: 38px;
color: rgb(0,0,0);
line-height: 78px;
font-size: 32px;
color: rgb(0, 0, 0);
line-height: 58px;
}
}
}
... ...
... ... @@ -166,7 +166,16 @@ class PlusstarController extends AbstractAction
// 相关文章
foreach ($brandInfo['getArticleByBrand'] as $value) {
$result = Helpers::formatArticle($value, false, $isApp, false, $uid);
$result = Helpers::formatArticle($value, false, false, false, $uid);
// $result = array(
// 'id' => $value['id'],
// 'url' => $value['id'],
// 'title' => $value['id'],
// 'pageView' => $value['id'],
// 'img' => $value['src'],
// 'text' => $value['intro'],
// 'publishTime' => $value['publish_time']
// );
if (!$isApp) {
$result['like'] = $value['like'];
}
... ...