fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 0e9dddf1813d13ac85bfd11ffe6ce107ccdf3534 2 parents 9d1269a9 7c204ebd

Merge remote-tracking branch 'origin/feature/new-product-detail' into feature/new-product-detail

Inline Side-by-side
Showing 3 changed files with 50 additions and 28 deletions
... ... @@ -97,8 +97,10 @@
<ul class="material-detail">
{{# materialDetail}}
<li class="clearfix">
<img src="{{img}}">
<p class="name">{{name}}<br>{{enName}}</p>
<div class="img-wrap clearfix">
<img src="{{img}}">
<p class="name">{{name}}<br>{{enName}}</p>
</div>
<p class="text">{{text}}</p>
</li>
{{/ materialDetail}}
... ... @@ -309,10 +311,10 @@
<div class="comments cc-content">
<div class="comment-tabs clearfix">
<h2 class="active" data-comment-type="7">
全部（ <em class="comment-num all-comment-num">0</em> ）
全部 ( <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">
... ... @@ -457,7 +459,7 @@
<div class="shoppingCar">
<div class="shoppingCar-btn">
<i class="iconfont">&#xe61b;</i> 加入购物车
<i class="iconfont">&#xe600;</i> 加入购物车
</div>
<div class="shoppingCar-nav">
... ...
... ... @@ -1487,6 +1487,7 @@ $(function() {
skn: skn
}
}).then(function(result) {
console.log(result);
if (result.code === 200 && result.data.packageData.length > 0) {
var packageTpl = require('hbs/product/package.hbs'); // eslint-disable-line
... ...
... ... @@ -953,13 +953,18 @@
display:none;
height: 48px;
line-height: 48px;
line-height: 45px;
text-align: center;
color: #fff;
background-color: #d0021b;
font-size: 16px;
cursor: pointer;
.iconfont {
font-size: 22px;
margin-right: 5px;
}
&:hover{
background: #eb3b19;
background: rgba(233, 38, 1, 0.8);
... ... @@ -977,7 +982,8 @@
text-align: center;
a{
color: #999;
color: #999;
font-size: 15px;
}
.fixed{
... ... @@ -1161,30 +1167,39 @@
}
.material-detail li {
position: relative;
width: 860px;
min-height: 40px;
padding-bottom: 20px;
margin: 0 auto 20px;
img {
float: left;
width: 120px;
height: 40px;
}
.img-wrap {
position: absolute;
top: 50%;
margin-top: -30px;
.name {
float: left;
width: 120px;
line-height: 20px;
border-right: 1px dotted #eaeceb;
color: #000;
text-align: center;
font-size: 16px;
img {
float: left;
width: 120px;
height: 40px;
}
.name {
float: left;
width: 120px;
line-height: 20px;
border-right: 1px dotted #eaeceb;
color: #000;
text-align: center;
font-size: 16px;
}
}
.text {
float: left;
width: 538px;
padding-left: 20px;
margin-left: 240px;
line-height: 24px;
font-size: 14px;
border-left: 1px solid #eaeceb;
... ... @@ -1321,15 +1336,16 @@
}
.details-html {
width: 720px;
width: 100%;
text-align: center;
margin: 0 auto;
.details-word{
font-size: 14px;
color: #444;
display: inline-block;
margin-bottom: 30px;
font-size: 14px;
color: #444;
display: inline-block;
margin-bottom: 30px;
line-height: 25px;
}
b {
... ... @@ -1343,6 +1359,10 @@
img {
max-width: 100%;
}
.img-responsive {
width: 100%;
}
}
/*.consults {
... ... @@ -1603,11 +1623,10 @@
font-weight:normal;
color: #666;
float:left;
padding-left: 8px;
padding-top: 6px;
padding: 4px 15px 0 15px;
line-height: 30px;
cursor: pointer;
margin-bottom:0;
padding-bottom: 10px;
border-bottom: 4px solid #eee;
border-top: 1px solid #e0e0e0;
border-left: 1px solid #e0e0e0;
... ...