Merge branch 'feature/promotion-list' into release/gray

# Conflicts:
#	public/font/iconfont.eot
#	public/font/iconfont.svg
#	public/font/iconfont.ttf
#	public/font/iconfont.woff

@@ -155,7 +155,7 @@
                 </span>
 
                 <span id="enable-notify" class="buy-btn hide"> <i class="iconfont">
-                        &#xe63d;</i> <span>到货通知</span></span>
+                    &#xe6e2;</i> <span>到货通知</span></span>
 
 
                 <span id="collect-product" class="{{#if isCollect}}coled {{/if}}collect-product">

@@ -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 Tue Jan 17 17:25:48 2017
+Created by FontForge 20120731 at Thu Jan 19 16:45:25 2017
  By admin
 </metadata>
 <defs>
@@ -324,5 +324,8 @@ l-102 96v13l13 14q25 21 60.5 19.5t55.5 -26.5zM123 -5l61 143l82 -82z" />
     <glyph glyph-name="jinzhi" unicode="&#xe6e0;" 
 d="M998 384q0 99 -38.5 189t-103.5 155t-155 103.5t-189 38.5t-189 -38.5t-155 -103.5t-103.5 -155t-38.5 -189t38.5 -189t103.5 -155t155 -103.5t189 -38.5t189 38.5t155 103.5t103.5 155t38.5 189zM512 806q152 0 275 -102l-595 -595q-102 123 -102 275q0 85 33.5 163
 t90.5 135t135 90.5t163 33.5zM237 64l595 595q102 -123 102 -275q0 -114 -55.5 -211t-153 -154t-213.5 -57q-152 0 -275 102z" />
+    <glyph glyph-name="shiliangzhinengduixiang1" unicode="&#xe6e2;" 
+d="M515 -128q60 0 105.5 40t52.5 98h-322q11 -58 57 -98t107 -40zM852 225q-15 31 -15 123v113q0 111 -56 200t-149 127q-7 47 -42 77.5t-81 30.5q-51 0 -87 -36q-26 -27 -35 -72q-93 -42 -149 -131t-56 -196v-113q0 -97 -16 -128q-30 -10 -46 -20q-20 -31 -20 -57
+q0 -31 24 -53.5t58 -22.5h660q34 0 58 22.5t24 53.5q-4 31 -24.5 54.5t-47.5 27.5z" />
   </font>
 </defs></svg>