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

@@ -97,8 +97,10 @@
                                     <ul class="material-detail">
                                     <ul class="material-detail">
                                         {{# materialDetail}}
                                         {{# materialDetail}}
                                             <li class="clearfix">
                                             <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>
                                                 <p class="text">{{text}}</p>
                                             </li>
                                             </li>
                                         {{/ materialDetail}}
                                         {{/ materialDetail}}
@@ -309,10 +311,10 @@
                             <div class="comments cc-content">
                             <div class="comments cc-content">
                                 <div class="comment-tabs clearfix">
                                 <div class="comment-tabs clearfix">
                                     <h2 class="active" data-comment-type="7">
                                     <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>
                                     <h2 data-comment-type="6">
                                     <h2 data-comment-type="6">
-                                        有图（ <em class="comment-num img-comment-num">0</em> ）
+                                        有图 ( <em class="comment-num img-comment-num">0</em> )
                                     </h2>
                                     </h2>
                                 </div>
                                 </div>
                                 <div class="judge-content">
                                 <div class="judge-content">
@@ -457,7 +459,7 @@
 
 
                 <div class="shoppingCar">
                 <div class="shoppingCar">
                     <div class="shoppingCar-btn">
                     <div class="shoppingCar-btn">
-                        <i class="iconfont">&#xe61b;</i> 加入购物车
+                        <i class="iconfont">&#xe600;</i> 加入购物车
                     </div>
                     </div>
 
 
                     <div class="shoppingCar-nav">
                     <div class="shoppingCar-nav">

@@ -1487,6 +1487,7 @@ $(function() {
             skn: skn
             skn: skn
         }
         }
     }).then(function(result) {
     }).then(function(result) {
+        console.log(result);
         if (result.code === 200 && result.data.packageData.length > 0) {
         if (result.code === 200 && result.data.packageData.length > 0) {
             var packageTpl = require('hbs/product/package.hbs'); // eslint-disable-line
             var packageTpl = require('hbs/product/package.hbs'); // eslint-disable-line
 
 

@@ -953,13 +953,18 @@
 
 
           display:none;
           display:none;
           height: 48px;
           height: 48px;
-          line-height: 48px;
+          line-height: 45px;
           text-align: center;
           text-align: center;
           color: #fff;
           color: #fff;
           background-color: #d0021b;
           background-color: #d0021b;
           font-size: 16px;
           font-size: 16px;
           cursor: pointer;
           cursor: pointer;
 
 
+          .iconfont {
+              font-size: 22px;
+              margin-right: 5px;
+          }
+
           &:hover{
           &:hover{
             background: #eb3b19;
             background: #eb3b19;
             background: rgba(233, 38, 1, 0.8);
             background: rgba(233, 38, 1, 0.8);
@@ -977,7 +982,8 @@
             text-align: center;
             text-align: center;
 
 
             a{
             a{
-              color: #999;
+                color: #999;
+                font-size: 15px;
              }
              }
 
 
             .fixed{
             .fixed{
@@ -1161,30 +1167,39 @@
    }
    }
 
 
     .material-detail li {
     .material-detail li {
+        position: relative;
         width: 860px;
         width: 860px;
+        min-height: 40px;
         padding-bottom: 20px;
         padding-bottom: 20px;
         margin: 0 auto 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 {
         .text {
             float: left;
             float: left;
             width: 538px;
             width: 538px;
             padding-left: 20px;
             padding-left: 20px;
+            margin-left: 240px;
             line-height: 24px;
             line-height: 24px;
             font-size: 14px;
             font-size: 14px;
             border-left: 1px solid #eaeceb;
             border-left: 1px solid #eaeceb;
@@ -1321,15 +1336,16 @@
     }
     }
 
 
     .details-html {
     .details-html {
-        width: 720px;
+        width: 100%;
         text-align: center;
         text-align: center;
         margin: 0 auto;
         margin: 0 auto;
 
 
         .details-word{
         .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 {
         b {
@@ -1343,6 +1359,10 @@
         img {
         img {
             max-width: 100%;
             max-width: 100%;
         }
         }
+
+        .img-responsive {
+            width: 100%;
+        }
     }
     }
 
 
     /*.consults {
     /*.consults {
@@ -1603,11 +1623,10 @@
                 font-weight:normal;
                 font-weight:normal;
                 color: #666;
                 color: #666;
                 float:left;
                 float:left;
-                padding-left: 8px;
-                padding-top: 6px;
+                padding: 4px 15px 0 15px;
+                line-height: 30px;
                 cursor: pointer;
                 cursor: pointer;
                 margin-bottom:0;
                 margin-bottom:0;
-                padding-bottom: 10px;
                 border-bottom: 4px solid #eee;
                 border-bottom: 4px solid #eee;
                 border-top: 1px solid #e0e0e0;
                 border-top: 1px solid #e0e0e0;
                 border-left: 1px solid #e0e0e0;
                 border-left: 1px solid #e0e0e0;