fe / yohobuy-node · Commits

Go to a project

Authored by mark
Commit 48822f7c1d810f965ccc7d3e94a56161a6d69f4b 1 parent 8ca618c8

adjust something

Inline Side-by-side
Showing 5 changed files with 86 additions and 60 deletions
... ... @@ -127,7 +127,7 @@
{{#if goodsInfo.virtualGoods}}
<!---虚拟商品-尺码信息没有--->
{{else}}
<div class="size-info info-block">
<div class="size-info ">
{{# size}}
<table class="size-table">
... ... @@ -311,7 +311,7 @@
全部（ <em class="comment-num all-comment-num">0</em> ）
</h2>
<h2 data-comment-type="6">
有图（<em class="comment-num img-comment-num">0</em>）
有图（ <em class="comment-num img-comment-num">0</em> ）
</h2>
</div>
<div class="judge-content">
... ... @@ -456,7 +456,7 @@
<div class="shoppingCar">
<div class="shoppingCar-btn">
<i class="iconfont">&#xe61b;</i> 添加到购物车
<i class="iconfont">&#xe61b;</i> 加入购物车
</div>
<div class="shoppingCar-nav">
... ...
... ... @@ -20,11 +20,11 @@ module.exports = {
// test2
singleApi: 'http://192.168.102.27:8092/brower',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
// api: 'http://api-test2.yohops.com:9999/',
// service: 'http://service-test2.yohops.com:9999/',
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/'
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/'
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
... ...
... ... @@ -38,7 +38,7 @@
</div>
</div>
{{/if}}
<span>{{date}}</span>
<span class="comment-date">{{date}}</span>
</div>
</li>
... ...
... ... @@ -1682,10 +1682,10 @@ $(function() {
$(function() {
var font = $('.description-content .basic li');
$('.size-table tbody tr:odd td').css('background-color','#f9f9f9');
font.each(function(i, ele) {
if ((i + 1) % 4 === 0) {
$(this).find('.justpostion').css({display: 'inline-block', 'margin-left': '66px'});
$(this).find('.justpostion').css({display: 'inline-block', 'margin-left': '40px'});
} else if ((i + 1) % 4 === 1) {
return;
} else {
... ...
... ... @@ -896,7 +896,7 @@
text-align: center;
color: #fff;
background-color: #d0021b;
font-size: 14px;
font-size: 16px;
cursor: pointer;
&:hover{
... ... @@ -911,8 +911,8 @@
li{
display: block;
font-size: 14px;
line-height: 34px;
font-size: 16px;
line-height: 36px;
text-align: center;
a{
... ... @@ -921,7 +921,7 @@
.fixed{
color: #000;
font-size: 16px;
font-size: 18px;
}
}
}
... ... @@ -934,7 +934,7 @@
font-size: 14px;
display: inline-block;
padding-bottom: 12px;
margin: 10px 30px -2px 10px;
margin: 10px 2px -2px 10px;
font-weight: bold;
cursor: pointer;
}
... ... @@ -966,11 +966,11 @@
.info-block {
margin-top: 30px;
margin-top: 36px;
margin-left: 80px;
margin-right: 80px;
color: #999;
border-top: 2px solid #eaeceb;
border-top: 1px solid #e0e0e0;
font-size: 12px;
.basic {
... ... @@ -980,9 +980,11 @@
li {
float: left;
width: 200px;
line-height: 30px;
margin-top: 10px;
margin-bottom: 10px;
font-size:14px;
color: #686868;
color: #444;
.valueSpace{
margin-left:7px;
... ... @@ -992,13 +994,17 @@
.comfort {
width: 470px;
border: 1px solid #eaeceb;
margin: 22px auto 20px;
padding-bottom: 15px;
width: 510px;
border: 1px solid #e0e0e0;
margin: 20px auto;
padding-bottom: 10px;
padding-top: 10px;
color: #444;
font-size: 14px;
li {
margin: 12px 20px 0;
margin: 9px 28px;
font-size: 14px;
}
}
... ... @@ -1010,8 +1016,8 @@
margin-right: 2px;
&.cur {
background: #999;
border: 1px solid #999;
background: #444;
border: 1px solid #444;
}
}
}
... ... @@ -1022,12 +1028,12 @@
#block-title-head {
margin-top: 20px;
margin-bottom: 25px;
margin-bottom: 20px;
}
.block-title {
margin-bottom: 46px;
margin-top: -18px;
margin-bottom: 30px;
margin-top: -16px;
text-align: center;
.title-head{
... ... @@ -1037,18 +1043,14 @@
.title {
display: inline-block;
padding-top: 15px;
cursor: pointer;
font-size: 16px;
margin-left: auto;
margin-right: auto;
&.cur {
color: #222;
/*border-top: 2px solid #222;*/
/*margin-top: -2px;*/
border: 1px solid #000;
padding: 8px 26px;
color: #444;
border: 1px solid #444;
padding: 7px 28px 6px;
text-align: center;
background-color: #fff;
}
... ... @@ -1088,31 +1090,30 @@
.material-detail li {
width: 860px;
padding-bottom: 20px;
border-bottom: 1px dotted #eaeceb;
margin: 0 auto 20px;
img {
float: left;
width: 125px;
height: 50px;
width: 120px;
height: 40px;
}
.name {
float: left;
width: 120px;
line-height: 25px;
line-height: 20px;
border-right: 1px dotted #eaeceb;
color: #666;
font-weight: bold;
color: #000;
text-align: center;
font-size: 14px;
font-size: 16px;
}
.text {
float: left;
width: 538px;
padding-left: 20px;
line-height: 18px;
line-height: 24px;
font-size: 14px;
border-left: 1px solid #eaeceb;
}
}
... ... @@ -1132,11 +1133,25 @@
text-align: center;
}
.size-table{
width: 100%;
font-size: 14px;
color: #666;
border: 1px solid #e0e0e0;
thead{
background-color: #f5f5f5;
color: #666;
font-size: 14px;
border-bottom: 1px solid #e0e0e0;
}
}
.size-table,
.reference-table,
.fitting-report-table {
text-align: center;
margin: 0 auto;
margin: 0 auto 20px;
th {
width: 110px;
... ... @@ -1152,11 +1167,6 @@
text-align: center;
}
thead {
background: #f5f7f6;
color: #999;
}
tbody {
color: #222;
}
... ... @@ -1211,10 +1221,13 @@
.size-tip {
color: #999;
margin-top: 15px;
font-size: 14px;
margin-top: 10px;
text-align: center;
}
.details {
text-align: center;
font-size: 12px;
... ... @@ -1319,7 +1332,8 @@
}
.name {
color: #666;
color: #444;
font-size: 14px;
}
.date {
... ... @@ -1340,6 +1354,11 @@
}
.comment-detail{
.comment-date{
font-size: 14px;
color: #b0b0b0;
}
.tag-list{
height:24px;
}
... ... @@ -1389,7 +1408,7 @@
line-height:1.5;
color: #999;
/*margin-left:20px;*/
margin-right:20px;
margin-right:-20px;
dd {
margin:0 20px 5px 20px;
... ... @@ -1446,9 +1465,9 @@
}
.comment {
margin-bottom:10px;
line-height: 1.5;
line-height: 20px;
font-size: 14px;
color: #000;
color: #444;
}
/*.consults {
... ... @@ -2034,7 +2053,7 @@
span{
display:block;
margin-top:4px;
margin-top:15px;
line-height: 20px;
i{
... ... @@ -2051,6 +2070,7 @@
.top-question{
color: #000;
font-size: 14px;
.right-time{
display: inline-block;
... ... @@ -2080,7 +2100,7 @@
}
.common-zan{
border-bottom: 2px solid #ccc;
border-bottom: 1px solid #e0e0e0;
height: 100px;
... ... @@ -2118,10 +2138,11 @@
}
.buy-consults{
border-top: 2px solid #eaeceb;
border-top: 1px solid #e0e0e0;
margin-top: 45px;
.block-title {
margin-bottom: 46px;
margin-bottom: 30px;
margin-top: -18px;
text-align: center;
... ... @@ -2137,7 +2158,7 @@
margin-left: auto;
margin-right: auto;
&.cur {
&.cur{
color: #fff;
border: 1px solid #000;
padding: 8px 26px;
... ... @@ -2159,6 +2180,11 @@
.judge-content{
background-color: #fff;
.pull-right{
color: #444;
font-size: 14px;
}
.img-4{
width: 135px;
height: 200px;
... ...