m

@@ -385,7 +385,7 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
 
 
     return co(function * () {
     return co(function * () {
         let result = {
         let result = {
-            isEmpty: false,
+            isEmpty: true,
             isLogin: !!uid,
             isLogin: !!uid,
             searchUrl: helpers.urlFormat('', null, 'search'),   // 搜索链接(再逛逛)
             searchUrl: helpers.urlFormat('', null, 'search'),   // 搜索链接(再逛逛)
             listUrl: helpers.urlFormat('', null, 'list'),
             listUrl: helpers.urlFormat('', null, 'list'),

@@ -25,30 +25,10 @@
         <div class="order-pay">
         <div class="order-pay">
             {{#if cart.isEmpty}}
             {{#if cart.isEmpty}}
                 <div class="pay-wapper">
                 <div class="pay-wapper">
-                    <table>
-                        <thead>
-                            <tr>
-                                <th style="width:7%;">
-                                  全选
-                                </th>
-                                <th style="width:40%;">
-                                    商品信息
-                                </th>
-                                <th style="width:13%;">单价</th>
-                                <th style="width:10%;">数量</th>
-                                <th style="width:10%;">小计（元）</th>
-                                <th style="width:20%;">操作</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr class="pre-sell-box">
-                                <td colspan="6" class="cart-empty">
-                                <a href="{{cart.guangUrl}}">选购商品</a>
-                                <a href="{{cart.viewOrderUrl}}">查看订单</a>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+                  <div class="shop-cart-empty">
+                    <p>购物车空空的哦，去看看心仪的商品吧~</p>
+
+                  </div>
                 </div>
                 </div>
                 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}">
                 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}">
                     <table>
                     <table>
@@ -72,7 +52,7 @@
                     <div class="pay-wapper">
                     <div class="pay-wapper">
                         <div class="cart-title">
                         <div class="cart-title">
                             <p class="left" style="width:6%;">
                             <p class="left" style="width:6%;">
-                                <input type="checkbox"/> 全选
+                              <i class="cart-item-check iconfont cart-item-checked"></i> 全选
                             </p>
                             </p>
                             <p style="width:40%">商品信息</p>
                             <p style="width:40%">商品信息</p>
                             <p style="width:14%">单价</p>
                             <p style="width:14%">单价</p>
@@ -207,7 +187,7 @@
                                 {{#unless cart.isEmpty}}
                                 {{#unless cart.isEmpty}}
                                     <div class="left">
                                     <div class="left">
                                         <a href="javascript:void(0);" class="btn_h" style="display:none;"><span>清空商品</span></a>
                                         <a href="javascript:void(0);" class="btn_h" style="display:none;"><span>清空商品</span></a>
-                                        <input type="checkbox" id="cbSelAllGoods" {{#if cart.isCheckedAll}}checked="checked"{{/if}}>
+                                        <i class="cart-item-check iconfont" id="cbSelAllGoods" {{#if cart.isCheckedAll}}checked="checked"{{/if}}></i>
                                         <span>全选</span>
                                         <span>全选</span>
                                         <a class="delAll" href="javascript:void(0);">删除选中商品</a>
                                         <a class="delAll" href="javascript:void(0);">删除选中商品</a>
                                         <a class="removeAll" href="javascript:void(0);">移入收藏夹</a>
                                         <a class="removeAll" href="javascript:void(0);">移入收藏夹</a>

@@ -6,16 +6,16 @@
     {{#if productNum}}data-productnum="{{productNum}}"{{/if}}
     {{#if productNum}}data-productnum="{{productNum}}"{{/if}}
     {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}} >
     {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}} >
     <div class="pay-pro td" style="width: 45%;">
     <div class="pay-pro td" style="width: 45%;">
-        <input class="cart-item-check {{#isChecked}}cart-item-checked{{/isChecked}}"
+        <i class="cart-item-check iconfont {{#isChecked}}cart-item-checked{{/isChecked}}"
            readonly="readonly" data-goodstype="{{goodsType}}"
            readonly="readonly" data-goodstype="{{goodsType}}"
-               {{#if isChecked}}checked{{/if}}/>
+           {{#if isChecked}}checked{{/if}}></i>
         <a class="pay-pro-icon" href="{{link}}" target="_blank">
         <a class="pay-pro-icon" href="{{link}}" target="_blank">
             <img src="{{imgCover}}">
             <img src="{{imgCover}}">
             <span class="incentive red">预售</span>
             <span class="incentive red">预售</span>
         </a>
         </a>
         <p class="pay-pro-info">
         <p class="pay-pro-info">
             <a href="{{link}}" target="_blank">{{productTitle}}</a>
             <a href="{{link}}" target="_blank">{{productTitle}}</a>
-            <span><b title="{{productColor}}">颜色：红色{{productColor}}</b> 尺码：{{productSize}}</span>
+            <span><b title="{{productColor}}">颜色：红色{{productColor}}</b> 尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i></span>
         </p>
         </p>
     </div>
     </div>
     <div class="product-price td" style="width:17%;">¥{{productPrice}}
     <div class="product-price td" style="width:17%;">¥{{productPrice}}
@@ -52,4 +52,59 @@
         <span class="cart-del-btn">删除</span>
         <span class="cart-del-btn">删除</span>
         <span class="cart-col-btn">移入收藏</span>
         <span class="cart-col-btn">移入收藏</span>
     </div>
     </div>
+    <div class="goods-choose-box none" id="goodsChoose">
+    <div class="goods-info">
+        <div class="dl choose-color">
+            <div class="dd">颜色:</div>
+            <div class="dt active">
+                <img src="#"/>
+            </div>
+            <div class="dt">
+                <img src="#"/>
+            </div>
+            <div class="dt">
+                <img src="#"/>
+            </div>
+        </div>
+        <div class="dl choose-size">
+            <div class="dd">尺码:</div>
+            <div class="dt active">
+                40
+            </div>
+            <div class="dt">
+                42
+            </div>
+            <div class="dt">
+                44
+            </div>
+            <div class="dt">
+                46
+            </div>
+            <div class="dt disabled">
+                48
+            </div>
+        </div>
+        <div class="button-group">
+            <button class="button-sure">确定</button>
+            <button class="button-cancel">取消</button>
+        </div>
+    </div>
+    <div class="goods-info-bigImg">
+        <div class="bigImg">
+            <img src="#"/>
+        </div>
+        <div class="bigImg none">
+            <img src="#"/>
+        </div>
+        <div class="bigImg none">
+            <img src="#"/>
+        </div>
+        <div class="bigImg none">
+            <img src="#"/>
+        </div>
+        <div class="bigImg none">
+            <img src="#"/>
+        </div>
+    </div>
+</div>
 </li>
 </li>

@@ -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 15 10:53:04 2016
+Created by FontForge 20120731 at Wed Jan  4 17:32:53 2017
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -16,7 +16,7 @@ Created by FontForge 20120731 at Thu Dec 15 10:53:04 2016
     ascent="896"
     ascent="896"
     descent="-128"
     descent="-128"
     x-height="792"
     x-height="792"
-    bbox="-0.75 -212 1160 996"
+    bbox="-6 -212 1160 996"
     underline-thickness="0"
     underline-thickness="0"
     underline-position="0"
     underline-position="0"
     unicode-range="U+0078-E701"
     unicode-range="U+0078-E701"
@@ -52,6 +52,8 @@ d="M384 640v-513l321 257z" />
 d="M286 509l-46 -45l272 -272l272 272l-46 45l-226 -226z" />
 d="M286 509l-46 -45l272 -272l272 272l-46 45l-226 -226z" />
     <glyph glyph-name="chevron-right" unicode="&#xe60c;" 
     <glyph glyph-name="chevron-right" unicode="&#xe60c;" 
 d="M387 158l45 -46l272 272l-272 272l-45 -46l226 -226z" />
 d="M387 158l45 -46l272 272l-272 272l-45 -46l226 -226z" />
+    <glyph glyph-name="shoucang" unicode="&#xe641;" 
+d="M896 294q66 69 66 166.5t-66 166.5q-68 71 -164 69q-37 -1 -91.5 -29.5t-90.5 -57.5l-37 -28q-6 4 -15.5 12t-38.5 28t-55.5 35t-59 27.5t-56.5 12.5q-93 0 -159 -69t-66 -166.5t66 -166.5l383 -399z" />
     <glyph glyph-name="duihao" unicode="&#xe605;" 
     <glyph glyph-name="duihao" unicode="&#xe605;" 
 d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65v0z" />
 d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65v0z" />
     <glyph glyph-name="tongzhi" unicode="&#xe63f;" 
     <glyph glyph-name="tongzhi" unicode="&#xe63f;" 
@@ -103,6 +105,9 @@ q5 37 20 66t39 49t55 31q31 10 66 10q33 0 63 -9.5t53 -28.5t36 -46.5t13 -64.5q0 -2
 q-12 0 -23.5 4.5t-20.5 12.5q-8 7 -13 18t-5 23z" />
 q-12 0 -23.5 4.5t-20.5 12.5q-8 7 -13 18t-5 23z" />
     <glyph glyph-name="add" unicode="&#xe644;" 
     <glyph glyph-name="add" unicode="&#xe644;" 
 d="M960 262h-410v-410h-76v410h-410v76h410v410h76v-410h410v-76z" />
 d="M960 262h-410v-410h-76v410h-410v76h410v410h76v-410h410v-76z" />
+    <glyph glyph-name="search1" unicode="&#xe640;" 
+d="M968 47l-163 164q69 108 69 234q0 119 -57.5 219t-157 158.5t-216 58.5t-216 -58.5t-157 -158.5t-57.5 -218.5t57.5 -219t157 -158.5t216.5 -58q124 0 231 69l163 -164q27 -28 65 -28t65 27.5t27 66t-27 66.5zM443.5 134q-127.5 0 -217.5 91.5t-90 220t90 219.5t217.5 91
+t217.5 -91t90 -219.5t-90 -220t-217.5 -91.5z" />
     <glyph glyph-name="xiangxia" unicode="&#xe61d;" 
     <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
 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" />
 M539 214z" />
@@ -124,6 +129,9 @@ d="M569 607q-28 66 -74 108.5t-95 56.5t-100 2.5t-91.5 -45t-66 -94t-26.5 -137.5q0
 q0 76 -26.5 136t-67 92t-92 42.5t-101 -4t-94.5 -56t-72 -104.5z" />
 q0 76 -26.5 136t-67 92t-92 42.5t-101 -4t-94.5 -56t-72 -104.5z" />
     <glyph glyph-name="logincheckbutton1" unicode="&#xe616;" 
     <glyph glyph-name="logincheckbutton1" unicode="&#xe616;" 
 d="M877 896h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104 43t43 104v730q0 61 -43 104t-104 43zM939 19q0 -26 -18 -44t-44 -18h-730q-26 0 -44 18t-18 44v730q0 26 18 44t44 18h730q26 0 44 -18t18 -44v-730z" />
 d="M877 896h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104 43t43 104v730q0 61 -43 104t-104 43zM939 19q0 -26 -18 -44t-44 -18h-730q-26 0 -44 18t-18 44v730q0 26 18 44t44 18h730q26 0 44 -18t18 -44v-730z" />
+    <glyph glyph-name="like" unicode="&#xe642;" 
+d="M703 695q-113 0 -191 -81q-79 81 -191 81t-191 -79t-79 -190q0 -31 6.5 -59.5t20.5 -56t23 -42t26 -39.5q42 -60 127.5 -138t142 -120.5t71.5 -51.5q21 -14 44 -14q25 0 44 14q10 7 30.5 22t66 51t87 72t86 81.5t71.5 83.5q17 25 26 39.5t23 42t20.5 56t6.5 59.5
+q0 111 -79 190t-191 79z" />
     <glyph glyph-name="aaa" unicode="&#xe601;" 
     <glyph glyph-name="aaa" unicode="&#xe601;" 
 d="M505 337l2 -2q2 -1 3.5 -1t3.5 1l430 364q2 2 1 5.5t-5 3.5h-435h-424q-4 0 -5 -3.5t1 -5.5zM72 669q-3 2 -6 0.5t-3 -4.5v-584q0 -4 3.5 -5t5.5 1l288 346zM953 669.5q-3 1.5 -5 -0.5l-288 -246l287 -346q3 -2 6 -1t3 5v584q0 3 -3 4.5zM641 406l-131 -111l-5 5
 d="M505 337l2 -2q2 -1 3.5 -1t3.5 1l430 364q2 2 1 5.5t-5 3.5h-435h-424q-4 0 -5 -3.5t1 -5.5zM72 669q-3 2 -6 0.5t-3 -4.5v-584q0 -4 3.5 -5t5.5 1l288 346zM953 669.5q-3 1.5 -5 -0.5l-288 -246l287 -346q3 -2 6 -1t3 5v584q0 3 -3 4.5zM641 406l-131 -111l-5 5
 l-125 103l-275 -328q-2 -3 -1 -6t5 -3h396h407q4 0 5 3t-1 6z" />
 l-125 103l-275 -328q-2 -3 -1 -6t5 -3h396h407q4 0 5 3t-1 6z" />
@@ -222,14 +230,57 @@ t-34 14t-14 34t14 34l192 191l-192 192q-14 14 -14 34t14 34t34 14t34 -14l192 -192l
 d="M611 55h-39q-10 0 -10 -9q0 -21 -14.5 -36t-35.5 -15t-35.5 15t-14.5 36q0 9 -10 9h-40q-9 0 -9 -9q0 -45 32.5 -77t76.5 -32t76.5 32t32.5 77q0 9 -10 9v0zM920 105q0 6 -3 11q-6 48 -31.5 89t-65.5 69v170q0 96 -55 175t-145 113q-3 42 -34.5 70.5t-73.5 28.5
 d="M611 55h-39q-10 0 -10 -9q0 -21 -14.5 -36t-35.5 -15t-35.5 15t-14.5 36q0 9 -10 9h-40q-9 0 -9 -9q0 -45 32.5 -77t76.5 -32t76.5 32t32.5 77q0 9 -10 9v0zM920 105q0 6 -3 11q-6 48 -31.5 89t-65.5 69v170q0 96 -55 175t-145 113q-3 42 -34.5 70.5t-73.5 28.5
 t-73.5 -28.5t-35.5 -70.5q-89 -34 -144 -113t-55 -175v-170q-40 -28 -65.5 -69t-31.5 -89q-4 -8 -2 -16q-1 -7 -1 -15q0 -9 10 -9h796q10 0 10 9q0 7 -1 15q1 3 1 5v0zM569 686q20 -5 39 -12q69 -29 111 -92.5t42 -137.5v-198q0 -6 5 -9q66 -33 87 -102h-682q21 70 87 102
 t-73.5 -28.5t-35.5 -70.5q-89 -34 -144 -113t-55 -175v-170q-40 -28 -65.5 -69t-31.5 -89q-4 -8 -2 -16q-1 -7 -1 -15q0 -9 10 -9h796q10 0 10 9q0 7 -1 15q1 3 1 5v0zM569 686q20 -5 39 -12q69 -29 111 -92.5t42 -137.5v-198q0 -6 5 -9q66 -33 87 -102h-682q21 70 87 102
 q5 3 5 9v198q0 85 54 153.5t137 88.5q8 2 8 9v27q0 21 15 35.5t35 14.5t35 -14.5t15 -35.5v-27q0 -7 7 -9v0zM569 686z" />
 q5 3 5 9v198q0 85 54 153.5t137 88.5q8 2 8 9v27q0 21 15 35.5t35 14.5t35 -14.5t15 -35.5v-27q0 -7 7 -9v0zM569 686z" />
+    <glyph glyph-name="jian" unicode="&#xe643;" 
+d="M512 832q-91 0 -174 -35.5t-143 -95.5t-95 -143t-35 -174t35 -174t95 -142.5t143 -95t174 -35.5t174 35.5t143 95t95.5 142.5t35.5 174t-35.5 174t-95.5 143t-143 95.5t-174 35.5v0zM753 350h-206v0h-69v0h-207v69h207v0v0h69h206v-69v0zM753 350z" />
+    <glyph glyph-name="jia" unicode="&#xe645;" 
+d="M512 832q-91 0 -174 -35.5t-143 -95.5t-95.5 -142.5t-35.5 -173.5t35.5 -173.5t95.5 -142.5t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 142.5t35.5 173.5t-35.5 173.5t-95.5 142.5t-143 95.5t-174 35.5v0zM753 351h-207v-207h-68v207h-207v68h207v207h68v-207h207v-68
+v0zM753 351z" />
     <glyph glyph-name="wenhao1" unicode="&#xe628;" 
     <glyph glyph-name="wenhao1" unicode="&#xe628;" 
 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
 q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
 q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
 l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56v0q66 -59 66 -154q0 -43 -17 -79z" />
 l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56v0q66 -59 66 -154q0 -43 -17 -79z" />
+    <glyph glyph-name="youjiantou" unicode="&#xe69a;" 
+d="M327 -128q16 0 24 12l376 500l-373 500q-7 9 -20 11t-22 -5q-11 -6 -12.5 -19.5t6.5 -22.5l346 -464l-349 -464q-7 -9 -5 -22t11 -20q6 -6 18 -6z" />
+    <glyph glyph-name="jiantou" unicode="&#xe69b;" 
+d="M697 -128q-16 0 -24 12l-376 500l373 500q7 9 20 11t22 -5t11 -20t-5 -22l-346 -464l349 -467q7 -9 5 -22t-11 -20q-6 -3 -18 -3z" />
     <glyph glyph-name="2" unicode="&#xe62b;" 
     <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
 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" />
 h222v-111h-222v111zM889 334h109v-111h-109v111zM780 113h109v-111h-109v111zM562 2h218v-110h-218v110zM889 2h109v-110h-109v110z" />
     <glyph glyph-name="subtract" unicode="&#xe63c;" 
     <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" />
 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" />
+    <glyph glyph-name="shiliangzhinengduixiang" unicode="&#xe6ba;" 
+d="M875 747q-99 98 -231 133t-263.5 0t-229.5 -133q-98 -99 -133 -231t0 -263.5t133 -229.5q73 -74 167 -112.5t194 -38.5q101 0 195 38t168 111q73 74 111 170t38 193t-38 193t-111 170zM810 86q-60 -61 -139.5 -92.5t-159.5 -31.5t-159.5 31.5t-140.5 92.5
+q-80 81 -108 189.5t1 217t110 189.5q61 61 138 93t160 32t160 -32t138 -93q81 -81 110 -189.5t0 -217t-110 -189.5zM786 595l-485 -485q67 -52 149.5 -67t164 10t142.5 86q93 93 101 224t-72 232zM723 658q-90 71 -211 71q-69 0 -132.5 -26t-112.5 -76q-61 -62 -86 -143
+t-10 -163.5t67 -150.5z" />
+    <glyph glyph-name="xingzhuangkaobei" unicode="&#xe6bb;" 
+d="M947 179q31 0 54 -23t23 -53.5t-23 -53.5t-54 -23h-51q31 0 54 -23t23 -54t-23 -54t-54 -23h-563q-31 0 -54 23t-23 54v461q0 20 5 30q8 20 28.5 33t43.5 13q128 96 128 205q0 71 0.5 99.5t5.5 58.5t15.5 38.5t29.5 8.5q21 0 46 -11t50 -33.5t41.5 -64.5t16.5 -96
+q0 -136 -26 -205h256q31 0 54 -23t23 -53.5t-23 -53.5t-54 -23h51q31 0 54 -23t23 -54t-23 -54t-54 -23zM102.5 -128q-42.5 0 -72.5 30t-30 72v410q0 42 30 72t72.5 30t72.5 -30t30 -72v-410q0 -42 -30 -72t-72.5 -30z" />
+    <glyph glyph-name="juxingkaobei" unicode="&#xe6bc;" 
+d="M186 2l391 382l-391 382l131 130l521 -512l-521 -512z" />
+    <glyph glyph-name="shang" unicode="&#xe6c0;" 
+d="M958 179q0 -15 -10.5 -25.5t-25.5 -10.5t-26 10l-384 384l-384 -384q-11 -10 -26 -10t-25.5 10.5t-10.5 25.5t11 26l409 410q11 10 26 10t26 -10l409 -410q11 -11 11 -26z" />
+    <glyph glyph-name="xia" unicode="&#xe6c1;" 
+d="M958 589q0 15 -10.5 25.5t-25.5 10.5t-26 -10l-384 -384l-384 384q-11 10 -26 10t-25.5 -10.5t-10.5 -25.5t11 -26l409 -410q11 -10 26 -10t26 10l409 410q11 11 11 26z" />
+    <glyph glyph-name="tishi" unicode="&#xe6c2;" 
+d="M512 -62q-91 0 -173.5 35.5t-142 95t-95 142t-35.5 173.5t35.5 173.5t95 142t142 95t173.5 35.5t173.5 -35.5t142 -95t95 -142t35.5 -173.5t-35.5 -173.5t-95 -142t-142 -95t-173.5 -35.5zM512 766q-104 0 -192 -51t-139 -139t-51 -192t51 -192t139 -139t192 -51t192 51
+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" />
+    <glyph glyph-name="aixin" unicode="&#xe6c8;" 
+d="M289 849q-115 0 -196 -89t-81 -215q0 -47 14.5 -93.5t28.5 -71.5t39 -64q30 -47 81 -104.5t97.5 -101.5t99.5 -89.5t74.5 -62.5t35.5 -28t30.5 -11t30.5 11t35.5 28t74.5 62.5t99.5 89.5t97.5 101.5t81 104.5q20 30 29.5 47.5t24.5 49t21.5 64t6.5 68.5q0 125 -81 214.5
+t-196 89.5q-63 0 -119 -29.5t-96 -83.5l-8 -11l-8 11q-41 54 -97.5 83.5t-118.5 29.5zM512 -34l-6 5q-283 226 -377 374q-38 59 -56 102.5t-18 97.5q0 105 68.5 179.5t165.5 74.5q67 0 124.5 -39.5t86.5 -105.5h1l2 -7q2 -8 9 -8t9 8l2 7h1q30 67 87 106t124 39
+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" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

@@ -118,7 +118,7 @@
     </div>
     </div>
     <div class="submit">
     <div class="submit">
       <button class="btn-red"><i class="addCart"></i>添加到购物车</button>
       <button class="btn-red"><i class="addCart"></i>添加到购物车</button>
-      <button><i class="favCount"></i>收藏商品</button>
+      <button class="btn-favCount"><i class="favCount"></i>收藏商品</button>
     </div>
     </div>
   </div>
   </div>
 
 

@@ -10,8 +10,11 @@ var lazyLoad = require('yoho-jquery-lazyload');
 var Dialog = require('../common/dialog').Dialog;
 var Dialog = require('../common/dialog').Dialog;
 var Alert = Dialog.Alert;
 var Alert = Dialog.Alert;
 var $cartGoodsDetail = $('#goodsTogetherDetail'),
 var $cartGoodsDetail = $('#goodsTogetherDetail'),
+    $goodsChoose = $('#goodsChoose'),
+    $goodsItem = $('.cart-table li'),
     pacList = 0,
     pacList = 0,
     shopNum = 1,
     shopNum = 1,
+    productId,
     promotionId,
     promotionId,
     shopNumAll;
     shopNumAll;
 
 
@@ -185,6 +188,47 @@ $('body').on('click', '.cut, .add', function() {
 
 
 });
 });
 
 
+// 凑单弹框 商品信息弹出框，加入收藏夹
+$cartGoodsDetail.on('click', '.btn-favCount', function() {
+    $.ajax({
+        type: 'POST',
+        dataType: 'json',
+        url: '',
+        data: {
+            productId: productId,
+            type: 'add'
+        }
+    }).then(function(d) {
+        if (d.code === 200) {
+            new Alert(d.message).show();
+        } else if (d.code === 403) {
+            if (d.data.url) {
+                window.location = d.data.url;
+            }
+        } else {
+            new Alert(d.message).show();
+        }
+    });
+});
+
+
+// 购物车列表 显示隐藏
+$goodsItem.on('click', '.pay-pro-info span', function() {
+    $('.pay-pro-info').find('span').removeClass('active');
+    $(this).addClass('active');
+    $('.goods-choose-box').addClass('none');
+    $(this).parents('li').children('.goods-choose-box').removeClass('none');
+});
+
+// 购物车列表 修改 颜色
+$goodsChoose.on('click', '.choose-color .dt', function() {
+    pacList = $(this).index();
+    $('.choose-color').find('.dt').removeClass('active');
+    $(this).addClass('active');
+    $('.bigImg').addClass('none').eq($(this).index()).removeClass('none');
+});
+
+
 
 
 var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
 var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
 
 

@@ -285,6 +285,7 @@
                 border: 1px solid #b0b0b0;
                 border: 1px solid #b0b0b0;
                 background-color: #fff;
                 background-color: #fff;
                 box-sizing: border-box;
                 box-sizing: border-box;
+                outline: none;
                 i{
                 i{
                     width: 16px;
                     width: 16px;
                     height: 16px;
                     height: 16px;

+@red: #d0021b;
 .order-ensure-page{
 .order-ensure-page{
 
 
     .order-title {
     .order-title {
@@ -608,6 +609,12 @@
                 &.right {
                 &.right {
                     text-align: right;
                     text-align: right;
                 }
                 }
+                &:nth-child(1) {
+                    padding-left:20px;
+                 }
+            }
+            .cart-item-check {
+                margin-top: 0;
             }
             }
         }
         }
 
 
@@ -705,6 +712,15 @@
             li {
             li {
                 position: relative;
                 position: relative;
                 padding: 0 30px 0 60px;
                 padding: 0 30px 0 60px;
+                &:hover {
+                    .pay-pro-info span {
+                        border-color: #e0e0e0;
+                        i  {
+                            visibility: visible;
+                        }
+                    }
+
+                }
             }
             }
             .tr{
             .tr{
                 border-bottom: 1px solid #e0e0e0;
                 border-bottom: 1px solid #e0e0e0;
@@ -731,23 +747,6 @@
             }
             }
         }
         }
 
 
-        .cart-item-check {
-            position: absolute;
-            left: 15px;
-            width: 15px;
-            height: 15px;
-            float: left;
-            margin-top: 25px;
-            margin-left: 15px;
-            display: inline-block;
-            border: none;
-            background: url(/cart/ico_radius.png);
-            background-repeat: no-repeat;
-            cursor: pointer;
-            &.cart-item-checked{
-                background: url(/cart/ico_radius_checked.png);
-            }
-        }
         .cart-item-disabled {
         .cart-item-disabled {
             position: absolute;
             position: absolute;
             left: 15px;
             left: 15px;
@@ -792,23 +791,36 @@
 
 
         .pay-pro-info {
         .pay-pro-info {
             float: left;
             float: left;
+            text-align: left;
             padding-left: 15px;
             padding-left: 15px;
             padding-top: 10px;
             padding-top: 10px;
             margin-left: 0;
             margin-left: 0;
-            a{
+            a {
                 display:block;
                 display:block;
                 width:280px;
                 width:280px;
+                min-height: 40px;
+                padding-left: 3px;
                 color: #444;
                 color: #444;
                 font-size: 15px;
                 font-size: 15px;
                 line-height: 1.25;
                 line-height: 1.25;
                 text-decoration: none;
                 text-decoration: none;
                 text-align:left;
                 text-align:left;
             }
             }
-            span{
-                display: block;
+            span {
+                display: inline-block;
+                padding-left: 3px;
                 font-size: 13px;
                 font-size: 13px;
                 color: #9a9a9a;
                 color: #9a9a9a;
                 text-align: left;
                 text-align: left;
+                border: 1px dashed transparent;
+                box-sizing: border-box;
+                &:hover {
+                    border-color: #d0021b !important;
+                    i  {
+                        color: #d0021b !important;
+                        visibility: visible;
+                    }
+                }
                 b {
                 b {
                     display: inline-block;
                     display: inline-block;
                     vertical-align: bottom;
                     vertical-align: bottom;
@@ -820,6 +832,171 @@
                     font-style: normal;
                     font-style: normal;
                     font-weight: 400;
                     font-weight: 400;
                     }
                     }
+                i {
+                    font-size: 14px;
+                    margin-left: 40px;
+                    display: inline-block;
+                    width: 14px;
+                    height: 14px;
+                    vertical-align: baseline;
+                    margin-right: 3px;
+                    visibility: hidden;
+                }
+                &.active {
+                    border-color: #d0021b !important;
+                    i  {
+                        color: #d0021b;
+                        visibility: visible;
+                    }
+                }
+
+            }
+        }
+
+        .goods-choose-box {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            margin-top: -96px;
+            margin-left: -70px;
+            padding: 30px 15px;
+            border: 1px solid #000;
+            background-color: #fff;
+            z-index: 20;
+            &:after{
+                 position: absolute;
+                 top: 50%;
+                 left: -16px;
+                 margin-top: -7px;
+                 content: '';
+                 display: inline-block;
+                 width: 0;
+                 height: 0;
+                 border-right: 16px solid #000;
+                 border-top: 8px solid transparent;
+                 border-bottom: 8px solid transparent;
+             }
+            &:before{
+                 position: absolute;
+                 top: 50%;
+                 left: -14px;
+                 margin-top: -6px;
+                 z-index: 20;
+                 content: '';
+                 display: inline-block;
+                 width: 0;
+                 height: 0;
+                 border-right: 14px solid #fff;
+                 border-top: 7px solid transparent;
+                 border-bottom: 7px solid transparent;
+             }
+            .goods-info {
+                float: left;
+                max-width: 165px;
+            }
+            .goods-info-bigImg {
+                float: left;
+            }
+            .bigImg {
+                margin-left: 40px;
+                width: 115px;
+                height: 150px;
+                border: 1px solid #eaeaea;
+                img {
+                    width: 100%;
+                }
+            }
+            .choose-color{
+                margin-bottom: 23px;
+                .dd{
+                    height:35px;
+                    line-height:35px;
+                }
+
+                .dt {
+                    width: 25px;
+                    height: 35px;
+                }
+                .active {
+                    border-color: #000;
+                }
+            }
+            .choose-size {
+                margin-bottom: 13px;
+                .dd{
+                    height:18px;
+                    line-height:18px;
+                }
+                .dt {
+                    width: 25px;
+                    height: 16px;
+                    font-size: 12px;
+                    color: #000;
+                    text-align: center;
+                    line-height: 16px;
+                    margin-bottom: 10px;
+                    &:nth-child(5n) {
+                        margin-left: 37px;
+                    }
+                }
+                .active {
+                     border-color: #000;
+                }
+                .disabled {
+                     color: #e8e8e8;
+                }
+            }
+            .dl{
+                *zoom: 1;
+                &:after{
+                    content: ".";
+                    display: block;
+                    height: 0;
+                    clear: both;
+                    visibility: hidden;
+                }
+            }
+            .dd {
+                float: left;
+                color: #000;
+                font-size: 13px;
+                margin-right: 7px;
+            }
+            .dt {
+                float: left;
+                border: 1px solid #eaeaea;
+                margin-right: 8px;
+                &:last-child {
+                    margin-right: 0;
+                 }
+                img {
+                    width: 100%;
+                }
+            }
+            .button-group {
+                margin-left:37px;
+                button{
+                    width: 50px;
+                    height: 20px;
+                    border-radius: 0;
+                    -webkit-border-radius: 0;
+                    -moz-border-radius: 0;
+                    font-size: 12px;
+                    padding: 0;
+                    border: none;
+                    line-height: 20px;
+                    cursor: pointer;
+                    outline: none;
+                }
+                .button-sure {
+                    background-color: #d0021b;
+                    color: #fff;
+                    margin-right: 18px;
+                }
+                .button-cancel {
+                    background-color: #e0e0e0;
+                    color: #000;
+                }
             }
             }
         }
         }
 
 
@@ -895,7 +1072,6 @@
                 text-align: left;
                 text-align: left;
                 left: 22%;
                 left: 22%;
             }
             }
-
         }
         }
         .sale-info {
         .sale-info {
             &.active {
             &.active {
@@ -999,6 +1175,10 @@
         overflow: hidden;
         overflow: hidden;
         font-size: 14px;
         font-size: 14px;
 
 
+        .cart-item-check {
+            margin-top:0;
+        }
+
         .left {
         .left {
             float: left;
             float: left;
 
 
@@ -1057,6 +1237,23 @@
 
 
     }
     }
 
 
+    .cart-item-check {
+        position: absolute;
+        left: 15px;
+        width: 15px;
+        height: 15px;
+        color:#e9e9e9;
+        float: left;
+        margin-top: 25px;
+        margin-left: 15px;
+        display: inline-block;
+        cursor: pointer;
+        &:before { content: "\e6c3"; }
+        &.cart-item-checked{
+            &:before { content: "\e6cb"; }
+        }
+    }
+
     .cartnew-submit {
     .cartnew-submit {
         height: 50px;
         height: 50px;
         line-height: 50px;
         line-height: 50px;
@@ -1140,7 +1337,7 @@
 
 
         .goods {
         .goods {
             width: 990px;
             width: 990px;
-            height: 300px;
+            height: 310px;
             margin: 20px 0;
             margin: 20px 0;
             overflow: hidden;
             overflow: hidden;
         }
         }
@@ -1175,6 +1372,7 @@
 
 
         .price {
         .price {
             text-align: center;
             text-align: center;
+            margin-bottom: 10px;
         }
         }
 
 
         .sale-price,.market-price {
         .sale-price,.market-price {