合并cart分支到develop

@@ -2,7 +2,11 @@
     {{#if isSoldOut}}
     {{#if isSoldOut}}
         <span class="few-tag-expire">失效</span>
         <span class="few-tag-expire">失效</span>
     {{^}}
     {{^}}
+        {{#if isSelected}}
             <span class="checkbox icon-cb-checked iconfont"></span>
             <span class="checkbox icon-cb-checked iconfont"></span>
+        {{^}}
+            <span class="checkbox icon-checkbox iconfont"></span>
+        {{/if}}
     {{/if}}
     {{/if}}
 
 
     <div class="info">
     <div class="info">
@@ -76,16 +80,4 @@
             </span>
             </span>
         </div>
         </div>
     </div>
     </div>
-    <!--<div class="opt-panel hide">
-        <div class="put-in-favorite">
-            <span class="iconfont">&#xe622;</span>
-            <span>移入</span>
-            收藏夹
-        </div>
-        <div class="del">
-            <span class="iconfont">&#xe626;</span>
-            删除
-        </div>
-    </div>-->
-
 </div>
 </div>

@@ -718,7 +718,7 @@ class CartModel
             // 结算数据
             // 结算数据
             $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
             $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
             $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
             $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
-            $result['count'] = $data['shopping_cart_data']['goods_count'];
+            $result['count'] = $data['shopping_cart_data']['selected_goods_count'];
             $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
             $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
         }while(0);
         }while(0);
 
 

@@ -45,7 +45,6 @@ class IndexController extends AbstractAction
             'shoppingCartPage' => true,
             'shoppingCartPage' => true,
             'shoppingCart' => CartModel::getCartData($uid, $shoppingKey)
             'shoppingCart' => CartModel::getCartData($uid, $shoppingKey)
         );
         );
-
         // 渲染模板
         // 渲染模板
         $this->_view->display('index', $data);
         $this->_view->display('index', $data);
     }
     }