Authored by wangqing

Merge branch 'master' of http://git.yoho.cn/fe/YOHOBUYWAP

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.

21.3 KB | W: | H:

21.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

27.1 KB | W: | H:

27.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.77 KB | W: | H:

8.82 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) {
a.async = 1;
a.src = j;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.15/yas.js', '_yas');
}(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.16/yas.js', '_yas'));
(function() {
var uid = getUid();
... ... @@ -201,7 +201,7 @@ function reMarginFooter(fixedElement) {
window._ozuid = uid;//暴露ozuid
if (window._yas) {
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', '');
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', uid, '', '');
}
}());
... ... @@ -308,6 +308,3 @@ window.getShoppingKey = getShoppingKey;
window.rePosFooter = rePosFooter;
window.reMarginFooter = reMarginFooter;
... ...
... ... @@ -275,15 +275,15 @@ function search(opt) {
if (window._yas) {
switch (navType) {
case 'newest':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.new-goods .good-info .good-detail-img .good-thumb'));
break;
case 'price':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.price-goods .good-info .good-detail-img .good-thumb'));
break;
case 'discount':
window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid,
window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid,
'', $('.discount-goods .good-info .good-detail-img .good-thumb'));
break;
}
... ...
{
"name": "yohobuy",
"version": "1.3.26",
"version": "1.3.27",
"description": "yohobuy statics",
"keywords": [],
"homepage": "",
... ...
... ... @@ -14,7 +14,7 @@ class InfoController extends AbstractAction
/**
* 详情页
*
*
* @param int id 内容ID
*/
public function indexAction()
... ... @@ -46,7 +46,7 @@ class InfoController extends AbstractAction
if (isset($detail['code']) && $detail['code'] === 400) {
$this->error();
}
if (empty($detail['getArticle'])) {
$this->_view->display('index', $data);
return;
... ... @@ -180,9 +180,11 @@ class InfoController extends AbstractAction
// 相关品牌
if (!empty($detail['getBrand'])) {
$data['relatedBrand'] = $detail['getBrand'];
foreach ($data['relatedBrand'] as &$value) {
$value['thumb'] = strtr($value['thumb'], array('http://' => '//'));
foreach ($data['relatedBrand'] as $key => $value) {
$data['relatedBrand'][$key]['thumb'] = strtr($value['thumb'], array('http://' => '//'));
}
}
// 相关标签
... ... @@ -223,6 +225,7 @@ class InfoController extends AbstractAction
// 标识有微信分享
$data['hasWxShare'] = true;
$this->_view->display('index', $data);
$detail = array();
... ... @@ -231,7 +234,7 @@ class InfoController extends AbstractAction
/**
* APP里使用的收藏内容的接口
*
*
* @param id 资讯ID
* @param type "fav"表示收藏 或者 "cancel"表示取消收藏
* @return json
... ... @@ -277,7 +280,7 @@ class InfoController extends AbstractAction
// 单张图
elseif (isset($value['singleImage'])) {
$build['bigImage'] = Helpers::getImageUrl($value['singleImage']['data'][0]['src'], 640, 640);
}
}
elseif (isset($value['smallPic']['data'])) {
$imgs = $value['smallPic']['data'];
$build['smallImage'] = array(
... ... @@ -356,6 +359,7 @@ class InfoController extends AbstractAction
$data['relatedBrand'] = $detail['getBrand'];
}
// 分享参数
if (isset($detail['getArticle']['cover_image'])) {
$data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang');
... ... @@ -376,36 +380,36 @@ class InfoController extends AbstractAction
$detail = array();
$data = array();
}
/**
* 提供给YOHO资讯站调用的接口
*
*
* @param int id 逛内容ID
* @return json
*/
public function foryohoAction()
{
$result = array();
do {
/* 判断参数是否有效 */
$id = $this->get('id');
if (!is_numeric($id)) {
break;
}
$app = $this->get('app');
$isApp = empty($app) ? false : true;
/* 判断是否有内容 */
$detail = DetailData::package($id, $isApp);
if (empty($detail['getArticleContent'])) {
break;
}
/* 品牌信息 */
$result['brand'] = $detail['getBrand'];
$build = array();
$good = array();
$skns = array();
... ... @@ -421,7 +425,7 @@ class InfoController extends AbstractAction
// 单张图
elseif (isset($value['singleImage'])) {
$build['bigImage'] = Helpers::getImageUrl($value['singleImage']['data'][0]['src'], 640, 640);
}
}
elseif (isset($value['smallPic']['data'])) {
$imgs = $value['smallPic']['data'];
$build['smallImage'] = array(
... ... @@ -482,15 +486,15 @@ class InfoController extends AbstractAction
elseif (isset($value['link'])) {
$build['moreLink'] = $value['link']['data'][0]['url'];
}
// 内容详情
if (array() !== $build) {
$result['content'][] = $build;
}
}
}
}
while (false);
$this->echoJson($result);
}
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.26"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.26"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.26"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.26"
application.version = "1.3.27"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...