add font

htoooth
Commit 87032f4668d832dff7c6a6b31b5e16f2b0378881 1 parent 03fd208c
Showing 10 changed files with 59 additions and 53 deletions
apps/product/views/partial/product/coupon-list.hbs
apps/product/views/partial/product/detail-header.hbs
apps/product/views/partial/product/num.hbs
apps/product/views/partial/product/price-list.hbs
apps/product/views/partial/product/size-list.hbs
public/font/iconfont.eot
public/font/iconfont.svg
public/font/iconfont.ttf
public/font/iconfont.woff
public/scss/product/_detail.css
--- a/apps/product/views/partial/product/coupon-list.hbs
View file @87032f4
+++ b/apps/product/views/partial/product/coupon-list.hbs
View file @87032f4
@@ -5,7 +5,7 @@
                 {{#if @first}}
                     <li>
-                        <a class="left title">品牌券：</a>
+                        <a class="left title">领&nbsp;&nbsp;券：</a>
                     </li>
                 {{/if}}
--- a/apps/product/views/partial/product/detail-header.hbs
View file @87032f4
+++ b/apps/product/views/partial/product/detail-header.hbs
View file @87032f4
@@ -104,6 +104,8 @@
                     </div>
                 </div>
+                <div class="line"></div>
+
                 {{#if virtualGoods}}
                 {{!-- 电子门票按钮 --}}
                     {{#if isVirtualBtn}}
@@ -135,10 +137,6 @@
                     <i class="iconfont"> &#xe61c;</i> 已售罄
                 </span>
-                <span id="call-you" class="buy-btn">
-                    <i class="iconfont"> &#xe61c;</i> 到货通知
-                </span>
-
                 <span id="collect-product" class="{{#if isCollect}}coled {{/if}}collect-product">
                      <i class="iconfont">&#xe611;</i> {{#if isCollect}} <em>已收藏</em> {{^}} <em>收藏商品</em> {{/if}}
                 </span>
--- a/apps/product/views/partial/product/num.hbs
View file @87032f4
+++ b/apps/product/views/partial/product/num.hbs
View file @87032f4
 <span class="minus-plus pull-left">
-    <i id="minus-num" class="minus dis iconfont">&#xe60b;</i>
+    <i id="minus-num" class="minus dis iconfont">&#xe63c;</i>
 </span>
 <span id="num" class="num pull-left">1</span>
 <span class="minus-plus pull-left">
-    <i id="plus-num" class="plus iconfont">&#xe607;</i>
+    <i id="plus-num" class="plus iconfont">&#xe644;</i>
 </span>
--- a/apps/product/views/partial/product/price-list.hbs
View file @87032f4
+++ b/apps/product/views/partial/product/price-list.hbs
View file @87032f4
@@ -12,12 +12,6 @@
     </span>
 {{/if}}
-{{#if promotion}}
-    <span class="promotion">
-        8.5折
-    </span>
-{{/if}}
-
 {{#if studentsPrice}}
     <p class="students-price">
         <span class="title">学生价</span>
@@ -25,32 +19,6 @@
     </p>
 {{/if}}
-{{# vipPrice}}
-    <span class="vip-price">
-        {{#if unLogin}}
-            登录后即可查看vip价格
-            <a class="login-url" href="{{unLogin}}">立即登录</a>
-        {{/if}}
-
-        {{#if normalUser}}
-            <span class="vip-price-item">您当前是普通会员，成为VIP享受更多优惠！</span>
-            <a class="vip-schedual" href="{{vipSchedualUrl}}">查看我的VIP进度</a>
-        {{/if}}
-
-        <div class="vip-level-1"></div>
-
-        {{# prices}}
-            <span class="vip-level-{{vipLevel}}">
-             </span>
-            <em class="cur">
-                {{price}}
-            </em>
-
-        {{/ prices}}
-
-     </span>
-{{/ vipPrice}}
-
 {{#if presalePrice}}
     <span class="presale-price">
         <span class="title">预售价：</span>
@@ -67,6 +35,38 @@
     </span>
 {{/if}}
+{{#if promotion}}
+    <span class="promotion">
+    8.5折
+    </span>
+{{/if}}
+
+{{# vipPrice}}
+    <span class="vip-price">
+    {{#if unLogin}}
+        登录后即可查看vip价格
+        <a class="login-url" href="{{unLogin}}">立即登录</a>
+    {{/if}}
+
+        {{#if normalUser}}
+            <span class="vip-price-item">您当前是普通会员，成为VIP享受更多优惠！</span>
+        <a class="vip-schedual" href="{{vipSchedualUrl}}">查看我的VIP进度</a>
+        {{/if}}
+
+        <div class="vip-level-1"></div>
+
+        {{# prices}}
+            <span class="vip-level-{{vipLevel}}">
+         </span>
+        <em class="cur">
+            {{price}}
+        </em>
+
+        {{/ prices}}
+
+ </span>
+{{/ vipPrice}}
+
 </div>
--- a/apps/product/views/partial/product/size-list.hbs
View file @87032f4
+++ b/apps/product/views/partial/product/size-list.hbs
View file @87032f4
@@ -10,10 +10,6 @@
                         data-num="{{num}}" data-name="{{name}}" data-title="{{title}}">{{name}}</li>
                 {{/each}}
-                {{#unless virtualGoods}}
-                    <span class="size-ruler"></span>
-                {{/unless}}
-
                 <span class="size-warn warn-tip hide"> <i class="iconfont">&#xe61f;</i> 请选择尺码 </span>
             </ul>
         {{/each}}
--- a/public/font/iconfont.eot
View file @87032f4
+++ b/public/font/iconfont.eot
View file @87032f4
--- a/public/font/iconfont.svg
View file @87032f4
+++ b/public/font/iconfont.svg
View file @87032f4
@@ -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 Nov 30 12:41:59 2016
+Created by FontForge 20120731 at Thu Dec  1 17:35:41 2016
  By admin
 </metadata>
 <defs>
@@ -93,6 +93,8 @@ d="M510.5 -60q-90.5 0 -173 35.5t-142.5 95.5t-95.5 142.5t-35.5 173t35.5 173t95.5 
 t54 -201t146 -146t200.5 -53.5t201 53.5t146 146t53.5 201t-53.5 201t-146 146t-201 53.5zM465 248v29q0 19 3 33q3 15 9 28q5 14 15 26t24 26l35 33q15 13 25.5 29.5t10.5 39.5q0 30 -19 50.5t-54 20.5q-18 0 -32 -6.5t-24.5 -17.5t-16.5 -26q-5 -15 -6 -30l-95 8
 q5 37 20 66t39 49t55 31q31 10 66 10q33 0 63 -9.5t53 -28.5t36 -46.5t13 -64.5q0 -25 -5.5 -43t-15.5 -34t-24 -30q-15 -15 -32 -30q-16 -13 -25.5 -23t-15.5 -20t-8 -21.5t-2 -28.5v-20h-92zM450 140q0 25 18 43t44 18q24 0 43 -17t19 -42t-18.5 -42.5t-43.5 -17.5
 q-12 0 -23.5 4.5t-20.5 12.5q-8 7 -13 18t-5 23z" />
+    <glyph glyph-name="add" unicode="&#xe644;" 
+d="M960 262h-410v-410h-76v410h-410v76h410v410h76v-410h410v-76z" />
     <glyph glyph-name="xiangxia" unicode="&#xe61d;" 
 d="M888 620q12 12 28.5 12t28.5 -12v0q12 -12 12 -28.5t-12 -28.5l-406 -405q-12 -12 -28.5 -12t-27.5 12v0q-12 11 -12 27.5t12 28.5zM539 214q11 -12 11 -28.5t-11 -27.5v0q-12 -12 -28.5 -12t-28.5 12l-406 405q-11 12 -11 28.5t11 28.5v0q12 12 28.5 12t28.5 -12z
 M539 214z" />
@@ -210,5 +212,7 @@ l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56v0q66 -59 66 -
     <glyph glyph-name="2" unicode="&#xe62b;" 
 d="M562 224h109v-111h-109v111zM889 224h109v-111h-109v111zM562 113h109v-110h-109v110zM438 458h-438v438h438v-438zM111 569h216v216h-216v-216zM1000 458h-438v438h438v-438zM673 569h216v216h-216v-216zM438 -106h-438v438h438v-438zM111 5h216v216h-216v-216zM561 335
 h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h218v-110h-218v110zM889 2h109v-110h-109v110z" />
+    <glyph glyph-name="subtract" unicode="&#xe63c;" 
+d="M928 418h-832q-13 0 -22.5 -9.5t-9.5 -23t9.5 -22.5t22.5 -9h832q13 0 22.5 9t9.5 22.5t-9.5 23t-22.5 9.5z" />
   </font>
 </defs></svg>
--- a/public/font/iconfont.ttf
View file @87032f4
+++ b/public/font/iconfont.ttf
View file @87032f4
--- a/public/font/iconfont.woff
View file @87032f4
+++ b/public/font/iconfont.woff
View file @87032f4
--- a/public/scss/product/_detail.css
View file @87032f4
+++ b/public/scss/product/_detail.css
View file @87032f4
@@ -393,9 +393,7 @@
         }
         .row {
-            margin-top: 10px;
-
-            border-bottom: 1px solid #eaeceb;
+            margin-bottom: 22px;
         }
         .trade-content {
@@ -419,10 +417,14 @@
             }
             li {
-                margin-right: 5px;
+                margin-right: 10px;
                 cursor: pointer;
-                border: 2px solid black;
+                border: 1px solid white;
                 height: 34px;
+
+                &.focus {
+                    border-color: black;
+                }
             }
             .color-name {
@@ -448,7 +450,7 @@
                 display: block;
                 height: 24px;
                 line-height: 24px;
-                margin-right: 5px;
+                margin-right: 10px;
                 margin-bottom: 5px;
                 padding: 0 5px;
                 border: 1px solid #eaeceb;
@@ -499,6 +501,13 @@
             line-height: 18px;
         }
+        .line {
+            width: 100%;
+            height: 2px;
+            border-bottom: 1px solid #eaeceb;
+            margin-bottom: 22px;
+        }
+
         .chose-count .title {
             margin-top: 6px;
         }
@@ -570,7 +579,6 @@
         .num-wraper {
             position: relative;
-            border-bottom: 1px solid #eaeceb;
         }
         $arrowTop: 40px;
@@ -627,7 +635,7 @@
             margin-right: 10px;
             height: 48px;
             line-height: 48px;
-            width: 197px;
+            width: 180px;
             text-align: center;
             color: #fff;
             background: $theme-color;
@@ -647,7 +655,7 @@
         .collect-product,
         .keep-shopping {
             display: inline-block;
-            width: 127px;
+            width: 120px;
             height: 48px;
             text-align: center;
             line-height: 48px;