fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 毕凯
Commit 7731135fd30796093a9842e3c36c571b6cb11acc 2 parents 3320a2cd deb0cfac

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

Inline Side-by-side
Showing 11 changed files with 61 additions and 61 deletions
... ... @@ -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://' => '//'));
}
/**
... ...
... ... @@ -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();
... ...
... ... @@ -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({
... ...
... ... @@ -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
... ...
... ... @@ -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
... ...
... ... @@ -8,7 +8,7 @@
<i class="close-icon iconfont">&#xe623;</i>
<div class="circle-rightbottom"></div>
</a>
<a href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho" id="float-layer-btn">
<a href="//a.app.qq.com/o/simple.jsp?pkgname=com.yoho" id="float-layer-btn">
立即下载
</a>
</div>
... ...
{{> 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}}>
... ...