Merge branch 'feature/cart' of git.yoho.cn:fe/yohobuywap-node into feature/cart

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!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">
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
 <metadata>
-Created by FontForge 20120731 at Thu Dec 22 17:56:59 2016
+Created by FontForge 20120731 at Mon Feb 13 16:27:16 2017
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Thu Dec 22 17:56:59 2016
     bbox="-0.75 -212 3943 896.75"
     bbox="-0.75 -212 3943 896.75"
     underline-thickness="0"
     underline-thickness="0"
     underline-position="0"
     underline-position="0"
-    unicode-range="U+0078-E6B5"
+    unicode-range="U+0078-E6EC"
   />
   />
 <missing-glyph 
 <missing-glyph 
  />
  />
@@ -293,5 +293,12 @@ h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h
     <glyph glyph-name="cuxiaobiaoqian" unicode="&#xe6b5;" 
     <glyph glyph-name="cuxiaobiaoqian" unicode="&#xe6b5;" 
 d="M512 896q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5q104 0 199 40.5t163.5 109t109 163.5t40.5 199q0 139 -68.5 257t-186.5 186.5t-257 68.5zM789 369l-85 -85l-51 51l64 65l2 183l-183 -1l-277 -276q-5 -5 0 -10l171 -171
 d="M512 896q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5q104 0 199 40.5t163.5 109t109 163.5t40.5 199q0 139 -68.5 257t-186.5 186.5t-257 68.5zM789 369l-85 -85l-51 51l64 65l2 183l-183 -1l-277 -276q-5 -5 0 -10l171 -171
 q5 -5 10 0l161 160l52 -51l-161 -162q-23 -23 -57 -23t-57 23l-171 171q-24 24 -24 57t24 57l296 297l288 2z" />
 q5 -5 10 0l161 160l52 -51l-161 -162q-23 -23 -57 -23t-57 23l-171 171q-24 24 -24 57t24 57l296 297l288 2z" />
+    <glyph glyph-name="V" unicode="&#xe6ea;" horiz-adv-x="1361" 
+d="M1235 896l-765 -765l-344 337l-126 -126l470 -470l126 133l765 765z" />
+    <glyph glyph-name="gift-new" unicode="&#xe6ec;" 
+d="M931 -128h-839q-21 0 -36 15.5t-15 35.5v583q0 21 15 36t36 15h839q21 0 36.5 -15t15.5 -36v-583q0 -20 -15.5 -35.5t-36.5 -15.5zM126 -42h771v514h-771v-514zM383 514h257v-599h-257v599zM567 457l-119 42q-8 3 -48 17.5t-100 38.5t-94 41q-39 19 -59 50.5t-16 66.5
+q3 34 25 60.5t56 36.5q37 10 73.5 -6t63.5 -54l141 -193zM240 737h-9q-8 -3 -15 -12t-8 -18q-3 -23 32 -41q36 -19 111 -47q-10 15 -32.5 45t-31.5 43q-23 30 -47 30zM512 497q-13 0 -23 7.5t-14 20.5l-92 321q-4 16 3.5 30t22.5 17q16 5 30 -3t17 -22l92 -322q5 -15 -3 -29
+t-23 -18q-4 -2 -10 -2zM456 457l75 102q73 97 141 193q29 37 66 52t73 6q34 -10 56.5 -36.5t25.5 -60.5q3 -35 -17 -66.5t-58 -50.5q-34 -18 -95.5 -42t-98 -37.5t-48.5 -17.5zM784 737q-25 0 -47 -32q-10 -13 -32 -43l-33 -45q46 17 112 47q34 17 32 41q-4 24 -26 30
+q-2 2 -6 2zM512 497q-9 0 -13 2q-15 5 -22.5 19.5t-1.5 30.5l107 321q5 15 19.5 22.5t30.5 0.5q15 -5 22 -19t1 -30l-107 -321q-3 -11 -13 -18.5t-23 -7.5z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

@@ -77,7 +77,7 @@ let cartObj = {
     },
     },
     toPromotionPage(opts) {
     toPromotionPage(opts) {
         let cartType = cookie.get('_cartType') || 'ordinary';
         let cartType = cookie.get('_cartType') || 'ordinary';
-        let title = '促销商品';
+        let title = encodeURIComponent('优惠活动商品');
 
 
         if (opts.promotionType === 'Gift') {
         if (opts.promotionType === 'Gift') {
             if (opts.status === 30) {
             if (opts.status === 30) {

@@ -424,7 +424,7 @@
                 font-size: 32px;
                 font-size: 32px;
 
 
                 &.gift:before {
                 &.gift:before {
-                    content: "\e620";
+                    content: "\e6ec";
                 }
                 }
 
 
                 &.price-gift:before {
                 &.price-gift:before {