fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 5ec94a36da31ef1981e37ba2a77caa356d1fa1f2 2 parents 96ee5760 8e22d5f4

merge https 分支

Inline Side-by-side
Showing 48 changed files with 302 additions and 222 deletions
... ... @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>找回密码-通过邮箱 | Yoho!Buy有货</title>
<title>找回密码-通过邮箱 | Yoho!Buy有货 | 潮流购物逛不停</title>
<meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
<meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
... ... @@ -22,69 +22,94 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css">
<link rel="dns-prefetch" href="//cdn.yoho.cn">
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
</head>
<body class=passport-body>
<div class="back-email-page passport-page yoho-page">
<div class="back-email-page passport-page yoho-page">
<div class="header">
<a class="go-back" href="/signin.html"></a>
<p class="title">找回密码</p>
</div>
<div class="content">
<a class="go-back" href="//m.yohobuy.com/signin.html"></a>
<p class="title">找回密码</p>
</div> <div class="content">
<div class="input-container row has-clear">
<input id="email" class="input email" type="text" placeholder="请输入邮箱" autocomplete="off">
</div>
<span id="btn-sure" class="btn btn-sure disable row">确定</span>
</div>
</div>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/index.js"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
w['YohoAcquisitionObject']=f;
w[f]=function(){w[f].p=arguments;};
var a=d.createElement(s);
var m=d.getElementsByTagName(s)[0];
a.async=1;
a.src=j;
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
</script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script>
<script>
seajs.use('js/common');
</script>
<script>
seajs.use('js/passport/back/email');
</script>
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W958MG');
</script>
<!-- End Google Tag Manager -->
<script type="text/javascript">
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
function async_load(){
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W958MG');
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
}
window.addEventListener('load', async_load, false);
</script>
<script>
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
</body>
<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>找回密码-通过手机号 | Yoho!Buy有货</title>
<title>找回密码-通过手机号 | Yoho!Buy有货 | 潮流购物逛不停</title>
<meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
<meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
... ... @@ -22,13 +22,20 @@
}());
})(document, window);
</script>
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css">
<link rel="dns-prefetch" href="//cdn.yoho.cn">
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
</head>
<body class=passport-body>
<div class="back-mobile-page passport-page yoho-page">
<div class="back-mobile-page passport-page yoho-page">
<div class="header">
<a class="go-back" href=/signin.html></a>
<p class="title">找回密码</p>
<a class="go-back" href="//m.yohobuy.com/signin.html"></a>
<p class="title">找回密码</p>
</div> <div class="content">
<div class="select-container row">
<span class="select-title">国家和地区</span>
... ... @@ -48,27 +55,18 @@
</select>
<div class="arrow-right"></div>
</div> <div class="input-container phone-container row has-clear">
<span id="area-code" class="area-code"></span>
<span id="area-code" class="area-code">+86</span>
<input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
</div>
<span id="btn-next" class="btn btn-next disable row">下一步</span>
</div>
</div>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/1.1.2/index.js"></script>
<script type="text/javascript">
(function(w,d,s,j,f){
w['YohoAcquisitionObject']=f;
w[f]=function(){w[f].p=arguments;};
var a=d.createElement(s);
var m=d.getElementsByTagName(s)[0];
a.async=1;
a.src=j;
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');
</script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script>
<script>
seajs.use('js/common');
</script>
... ... @@ -76,35 +74,60 @@
seajs.use('js/passport/back/mobile');
</script>
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W958MG');
</script>
<!-- End Google Tag Manager -->
<script type="text/javascript">
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
function async_load(){
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W958MG');
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
(function() {
var hm = document.createElement("script");
hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
}
window.addEventListener('load', async_load, false);
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
window._py = window._py||[];
window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
window._py.push(['domain','stats.ipinyou.com']);
window._py.push(['e','']);
if(typeof _goodsData!='undefined'){
window._py.push(['pi',_goodsData]);
}
-function(d){
var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
</body>
<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>
</html>
\ No newline at end of file
... ...
... ... @@ -96,7 +96,11 @@ class BrandData
// 构建必传参数
$param = Yohobuy::param();
$param['brand_id'] = $brandId;
$param['uid'] = $uid;
if (!empty($uid)) {
$param['uid'] = $uid;
}
$param['method'] = 'app.brand.getBrandIntro';
$param['client_secret'] = Sign::getSign($param);
... ...
... ... @@ -198,12 +198,18 @@ class PlusstarData
$result['getArticleByBrand'] = empty($article['data']) ? array() : $article['data'];
// file_put_contents('../../../../../../Desktop/app/n/getArticleByBrand.txt', var_export($result['getArticleByBrand'], true));
// // 是否收藏店铺
// if ($isUidOk) {
// Yohobuy::yarConcurrentCall(Yohobuy::SERVICE_URL . self::URI_BRANDINFO_FAVORITE, 'getUidBrandFav', array($uid, $brandInfo['data']['brand_id']), function($retval) use(&$result) {
// $result['getUidBrandFav'] = (isset($retval['message']) && $retval['message'] == 'favorite') ? true : false;
// });
// }
// 是否收藏店铺
$param = Yohobuy::param();
$param['uid'] = $uid;
$param['brandId'] = $brandInfo['data']['brand_id'];
$param['client_type'] = $clientType;
$param['private_key'] = Yohobuy::$privateKeyList[$clientType];
$param['client_secret'] = Sign::getSign($param);
$uidBrandFavRes = Yohobuy::get(Yohobuy::SERVICE_URL . self::URI_BRANDINFO_FAVORITE . 'getUidBrandFav', $param);
if (isset($uidBrandFavRes['code']) && $uidBrandFavRes['code'] == 200) {
$result['getUidBrandFav'] = true;
}
// 相关资讯列表 (3篇)
// $result['getArticleByBrand'] = array();
// Yohobuy::yarConcurrentCall(Yohobuy::PRD_SERVICE_URL . self::URI_BRANDINFO_ARTICLE, 'getArticleByBrand', array($brandInfo['data']['brand_id'], 3, $udid), function($retval) use(&$result) {
... ...
... ... @@ -24,16 +24,16 @@ class Helpers
switch ($module) {
case 'default':
$url = 'http://m.yohobuy.com';
$url = '//m.yohobuy.com';
break;
case 'guang': // 逛
$url = 'http://guang' . SUB_DOMAIN;
$url = '//guang' . SUB_DOMAIN;
break;
case 'list': // 商品列表
$url = 'http://list' . SUB_DOMAIN;
$url = '//list' . SUB_DOMAIN;
break;
case 'search': // 搜索
$url = 'http://search' . SUB_DOMAIN;
$url = '//search' . SUB_DOMAIN;
break;
case 'index': // 默认
$url = SITE_MAIN;
... ... @@ -41,7 +41,7 @@ class Helpers
case '': // 相对地址
break;
default: // 其它子域名
$url = 'http://' . $module . SUB_DOMAIN;
$url = '//' . $module . SUB_DOMAIN;
}
$url .= $uri;
if (!empty($param)) {
... ... @@ -62,7 +62,7 @@ class Helpers
*/
public static function getImageUrl($url, $width, $height, $mode = 2)
{
return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode));
return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
}
/**
... ... @@ -74,6 +74,7 @@ class Helpers
public static function getFilterUrl($url)
{
$url = strtr($url, array('.m.yohobuy.com' => SUB_DOMAIN, OLD_MAIN => SITE_MAIN, 'www.yohobuy.com' => SITE_MAIN));
//$url = strtr($url, array('http://' => '//'));
$filter = strstr($url, 'openby:yohobuy=', true);
if ($filter) {
return rtrim(rtrim($filter, '?'), '&');
... ... @@ -353,6 +354,10 @@ class Helpers
$articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']);
}
$result['author'] = $articleData['author'];
if (isset($result['author']['avatar'])) {
$result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));
}
}
// 模板中需要的标签标识
... ... @@ -809,10 +814,10 @@ class Helpers
$url = 'https://login.m.yohobuy.com';
break;
case 'testing':
$url = 'http://m1.yohobuy.com';
$url = 'https://login.m.yohobuy.com'; //http://m1.yohobuy.com 没有https时
break;
default:
$url = 'http://m1.yohobuy.com';
$url = 'https://login.m.yohobuy.com';
break;
}
$url .= '/Passport/session/index?callback=' . $callback . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;
... ...
... ... @@ -51,7 +51,7 @@ class Images
return $fileName;
}
$domain = self::getDomain($bucket, $fileName);
return 'http://' . $domain . '/' . $bucket . $fileName;
return '//' . $domain . '/' . $bucket . $fileName;
}
/**
... ... @@ -71,7 +71,7 @@ class Images
if (stripos($fileName, 'http://') !== 0) {
$fileName = self::template($fileName, $bucket, $mode);
}
return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode));
return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
}
/**
... ...
... ... @@ -5,7 +5,7 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']);
return array(
'appid' => '100229394',
'appkey' => 'c0af9c29e0900813028c2ccb42021792',
'callback' => SITE_MAIN . '/passport/login/qqcallback',
'callback' => strtr(SITE_MAIN, array('//' => 'http://')) . '/passport/login/qqcallback',
'scope' => 'get_user_info,add_share,upload_pic,get_idollist,get_fanslist',
'errorReport' => true,
);
... ...
... ... @@ -5,5 +5,5 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']);
return array(
'appId' => '3739328910',
'appKey' => '9d44cded26d048e23089e5e975c93df1',
'appCallbackUrl' => SITE_MAIN . '/passport/login/sinacallback',
'appCallbackUrl' => strtr(SITE_MAIN, array('//' => 'http://')) . '/passport/login/sinacallback',
);
... ...
... ... @@ -34,7 +34,7 @@ server
location ^~ /dist/ {
proxy_redirect off;
proxy_set_header X-Real-IP $remote_addr;
proxy_pass http://cdn.yoho.cn/;
proxy_pass https://cdn.yoho.cn/;
}
location = /Passport/session/index {
... ...
... ... @@ -3,7 +3,6 @@
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/10/20
*/
var $ = require('jquery'),
ellipsis = require('mlellipsis'),
Hammer = require('yoho.hammer');
... ... @@ -216,7 +215,7 @@ $('.btn-balance').on('touchend', function() {
}
});
$('.off-shell-goods').on('touchstart touchend', function() {
$('.off-shell-goods').on('touchstart touchend', function(e) {
var $this = $(e.target).closest('span');
if ($this.hasClass('icon-del')) {
... ...
... ... @@ -5,6 +5,7 @@
* @date: 2015/10/21
*/
// bikai
// 增加init函数，异步请求的接口需要重新初始化一下选择列表
// 异步渲染的模板统一插入 #chose-panel ,兼容页面多个选择框
... ...
... ... @@ -152,17 +152,17 @@ function reMarginFooter(fixedElement) {
//未登录
$op.prepend(
'<a href="http://m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' +
'<a href="//m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' +
'<span class="sep-line">|</span>' +
'<a href="http://m.yohobuy.com/reg.html">注册</a>'
'<a href="//m.yohobuy.com/reg.html">注册</a>'
);
} else {
//已登录
$op.prepend(
'<span>Hi,</span>' +
'<a class="user-name" href="http://m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<a href="http://m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>'
'<a class="user-name" href="//m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<a href="//m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>'
);
}
... ... @@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) {
a.async = 1;
a.src = j;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', 'http://cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
})(window, document, 'script', '//cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
(function() {
var uid = getUid();
... ...
... ... @@ -44,7 +44,7 @@ $('.nav-btn').on('touchstart', function() {
return false;
});
function hideSideBar() {
function hideSideBar(){
openSideNav = false;
if ($mobileWrap.hasClass('menu-open')) {
$mobileWrap.removeClass('menu-open');
... ...
... ... @@ -9,7 +9,6 @@
background: rgba(0,0,0,.3);
z-index:3;
.main {
position: absolute;
height: pxToRem(610px);
... ... @@ -169,6 +168,7 @@
margin-left: -1px;
}
.btn-wrap {
position: relative;
height: 120rem / $pxConvertRem;
... ...
... ... @@ -124,7 +124,7 @@ $border_color_light: #eee;
a {
img {
width: 100%;
height: 100%;
height: auto;
}
}
}
... ...
... ... @@ -23,71 +23,71 @@
</head>
<body>
<div id="wrapper">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/01.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/02.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/03.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/01.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/02.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/03.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/04.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/04.jpg">
<a class="href href-right" href="{{url_yohope}}"></a>
</div>
<a href="{{url_mycoupon}}"><img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/05.jpg"></a>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/06.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/07.jpg">
<a href="{{url_mycoupon}}"><img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/05.jpg"></a>
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/06.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/07.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/08.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/08.jpg">
<a class="href href-left" href="{{url_60}}"></a>
<a class="href href-right" href="{{url_710}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/09.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/09.jpg">
<a class="href href-left" href="{{url_138}}"></a>
<a class="href href-right" href="{{url_495}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/10.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/10.jpg">
<a class="href href-left" href="{{url_419}}"></a>
<a class="href href-right" href="{{url_868}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/11.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/11.jpg">
<a class="href href-left" href="{{url_1026}}"></a>
<a class="href href-right" href="{{url_1027}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/12.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/12.jpg">
<a class="href href-left" href="{{url_324}}"></a>
<a class="href href-right" href="{{url_649}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/13.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/13.jpg">
<a class="href href-left" href="{{url_more}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/14.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/14.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/15.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/15.jpg">
<a class="href-click" id="get-all-coupon" href="{{jumpUrl}}"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/16.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/17.jpg">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/18.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/16.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/17.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/18.jpg">
<div class="img-box">
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/19.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/19.jpg">
<a href="{{url_help}}" class="show-more"></a>
</div>
<img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
<img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
</div>
<div id="coupon-container" param="{{activityId}}"></div>
<script src="http://static.buy.test.yoho.cn/js/cuxiao/jquery.min.js"></script>
<script src="http://static.buy.test.yoho.cn/js/cuxiao/jquery.lazyload.js"></script>
<script src="http://static.buy.test.yoho.cn/js/cuxiao/151201/coupon.mobile.js"></script>
<script src="//static.buy.test.yoho.cn/js/cuxiao/jquery.min.js"></script>
<script src="//static.buy.test.yoho.cn/js/cuxiao/jquery.lazyload.js"></script>
<script src="//static.buy.test.yoho.cn/js/cuxiao/151201/coupon.mobile.js"></script>
<script>
$(function() {
$("img.lazy").lazyload({
... ...
... ... @@ -42,7 +42,7 @@
</a>
{{/notice.list}}
</div>
{{/if}} -->
{{/if}}-->
<div class="my-order">
<a class="order-title" href="/home/orders">
我的订单
... ...
... ... @@ -2,9 +2,8 @@
<div class="logistic-page yoho-page">
<div class="overview">
<div class="left" >
<a href="{{logisticUrl}}"><div class="icon" style='background-image:url("{{logisticImg}}")'></div></a>
<a href="{{logisticUrl}}"><img class="icon" src="{{logisticImg}}" /></a>
</div>
<div class="right">
<div>
<span class='info'>物流公司:</span>
... ...
... ... @@ -112,7 +112,7 @@
{{/ orderDetail}}
</div>
<script>_ozprm = "orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
<script type="text/javascript" src="http://static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
<script type="text/javascript" src="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
<script type="text/javascript">
var _agq = _agq || [];
_agq.push(['_cid', '415']); //生成value
... ...
... ... @@ -33,7 +33,7 @@
</div>
</div>
<script>_ozprm="orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
<script type="text/javascript" src ="http://static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
<script type="text/javascript" src ="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
<script type="text/javascript">
var _agq = _agq || [];
_agq.push(['_cid', '415']); //生成value
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="back-email-success-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -8,4 +8,4 @@
<a id="resend" class="resend" data-url={{resendUrl}}>重新发送邮件</a>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="back-email-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -8,4 +8,4 @@
<span id="btn-sure" class="btn btn-sure disable row">确定</span>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="back-code-page passport-page yoho-page">
{{> passport/code}}
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="back-mobile-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -10,4 +10,4 @@
<span id="btn-next" class="btn btn-next disable row">下一步</span>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="back-new-password-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -17,4 +17,4 @@
<input id="email-code" type="hidden" value={{.}}>
{{/ code}}
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="reg-code-page passport-page yoho-page">
<input type="hidden" id="isReg" value="{{isReg}}">
<input type="hidden" id="openId" value="{{openId}}">
... ... @@ -6,4 +6,4 @@
<input type="hidden" id="nickname" value="{{nickname}}">
{{> passport/code}}
</div>
{{> layout/footer_passport}}
{{> layout/footer}}
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="bind-page passport-page yoho-page">
<input type="hidden" id="openId" value="{{openId}}">
<input type="hidden" id="sourceType" value="{{sourceType}}">
... ... @@ -14,4 +14,4 @@
<p class="bind-tip">绑定手机号码后，可选择{{platform}}和手机号登录此帐号</p>
</div>
</div>
{{> layout/footer_passport}}
{{> layout/footer}}
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="bind-password-page passport-page yoho-page">
<input type="hidden" id="openId" value="{{openId}}">
<input type="hidden" id="sourceType" value="{{sourceType}}">
... ... @@ -14,4 +14,4 @@
<input id="area-code" type="hidden" value={{areaCode}}>
<input id="token" type="hidden" value={{token}}>
</div>
{{> layout/footer_passport}}
{{> layout/footer}}
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="login-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -41,4 +41,4 @@
</ul>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="login-international-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -13,4 +13,4 @@
<span id="btn-login" class="btn btn-login disble row">登录</span>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="reg-code-page passport-page yoho-page">
{{> passport/code}}
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="reg-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -11,4 +11,4 @@
<p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p>
</div>
</div>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header_passport}}
{{> layout/header}}
<div class="reg-password-page passport-page yoho-page">
{{> passport/header}}
<div class="content">
... ... @@ -20,4 +20,4 @@ var r=b.getElementsByTagName('script')[0];r.parentNode.insertBefore(s,r);
_agtjs('init','AG_052186_PHCW','yohobuy.com');
_agtjs('loadEvent',{atsev:101,'atsrmv':""});
</script>
{{> layout/footer_passport}}
\ No newline at end of file
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -30,7 +30,7 @@
})();
(function() {
var hm = document.createElement("script");
hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";
hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
hm.async = 1;
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
... ... @@ -52,4 +52,4 @@
var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
}(document);
</script>
<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>
\ No newline at end of file
<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>
\ No newline at end of file
... ...
{{> layout/page_footer}}
{{> layout/download_app}}
{{#if hasWxShare}}
<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<script type="text/javascript" charset="utf-8" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
{{/if}}
{{#if rlsEnv}}
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
{{/if}}
{{#if preEnv}}
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
{{/if}}
{{#if testEnv}}
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index-debug.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/{{version}}/index-debug.js"></script>
{{/if}}
{{#if devEnv}}
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
<script src="//localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: '//localhost:8000/'});</script>
{{/if}}
{{> layout/use}}
{{> layout/analysis}}
... ...
... ... @@ -16,8 +16,8 @@
<script src="/dist/myohobuy/{{version}}/index-debug.js"></script>
{{/if}}
{{#if devEnv}}
<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: 'http://localhost:8000/'});</script>
<script src="//localhost:8000/static/js/sea.js?nowrap"></script>
<script>seajs.config({base: '//localhost:8000/'});</script>
{{/if}}
{{> layout/use}}
{{> layout/analysis_passport}}
... ...
... ... @@ -27,20 +27,20 @@
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
{{#if rlsEnv}}
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{#if preEnv}}
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{#if testEnv}}
<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
{{/if}}
{{#if devEnv}}
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
{{/if}}
<link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
</head>
<body {{#if isPassportPage}}class=passport-body{{/if}}>
{{#if systemUpdate}}
... ...
... ... @@ -36,7 +36,7 @@
<link rel="stylesheet" href="/dist/myohobuy/{{version}}/index.css">
{{/if}}
{{#if devEnv}}
<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
{{/if}}
</head>
<body {{#if isPassportPage}}class=passport-body{{/if}}>
... ...
... ... @@ -66,9 +66,15 @@ class GradeModel
//username 调用获取用户基本信息数据，获得nikename昵称;
$result['vipGrade']['name'] = !empty($data['userProfile']) ? $data['userProfile']['nickname'] : '';
//跳转url(会员特权详情)
$result['vipGrade']['allUrl'] = Helpers::url('/home/preferential', null);
$allUrl = Helpers::url('/home/preferential', null);
$result['vipGrade']['allUrl'] = strtr($allUrl, array('http://' => '//'));
//当前vip等级享受的特权
foreach ($data['grade']['enjoy_preferential'] as &$value) {
$value['pic'] = strtr($value['pic'], array('http://' => '//'));
}
$result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
}
if (USE_CACHE) {
... ... @@ -105,6 +111,9 @@ class GradeModel
//调取接口获得数据
$data = GradeData::getPreferentialData($channel, $uid);
if (isset($data['code']) && $data['code'] == 200) {
foreach ($data['data'] as &$value) {
$value['pic'] = strtr($value['pic'], array('http://' => '//'));
}
$result['vipGrade']['privilege'] = $data['data'];
}
... ...
... ... @@ -122,9 +122,8 @@ class OrderModel
if (empty($logistics['data'])) {
break;
}
$result['logisticUrl'] = $logistics['data']['url'];
$result['logisticImg'] = $logistics['data']['logo'];
$result['logisticImg'] = strtr($logistics['data']['logo'], array('http://' => '//'));
$result['logisticCompany'] = $logistics['data']['caption'];
$result['logisticNumber'] = $logistics['data']['express_number'];
... ...
... ... @@ -473,6 +473,8 @@ class DetailModel
// 测量方式
if (!empty($sizeInfo['sizeImage'])) {
$sizeInfo['sizeImage'] = strtr($sizeInfo['sizeImage'], array('http://' => '//'));
$result['measurementMethod'] = array(
'title' => '测量方式',
'enTitle' => 'MEASUREMENT METHOD',
... ... @@ -501,7 +503,7 @@ class DetailModel
$result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述
foreach ($sizeInfo['modelBos'] as $value) {
$result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']);
$result['reference']['detail']['list'][0]['params'][] = array('param' => strtr($value['avatar'], array('http://' => '//')));
$result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']);
$result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']);
$result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']);
... ... @@ -531,7 +533,7 @@ class DetailModel
);
foreach ($sizeInfo['productMaterialList'] as $value) {
$result['materials']['list'][] = array(
'img' => $value['imageUrl'],
'img' => strtr($value['imageUrl'], array('http://' => '//')),
'desc' => $value['remark'],
);
}
... ... @@ -541,7 +543,11 @@ class DetailModel
if (!empty($sizeInfo['washTipsBoList'])) {
$result['washTips']['list'] = array();
foreach ($sizeInfo['washTipsBoList'] as $value) {
$result['washTips']['list'][] = $value;
//$result['washTips']['list'][] = $value;
$result['washTips']['list'][] = array(
'img' => strtr($value['img'], array('http://' => '//')),
'caption' => $value['caption'],
);
}
}
... ... @@ -557,6 +563,7 @@ class DetailModel
'title' => '商品详情',
'enTitle' => 'DETAILS',
'desc' => strtr($productIntro, array(
'http://' => '//',
'\r\n\t' => '',
'</p>' => '',
'<img src=' => "<img class=\"lazy\" src=\"data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==\" data-original=",
... ...
... ... @@ -55,7 +55,7 @@ class InfoController extends AbstractAction
// 作者信息数据
if (isset($detail['getAuthor']['name'])) {
$data['guang']['author'] = array();
$data['guang']['author']['avatar'] = $detail['getAuthor']['avatar'];
$data['guang']['author']['avatar'] = strtr($detail['getAuthor']['avatar'], array('http://' => '//'));
$data['guang']['author']['name'] = $detail['getAuthor']['name'];
$data['guang']['author']['intro'] = $detail['getAuthor']['author_desc'];
$data['guang']['author']['url'] = $isApp ? $detail['getAuthor']['url'] : Helpers::url('/author/index', array('id' => $detail['getArticle']['author_id']), 'guang');
... ... @@ -158,6 +158,9 @@ class InfoController extends AbstractAction
// 相关品牌
if (!empty($detail['getBrand'])) {
$data['relatedBrand'] = $detail['getBrand'];
foreach ($data['relatedBrand'] as &$value) {
$value['thumb'] = strtr($value['thumb'], array('http://' => '//'));
}
}
// 相关标签
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', 'http://m.dev.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', '//m.dev.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀
define('USE_CACHE', false); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', true); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', false); // 缓存的开关
... ...
... ... @@ -2,11 +2,11 @@
use Yaf\Application;
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', true); // 缓存的开关
define('USE_CACHE', false); // 缓存的开关
define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', true); // 缓存的开关
... ...