add css

htoooth
Commit 87af88cb870b59b89723f354e1e7ee1cb577254a 1 parent 24756e43
Showing 9 changed files with 113 additions and 69 deletions
apps/product/views/partial/product/consult.hbs
public/font/iconfont.eot
public/font/iconfont.svg
public/font/iconfont.ttf
public/font/iconfont.woff
public/hbs/product/comment-item.hbs
public/img/product/star.png
public/js/product/detail.page.js
public/scss/product/_detail.css
--- a/apps/product/views/partial/product/consult.hbs
View file @87af88c
+++ b/apps/product/views/partial/product/consult.hbs
View file @87af88c
@@ -16,43 +16,87 @@
         <div class="common-consults">
             <div class="common-question">
                 <p>
-                    <span class="top-question"><i class="iconfont">&#xe695;</i>商品都是正品吗？</span>
-                                        <span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货www.yohobuy.com所售的商品均经品牌授权，
+                    <span class="top-question clearfix">
+                        <i class="iconfont">&#xe695;</i>
+                        <span class="question">商品都是正品吗？</span>
+                    </span>
+
+                    <span class="answer-wrapper clearfix">
+                        <i class="iconfont">&#xe696;</i>
+                        <span class="answer">
+                            有货www.yohobuy.com所售的商品均经品牌授权，
                                      正品保障，支持专柜验货，与您亲临商场选购的商品一样享受相同的质量保证，
-                                 请您放心购买。</span>
+                                     请您放心购买。
+                        </span>
+                    </span>
                 </p>
             </div>
             <div class="common-question">
                 <p>
-                    <span class="top-question"><i class="iconfont">&#xe695;</i>尺码表上的尺码标准吗？</span>
-                                        <span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货所售商品尺寸均为人工实物测量，
-                                 可能会存在1-2cm的正常误差范围。</span>
+                    <span class="top-question clearfix">
+                        <i class="iconfont">&#xe695;</i>
+                        <span class="question">尺码表上的尺码标准吗？</span>
+                    </span>
+
+                    <span class="answer-wrapper clearfix">
+                        <i class="iconfont">&#xe696;</i>
+                        <span class="answer">
+                            有货所售商品尺寸均为人工实物测量，可能会存在1-2cm的正常误差范围。
+                        </span>
+                    </span>
                 </p>
             </div>
             <div class="common-question">
                 <p>
-                    <span class="top-question"><i class="iconfont">&#xe695;</i>图片颜色和实物颜色相同吗？</span>
-                                        <span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货所有商品均采用实物专业拍摄，但由于个人显示器不同，
-                                 可能导致实物与图片存在色差，最终颜色以实物为准。</span>
+                    <span class="top-question clearfix">
+                        <i class="iconfont">&#xe695;</i>
+                        <span class="question">图片颜色和实物颜色相同吗？</span>
+                    </span>
+
+                    <span class="answer-wrapper clearfix">
+                        <i class="iconfont">&#xe696;</i>
+                        <span class="answer">
+                            有货所有商品均采用实物专业拍摄，但由于个人显示器不同，可能导致实物与图片存在色差，最终颜色以实物为准。
+                        </span>
+                    </span>
                 </p>
             </div>
             <div class="common-question">
                 <p>
-                    <span class="top-question"><i class="iconfont">&#xe695;</i>发货及配送</span>
-                                        <span class="bottom-answer"><i class="iconfont">&#xe696;</i>当天下午3点前订单当天发，之后的订单隔天发，
-                                 合作快递有:韵达、EMS、顺丰、申通、圆通、宅急送,普通快递3-5天左右送达，顺丰速运1-2天送达。</span>
+                    <span class="top-question clearfix">
+                        <i class="iconfont">&#xe695;</i>
+                        <span class="question">发货及配送</span>
+                    </span>
+
+                    <span class="answer-wrapper clearfix">
+                        <i class="iconfont">&#xe696;</i>
+                        <span class="answer">
+                        当天下午3点前订单当天发，之后的订单隔天发，合作快递有：韵达、EMS、顺丰、申通、圆通、宅急送，普通快递3-5天左右送达，顺丰速运1-2天送达。
+                        </span>
+                    </span>
                 </p>
             </div>
             <div class="common-question">
                 <p>
-                    <span class="top-question"><i class="iconfont">&#xe695;</i>退货or换货</span>
-                                        <span class="bottom-answer"><i class="iconfont">&#xe696;</i>签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
-                                 退回商品保证吊牌、标签、包装完整，详情点击 <a href="http://www.yohobuy.com/help/?category_id=69"
-                                                          target="_blank">&#12288;&#12288;&gt;&gt;退换货政策</a></span>
+                    <span class="top-question clearfix">
+                        <i class="iconfont">&#xe695;</i>
+                        <span class="question">退货or换货</span>
+                    </span>
+
+                    <span class="answer-wrapper clearfix">
+                        <i class="iconfont">&#xe696;</i>
+                        <span class="answer">
+
+                        签收商品未经穿着不影响二次销售的情况下，7日内退货，15日内换货；
+                                 退回商品保证吊牌、标签、包装完整，详情点击
+                        <a href="http://www.yohobuy.com/help/?category_id=69"
+                                                          target="_blank">&gt;&gt;退换货政策</a>
+                        </span>
+                    </span>
                 </p>
             </div>
--- a/public/font/iconfont.eot
View file @87af88c
+++ b/public/font/iconfont.eot
View file @87af88c
--- a/public/font/iconfont.svg
View file @87af88c
+++ b/public/font/iconfont.svg
View file @87af88c
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Wed Jan  4 15:38:01 2017
+Created by FontForge 20120731 at Thu Jan  5 18:05:04 2017
  By admin
 </metadata>
 <defs>
@@ -266,9 +266,6 @@ d="M512 -62q-91 0 -173.5 35.5t-142 95t-95 142t-35.5 173.5t35.5 173.5t95 142t142 
 t139 139t51 192t-51 192t-139 139t-192 51zM464 592q0 -20 14 -34t34 -14t34 14t14 34t-14 34t-34 14t-34 -14t-14 -34zM512 128q-13 0 -22.5 9.5t-9.5 22.5v288q0 13 9.5 22.5t22.5 9.5t22.5 -9.5t9.5 -22.5v-288q0 -13 -9.5 -22.5t-22.5 -9.5z" />
     <glyph glyph-name="yuanxingweixuanzhong" unicode="&#xe6c3;" 
 d="M512 -64q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5t-131.5 -316.5t-316.5 -131.5zM512 768q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5z" />
-    <glyph glyph-name="gouwuche2" unicode="&#xe6c5;" 
-d="M374 44.5q0 -29.5 21 -50.5t50.5 -21t50.5 21t21 50.5t-21 50t-50.5 20.5t-50.5 -20.5t-21 -50zM704 44.5q0 -29.5 21 -50.5t50.5 -21t50.5 21t21 50.5t-21 50t-50.5 20.5t-50.5 -20.5t-21 -50zM895 171h-576q-7 0 -12.5 4.5t-7.5 11.5l-123 497h-114q-8 0 -14 6t-6 14.5
-t6 14.5t14 6h130q16 0 20 -16l123 -497h542l51 410h-543q-8 0 -14 6t-6 14.5t6 14.5t14 6h566q9 0 15 -7q5 -6 5 -14v-2l-56 -451q-1 -7 -6.5 -12.5t-13.5 -5.5z" />
     <glyph glyph-name="qianbi" unicode="&#xe6c7;" 
 d="M921.5 780.5q-39.5 39.5 -95 39.5t-95.5 -39l-15 -16l190 -191l16 16q39 39 39 95t-39.5 95.5zM904 640l-123 123q25 15 56.5 11t52.5 -25q22 -22 25.5 -53t-11.5 -56zM658 693l177 -178l25 26l-177 178zM126 7l76 153l-35 45l-101 -258l284 75l-46 36zM405 134l-127 127
 l377 370l-36 36l-415 -420l187 -188l418 418l-36 36z" />
@@ -279,5 +276,25 @@ q97 0 165.5 -74.5t68.5 -179.5q0 -54 -18 -97.5t-56 -102.5q-94 -148 -377 -374z" />
     <glyph glyph-name="Fill" unicode="&#xe6c9;" 
 d="M512 52q-34 0 -58.5 24.5t-24.5 59t24.5 58.5t58.5 24t58.5 -24t24.5 -58.5t-24.5 -59t-58.5 -24.5zM457 660q0 23 16 39.5t39 16.5t39 -16.5t16 -39.5v-304q0 -22 -16 -38.5t-39 -16.5t-39 16.5t-16 38.5v304zM512 896h-6q-104 0 -199 -40.5t-163.5 -109t-109 -163.5
 t-40.5 -199t40.5 -199t109 -163.5t163.5 -109t199 -40.5h6h6q104 0 199 40.5t163.5 109t109 163.5t40.5 199t-40.5 199t-109 163.5t-163.5 109t-199 40.5h-6z" />
+    <glyph glyph-name="xuanzhong" unicode="&#xe6cb;" 
+d="M512 832q-91 0 -174 -35.5t-143 -95.5t-95.5 -142.5t-35.5 -174t35.5 -174t95.5 -142.5t143 -95.5t174 -35.5t174 35.5t143 95.5t95 142.5t35 174t-35 174t-95 142.5t-143 95.5t-174 35.5zM758 508l-266 -267v0l-2 -1l-17 -17q-2 -3 -5 -5l-2 -2q-2 -1 -6 -1t-6 1l-2 3
+l-6 4l-15 16l-2 3h-1l-163 171q-12 14 -6 20l26 25q7 6 20 -7l156 -164l259 259q13 13 19 6l26 -25q6 -7 -7 -19z" />
+    <glyph glyph-name="konggouwuche" unicode="&#xe6cc;" 
+d="M1007 686q-20 23 -55 23h-6h-665q-13 53 -25 106q-4 16 -12.5 28.5t-16.5 19.5t-18 12t-14 6t-7 2h-140h-2q-16 -4 -31 -19.5t-15 -41.5q0 -13 4.5 -25t10.5 -18.5t13.5 -11.5l10.5 -7t6 -2l61 -1q118 -480 137 -555q7 -26 18 -45t21.5 -28t22.5 -14.5t17.5 -6t9.5 -0.5
+v0q189 -1 333 -1q127 0 155 1q38 1 60 23.5t27 45.5q100 332 115 432q8 50 -15 77zM1000 612q-14 -88 -115 -429q0 -3 -1.5 -7t-6.5 -12.5t-11.5 -15t-18.5 -12t-27 -6.5q-28 -1 -155 -1h-49h-51t-50 0.5t-47.5 0.5h-43.5h-37.5h-28.5h-19h-7q-3 0 -6.5 0.5t-12.5 5
+t-17 11.5t-17 23t-14 37q-2 8 -139 564l-2 8h-74q-28 13 -28 43t28 39h134q7 -2 14.5 -5.5t19.5 -16t16 -29.5l28 -115l2 -8h683h4h1q25 0 38 -16q16 -18 10 -59zM441.5 67q-37.5 0 -64 -27t-26.5 -64.5t26.5 -64t64 -26.5t64 26.5t26.5 64t-26.5 64.5t-64 27zM441.5 -93
+q-28.5 0 -48.5 20t-20 48.5t20 48.5t48.5 20t48.5 -20t20 -48.5t-20 -48.5t-48.5 -20zM721.5 67q-37.5 0 -64 -27t-26.5 -64.5t26.5 -64t64 -26.5t64.5 26.5t27 64t-27 64.5t-64.5 27zM721.5 -93q-28.5 0 -48.5 20t-20 48.5t20 48.5t48.5 20t48.5 -20t20 -48.5t-20 -48.5
+t-48.5 -20z" />
+    <glyph glyph-name="yuan" unicode="&#xe6cd;" 
+d="M59 384h906h-906z" />
+    <glyph glyph-name="sq" unicode="&#xe6cf;" 
+d="M922 510l-368 369q-17 17 -41 17t-41 -17l-369 -369q-19 -17 -19 -43q0 -24 17 -41t41 -17q26 0 43 19l270 270v-471q0 -24 17 -41t41 -17t41 17t17 41v471l269 -270q17 -15 40 -15q24 0 41 17t17 41q0 23 -16 39v0zM834 38h-642q-24 0 -41 -17t-17 -41t17 -41t41 -17
+h642v0q24 0 41 17t17 41t-17 41t-41 17v0v0z" />
+    <glyph glyph-name="zz" unicode="&#xe6d1;" 
+d="M763 743q-74 59 -163.5 83.5t-177 15.5t-167.5 -48l-89 83q-15 14 -32 18t-32 -6q-18 -4 -28 -20.5t-10 -36.5v-248q0 -24 16.5 -40.5t40.5 -16.5h248q38 0 57 38q12 47 -12 64l-70 70q84 34 179.5 21.5t169.5 -72.5q79 -60 116 -149.5t25.5 -185.5t-71.5 -174
+q-42 -57 -105.5 -93.5t-135.5 -46.5q-72 -9 -141 9t-126 61q-19 14 -44 10.5t-39 -23t-10 -44t23 -38.5q132 -102 292 -102q45 0 64 6q96 15 178.5 62t139.5 123q78 106 92.5 235t-35 248t-153.5 197z" />
+    <glyph glyph-name="yz" unicode="&#xe6d2;" 
+d="M255 743q113 85 252.5 96.5t262.5 -51.5l83 83q25 25 63 12q18 0 28.5 -15t10.5 -36v-248q0 -24 -17 -40.5t-41 -16.5h-254q-38 0 -57 38q-12 48 12 64l70 70q-79 35 -174 22t-169 -73q-78 -59 -115.5 -148.5t-26 -186t71.5 -174.5q43 -57 106.5 -93.5t135.5 -46.5
+q71 -9 140 9t127 61q19 14 43.5 10.5t39 -23t10.5 -44t-23 -38.5q-133 -102 -293 -102q-44 0 -63 6q-97 15 -179.5 62t-139.5 123q-78 106 -92.5 235t35.5 248t153 197z" />
   </font>
 </defs></svg>
--- a/public/font/iconfont.ttf
View file @87af88c
+++ b/public/font/iconfont.ttf
View file @87af88c
--- a/public/font/iconfont.woff
View file @87af88c
+++ b/public/font/iconfont.woff
View file @87af88c
--- a/public/hbs/product/comment-item.hbs
View file @87af88c
+++ b/public/hbs/product/comment-item.hbs
View file @87af88c
 {{#each comments}}
     <li>
-        <div class="user-info clearfix judge-head">
+        <div class="user-info clearfix">
             <span class="name">{{userName}}</span>
                 <span class="comment-star pull-left">
                     <span class="star-{{star}} active"></span>
@@ -28,9 +28,9 @@
                     </a>
                     <div class="img-detail">
                         <dl class="toolbar">
-                            <dd data-role="preview-close"><i class="iconfont">&#xe63b;</i>收起</dd>
-                            <dd data-role="preview-left"><i class="iconfont">&#xe639;</i>向左旋转</dd>
-                            <dd data-role="preview-right"><i class="iconfont">&#xe63a;</i>向右旋转</dd>
+                            <dd data-role="preview-close"><i class="iconfont">&#xe6cf;</i>收起</dd>
+                            <dd data-role="preview-left"><i class="iconfont">&#xe6d1;</i>向左旋转</dd>
+                            <dd data-role="preview-right"><i class="iconfont">&#xe6d2;</i>向右旋转</dd>
                         </dl>
                         <div class="img-wrap">
                             <img src="{{image url 345 345}}" />
--- a/public/img/product/star.png 0 → 100644
View file @87af88c
+++ b/public/img/product/star.png 0 → 100644
View file @87af88c
--- a/public/js/product/detail.page.js
View file @87af88c
+++ b/public/js/product/detail.page.js
View file @87af88c
@@ -1832,12 +1832,11 @@ $(function() {
 });
 $(function() {
-    var font = $('.description-content .basic li');
-
     $('.size-table tbody tr:odd td').css('background-color', '#f9f9f9');
-    font.each(function(i) {
+
+    $('.description-content .basic li').each(function(i) {
         if ((i + 1) % 4 === 0) {
-            $(this).find('.justpostion').css({display: 'inline-block', 'margin-left': '40px'});
+            $(this).find('.justpostion').css({display: 'inline-block', 'margin-left': '70px'});
         } else if ((i + 1) % 4 === 1) {
             return;
         } else {
--- a/public/scss/product/_detail.css
View file @87af88c
+++ b/public/scss/product/_detail.css
View file @87af88c
@@ -1035,14 +1035,12 @@
     }
     .description-content {
-        margin-left: 80px;
-        margin-right: 80px;
     }
     .info-block {
         margin-top: 36px;
-        margin-left: 80px;
-        margin-right: 80px;
+        margin-left: 150px;
+        margin-right: 150px;
         color: #999;
         border-top: 1px solid #e0e0e0;
         font-size: 12px;
@@ -1052,12 +1050,12 @@
         }
         .basic {
-            width: 990px;
+            width: 100%;
             margin: 0 auto;
             li {
                 float: left;
-                width: 200px;
+                width: 25%;
                 margin-top: 10px;
                 margin-bottom: 10px;
                 font-size: 14px;
@@ -1450,34 +1448,35 @@
         .comment-star {
             position: relative;
             display: inline-block;
-            height: 20px;
-            width: 90px;
+            height: 16px;
+            width: 75px;
             cursor: pointer;
-            background: resolve("home/star.png") 0 -20px repeat-x;
+            background: resolve("product/star.png") 0 -35px repeat-x;
+            vertical-align: top;
             .star-1, .star-2, .star-3, .star-4, .star-5 {
                 position: absolute;
                 left: 0;
                 top: 0;
                 display: inline-block;
-                height: 20px;
-                width: 18px;
+                height: 16px;
+                width: 15px;
                 &.active {
-                    background: resolve("home/star.png") repeat-x;
+                    background: resolve("product/star.png") repeat-x;
                 }
             }
             .star-2 {
-                width: 36px;
+                width: 30px;
             }
             .star-3 {
-                width: 54px;
+                width: 45px;
             }
             .star-4 {
-                width: 72px;
+                width: 60px;
             }
             .star-5 {
-                width: 90px;
+                width: 75px;
             }
             &.editable > span {
@@ -1508,6 +1507,7 @@
         .user-info {
             color: #999;
             line-height: 16px;
+            height: 16px;
             > * {
                 float: left;
@@ -1516,6 +1516,7 @@
             .name {
                 color: #444;
                 font-size: 14px;
+                margin-right: 20px;
             }
             .date {
@@ -1554,8 +1555,9 @@
         .comment-detail {
             .comment-date {
-                font-size: 13px;
+                font-size: 14px;
                 color: #b0b0b0;
+                line-height: 20px;
             }
             .tag-list {
                 height: 24px;
@@ -1600,6 +1602,10 @@
                             margin-right: 10px;
                             cursor: pointer;
                         }
+
+                        .iconfont {
+                            font-size: 12px;
+                        }
                     }
                     .img-wrap {
@@ -1636,25 +1642,6 @@
             }
         }
-        .more-wrap {
-            text-align: center;
-            color: #666;
-            border-top: 1px solid #eaeceb;
-            padding: 20px 0;
-            font-size: 14px;
-            font-weight: bold;
-            color: #666;
-        }
-
-        .btn-wrap {
-            padding: 20px 0;
-            border-top: 1px solid #eaeceb;
-        }
-
-        .load-more {
-            cursor: pointer;
-        }
-
         .btn {
             display: block;
             width: 140px;
@@ -1683,9 +1670,6 @@
             color: #444;
         }
-        /*.consults {
-            display: none;
-        }*/
         &.comments {
             h2 {
@@ -2379,7 +2363,7 @@
             .answer {
                 display: inline-block;
-                width: 960px;
+                width: 810px;
                 float: left;
                 margin-top: 0 !important;
             }
@@ -2423,7 +2407,7 @@
 }
 #judge {
-    margin: 30px 80px 10px 80px;
+    margin: 30px 150px 10px 150px;
     .judge-content {
         background-color: #fff;