chenchao / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit abca2bd8c3e4d06ff3c6a03d7959fd5878dc52a1 2 parents a327a069 fc8b583d

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

Inline Side-by-side
Showing 10 changed files with 130 additions and 161 deletions
... ... @@ -11,39 +11,15 @@
<title>{{title}}</title>
{{#if rlsEnv}}
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://cdn.yoho.cn/yohobuy/respond/respond.min.js"></script>
<link href="http://cdn.yoho.cn/yohobuy/respond/respond-proxy.html" id="respond-proxy" rel="respond-proxy" />
<script src="http://cdn.yoho.cn/yohobuy/respond/respond.proxy.js"></script>
<link href="http://cdn.yoho.cn/yohobuy/respond/respond.proxy.gif" id="respond-redirect" rel="respond-redirect" />
<![endif]-->
{{/if}}
{{#if preEnv}}
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://cdn.yoho.cn/yohobuy/respond/respond.min.js"></script>
<link href="http://cdn.yoho.cn/yohobuy/respond/respond-proxy.html" id="respond-proxy" rel="respond-proxy" />
<script src="http://cdn.yoho.cn/yohobuy/respond/respond.proxy.js"></script>
<link href="http://cdn.yoho.cn/yohobuy/respond/respond.proxy.gif" id="respond-redirect" rel="respond-redirect" />
<![endif]-->
{{/if}}
{{#if testEnv}}
<link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://static.buy.test.yoho.cn/dist/yohobuy/respond/respond.min.js"></script>
<link href="http://static.buy.test.yoho.cn/dist/yohobuy/respond/respond-proxy.html" id="respond-proxy" rel="respond-proxy" />
<script src="http://static.buy.test.yoho.cn/dist/yohobuy/respond/respond.proxy.js"></script>
<link href="http://static.buy.test.yoho.cn/dist/yohobuy/respond/respond.proxy.gif" id="respond-redirect" rel="respond-redirect" />
<![endif]-->
{{/if}}
{{#if devEnv}}
<link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css">
<!--[if lt IE 9]>
<script src="http://webstatic.dev.yohobuy.com/plugin/page/respond/respond.min.js"></script>
<link href="http://webstatic.dev.yohobuy.com/plugin/page/respond/respond-proxy.html" id="respond-proxy" rel="respond-proxy" />
<script src="http://webstatic.dev.yohobuy.com/plugin/page/respond/respond.proxy.js"></script>
<link href="http://webstatic.dev.yohobuy.com/plugin/page/respond/respond.proxy.gif" id="respond-redirect" rel="respond-redirect" />
<![endif]-->
{{/if}}
</head>
<body>
... ...
... ... @@ -5,9 +5,9 @@
*/
var $ = require('yoho.jquery');
require('./footer');
var $body = $('body');
require('./footer');
function cookie(name) {
... ... @@ -96,20 +96,20 @@ function getShoppingKey() {
}
//YAS统计代码
//(function(w, d, s, j, f) {
// var a = d.createElement(s);
// var m = d.getElementsByTagName(s)[0];
//
// w.YohoAcquisitionObject = f;
//
// w[f] = function() {
// w[f].p = arguments;
// };
//
// 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');
(function(w, d, s, j, f) {
var a = d.createElement(s);
var m = d.getElementsByTagName(s)[0];
w.YohoAcquisitionObject = f;
w[f] = function() {
w[f].p = arguments;
};
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');
(function() {
var uid = getUid();
... ... @@ -123,6 +123,25 @@ function getShoppingKey() {
}
}());
//window.resize在width<1180时适配成990
$(window).on('resize', function() {
var w = $(this).width();
//return top
if (w < 1360) {
$('.return-top').addClass('min');
} else {
$('.return-top').removeClass('min');
}
//body
if (w < 1180) {
$body.addClass('min-screen');
} else {
$body.removeClass('min-screen');
}
}).trigger('resize');
window.cookie = cookie;
window.setCookie = setCookie;
... ... @@ -132,9 +151,3 @@ window.getUser = getUser;
window.getUid = getUid;
window.getShoppingKey = getShoppingKey;
if($('.simple-header').hasClass('simple-header')){
require('./simple-header');
}else{
require('./header');
}
... ...
... ... @@ -355,51 +355,46 @@
}
}
@media (max-width: 1360px) {
.yoho-footer .return-top {
left: 100%;
right: 20px;
margin-left: auto;
}
.yoho-footer .return-top.min {
left: 100%;
right: 20px;
margin-left: auto;
}
@media (max-width:1180px) {
.yoho-footer {
.index-foot dd {
width: 316px;
.two-dim {
margin-top: 26px;
margin-bottom: 10px;
overflow: hidden;
}
.min-screen .yoho-footer {
.index-foot dd {
width: 316px;
.dim-img {
width: 69px;
height: 69px;
}
.two-dim {
margin-top: 26px;
margin-bottom: 10px;
overflow: hidden;
}
.mobile img {
width: 85px;
height: 108px;
}
.dim-img {
width: 69px;
height: 69px;
}
.promise .left {
margin-right: 45px;
.mobile img {
width: 85px;
height: 108px;
}
}
.subscribe {
width: 200px;
.promise .left {
margin-right: 45px;
}
input {
width: 140px;
}
}
.subscribe {
width: 200px;
.footer-help li {
width: 150px;
input {
width: 140px;
}
}
.footer-help li {
width: 150px;
}
}
\ No newline at end of file
... ...
... ... @@ -80,10 +80,8 @@ input,textarea {
margin-right: auto;
}
@media (max-width: 1180px) {
.center-content {
width: 990px;
}
.min-screen .center-content {
width: 990px;
}
@import "home/index", "product/index", "guang/index", "passport/index", "error", "order/index", "sale/index";
... ...
... ... @@ -387,8 +387,6 @@
}
}
@media (max-width: 1180px) {
.filter-box .brand .attr {
width: 25%;
}
.min-screen .filter-box .brand .attr {
width: 25%;
}
... ...
... ... @@ -51,36 +51,33 @@
}
/*990px*/
@media (max-width: 1180px) {
.min-screen .product-list-page, .new-sale-page {
.product-list-page, .new-sale-page {
.list-right {
width: 810px;
}
.goods-container {
height: auto;
padding-top: 25px;
position: relative;
width: 810px + 10px;//每列增加右边距
.list-right {
width: 810px;
}
.good-info {
width: 195px;
.goods-container {
height: auto;
padding-top: 25px;
position: relative;
width: 810px + 10px;//每列增加右边距
.good-detail-img {
height: 261px;
}
}
.good-info {
width: 195px;
.block-next-page {
width: 195px;
.good-detail-img {
height: 261px;
}
}
.filter-box .brand .attr-content {
max-width: 570px;
.block-next-page {
width: 195px;
height: 261px;
}
}
.filter-box .brand .attr-content {
max-width: 570px;
}
}
\ No newline at end of file
... ...
... ... @@ -56,20 +56,18 @@
}
}
@media (max-width: 1180px) {
.latest-walk {
.goods {
width: 820px;
height: 301px;
}
.min-screen .latest-walk {
.goods {
width: 820px;
height: 301px;
}
.good {
margin-right: 10px;
}
.good {
margin-right: 10px;
}
img {
width: 195px;
height: 261px;
}
img {
width: 195px;
height: 261px;
}
}
... ...
... ... @@ -212,21 +212,19 @@
}
}
@media (max-width: 1180px) {
.product-list-page .sort-intro {
.texts {
width: 346px;
height: 248px;
padding: 0 30px;
}
.min-screen .product-list-page .sort-intro {
.texts {
width: 346px;
height: 248px;
padding: 0 30px;
}
.name {
margin-top: 30px;
}
.name {
margin-top: 30px;
}
.img {
width: 400px;
height: 250px;
}
.img {
width: 400px;
height: 250px;
}
}
... ...
... ... @@ -190,8 +190,6 @@
}
}
@media (max-width: 1180px) {
.new-sale-page .new-brands .brands-wrap {
width: 730px;
}
.min-screen .new-sale-page .new-brands .brands-wrap {
width: 730px;
}
\ No newline at end of file
... ...
... ... @@ -19,30 +19,28 @@
/*990px*/
@media (max-width: 1180px) {
.product-search-page {
.goods-container {
height: auto;
padding-top: 25px;
position: relative;
width: 990px + 10px; //每列增加右边距
.good-info {
width: 190px;
.good-detail-img {
height: 255px;
}
}
.min-screen .product-search-page {
.goods-container {
height: auto;
padding-top: 25px;
position: relative;
width: 990px + 10px; //每列增加右边距
.block-next-page {
width: 190px;
.good-info {
width: 190px;
.good-detail-img {
height: 255px;
}
}
.filter-box .brand .attr-content {
max-width: 750px;
.block-next-page {
width: 190px;
height: 255px;
}
}
.filter-box .brand .attr-content {
max-width: 750px;
}
}
... ...