Merge branch 'feature/wap325' of http://git.dev.yoho.cn/web/yohobuy into feature/wap325

@@ -60,6 +60,12 @@
                     运费
                     运费
                     <span>{{freight}}</span>
                     <span>{{freight}}</span>
                 </li>
                 </li>
+                {{#if promo_code_amount}}
+                <li>
+                    优惠码
+                    <span>{{promo_code_amount}}</span>
+                </li>
+                {{/if}}
                 {{#if coupon}}
                 {{#if coupon}}
                 <li>
                 <li>
                     优惠券
                     优惠券

-<div class="shopping-cart-good clearfix" data-id="{{id}}">
+<div class="shopping-cart-good clearfix" data-id="{{id}}" data-skn="{{skn}}">
     {{#if inValid}}
     {{#if inValid}}
         <span class="few-tag-expire">失效</span>
         <span class="few-tag-expire">失效</span>
     {{/if}}
     {{/if}}

 <div class="side-nav">
 <div class="side-nav">
+    {{# sideNav}}
     <ul>
     <ul>
-        {{# sideNav}}
+        {{# this}}
         <li class="{{styleClass}}">
         <li class="{{styleClass}}">
             {{# url}}
             {{# url}}
             <a href="{{.}}">
             <a href="{{.}}">
@@ -43,6 +44,7 @@
             </ul>
             </ul>
             {{/ subNav}}
             {{/ subNav}}
         </li>
         </li>
-        {{/ sideNav}}
+        {{/ this}}
     </ul>
     </ul>
+    {{/sideNav}}
 </div>
 </div>

@@ -208,6 +208,10 @@ class OrderModel
                 $result['salePrice'] = self::filterOrderPrice($orderDetail['data']['promotion_amount']); // 活动金额
                 $result['salePrice'] = self::filterOrderPrice($orderDetail['data']['promotion_amount']); // 活动金额
                 $result['freight'] = $orderDetail['data']['shipping_cost']; // 运费
                 $result['freight'] = $orderDetail['data']['shipping_cost']; // 运费
                 $result['coupon'] = self::filterOrderPrice($orderDetail['data']['coupons_amount']); // 优惠券
                 $result['coupon'] = self::filterOrderPrice($orderDetail['data']['coupons_amount']); // 优惠券
+                if (isset($orderDetail['data']['promo_code_amount'])) {
+                    $result['promo_code_amount'] = self::filterOrderPrice($orderDetail['data']['promo_code_amount']); // 优惠码
+                }
+
                 $result['yohoCoin'] = self::filterOrderPrice($orderDetail['data']['yoho_coin_num']); // YOHO币
                 $result['yohoCoin'] = self::filterOrderPrice($orderDetail['data']['yoho_coin_num']); // YOHO币
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['price'] = $orderDetail['data']['amount']; // 实付金额
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号
                 $result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号

@@ -224,8 +224,7 @@ class CartModel
 
 
         $product = CartData::cartProductData($uid, $skn);
         $product = CartData::cartProductData($uid, $skn);
         if (isset($product['code']) && $product['code'] === 200) {
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['code'] = 200;
-            $result['data'] = self::procGoodsDetail($product['data'], $num);
+            $result = self::procGoodsDetail($product['data'], $num);
         }
         }
 
 
         return $result;
         return $result;
@@ -244,7 +243,7 @@ class CartModel
 
 
         $product = CartData::giftProductData($skn, $promotionId);
         $product = CartData::giftProductData($skn, $promotionId);
         if (isset($product['code']) && $product['code'] === 200) {
         if (isset($product['code']) && $product['code'] === 200) {
-            $result['data'] = self::procGoodsDetail($product['data']);
+            $result = self::procGoodsDetail($product['data']);
         }
         }
 
 
         return $result;
         return $result;

@@ -39,16 +39,38 @@ class SideModel
         // 调用接口获取后台配置的侧边栏数据
         // 调用接口获取后台配置的侧边栏数据
         $side = SideData::leftNav();
         $side = SideData::leftNav();
         if (!empty($side['data'])) {
         if (!empty($side['data'])) {
+            $group = array();
+            $num = 0;
+            $groupKey = 0;
+            $count = count(($side['data']));
             foreach ($side['data'] as $key => $value) {
             foreach ($side['data'] as $key => $value) {
+                if ($value['separative_sign'] === 'Y') {
+                    $result[$num] = $group;
+                    $num++;
+                    $groupKey = 0;
+                    $group = array();
+                }
+
                 // 逛的按照原来的做法，使用配置
                 // 逛的按照原来的做法，使用配置
                 if ($value['sort_name_en'] === 'TRENDFINDER') {
                 if ($value['sort_name_en'] === 'TRENDFINDER') {
                     continue;
                     continue;
                 }
                 }
-                $result[$key]['textCn'] = $value['sort_name'];
-                $result[$key]['textEn'] = $value['sort_name_en'];
-                $result[$key]['styleClass'] = strtolower($value['sort_name_en']);
-                $result[$key]['url'] = Helpers::getFilterUrl($value['sort_url']);
-                $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60, 1);
+                $group[$groupKey] = self::formatSideItem($value);
+
+                // 如果存在子菜单，就输出子菜单
+                if (isset($value['sub']) && !empty($value['sub'])) {
+                    $subs = array();
+                    foreach ($value['sub'] as $oneSub) {
+                        $subs[] = self::formatSideItem($oneSub);
+                    }
+
+                    $group[$groupKey]['subNav'] = $subs;
+                }
+                $groupKey++;
+
+                if ($count === $key + 1) {
+                    $result[$num] = $group;
+                }
             }
             }
         }
         }
 
 
@@ -126,4 +148,24 @@ class SideModel
         );
         );
     }
     }
 
 
+
+    /**
+     * 格式化侧边栏数据
+     *
+     * @param array $data 要格式化的侧边栏数据
+     * @return array
+     */
+    private static function formatSideItem($data)
+    {
+        $result = array();
+
+        $result['textCn'] = $data['sort_name'];
+        $result['textEn'] = $data['sort_name_en'];
+        $result['styleClass'] = strtolower($data['sort_name_en']);
+        $result['url'] = Helpers::getFilterUrl($data['sort_url']);
+        $result['img'] = Helpers::getImageUrl($data['sort_ico'], 60, 60, 1);
+
+        return $result;
+    }
+
 }
 }

@@ -195,7 +195,9 @@ class IndexController extends AbstractAction
             $result['num'] = $num;
             $result['num'] = $num;
         }
         }
 
 
-        $this->echoJson($result);
+        $this->_view->display('gift-info', array(
+            'cartInfo' => $result
+        ));
     }
     }
 
 
 //    /*
 //    /*
@@ -223,7 +225,7 @@ class IndexController extends AbstractAction
 
 
         $this->_view->display('gift-info', array(
         $this->_view->display('gift-info', array(
             'promotionId' => $promotionId,
             'promotionId' => $promotionId,
-            'cartInfo' => $result['data']
+            'cartInfo' => $result
         ));
         ));
     }
     }