增加加价购页面

 {{> layout/header}}
 <div class="gift-advance-page yoho-page">
-    {{# shoppingCart}}
-        {{#if gift}}
-            {{# gift}}
-                {{> cart/gift-advance-good}}
-            {{/ gift}}
-        {{^}}
-            {{# advance}}
+    {{#if advanceBuyPage}}
+        {{# advanceBuy}}
             <div class="advance-block">
                 <p class="title">{{title}}</p>
-                    {{# goods}}
+                {{#goods}}
                     {{> cart/gift-advance-good}}
-                    {{/ goods}}
+                {{/goods}}
             </div>
-            {{/ advance}}
+        {{/ advanceBuy}}
+    {{else}}
+        {{# gift}}
+            {{> cart/gift-advance-good}}
+        {{/ gift}}
     {{/if}}
-    {{/ shoppingCart}}
+
+
 </div>
 {{> layout/footer}}

@@ -23,7 +23,7 @@
                 ¥{{price}}
             </span>
              <span class="price">
-                ¥{{salePrice}}
+                ¥{{marketPrice}}
             </span>
             <span class="count">
                 ×{{count}}

@@ -225,7 +225,12 @@
     seajs.use('js/product/recommend-for-you');
 </script>
 {{/if}}
-{{#if giftAdvancePage}}
+{{#if giftPage}}
+<script>
+    seajs.use('js/shopping-cart/gift-advance');
+</script>
+{{/if}}
+{{#if advanceBuyPage}}
 <script>
     seajs.use('js/shopping-cart/gift-advance');
 </script>

@@ -143,11 +143,11 @@ class IndexController extends AbstractAction
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $cartType = $this->get('cartType', 'ordinary');
-        $data = array('shoppingCartPage' => true);
+        $data = array('giftPage' => true);
         $data += CartModel::getCartData($uid, $shoppingKey, $cartType, true);
 
         // 渲染模板
-        $this->_view->display('gift-advance-good', $data);
+        $this->_view->display('gift-advance', $data);
     }
 
     /*
@@ -161,12 +161,11 @@ class IndexController extends AbstractAction
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $uid = $this->getUid(true);
         $cartType = $this->get('cartType', 'ordinary');
-        $data = array('shoppingCartPage' => true);
+        $data = array('advanceBuyPage' => true);
         $data += CartModel::getCartData($uid, $shoppingKey, $cartType, false, true);
 
         // 渲染模板
-        var_dump($data);
-        $this->_view->display('gift-advance-good', $data);
+        $this->_view->display('gift-advance', $data);
     }
 
     /*