Merge branch 'feature/cart' into 'develop'

Feature/cart

购物车商结算修改

See merge request !33

@@ -199,9 +199,9 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
 
 
-$('.nav-home').on('touchstart', function() {
-    $('.homebuttom').toggleClass('none');
-});
+// $('.nav-home').on('touchstart', function() {
+//     $('.homebuttom').toggleClass('none');
+// });
 
 
 (function() {
 (function() {
     var lastTime = 0,
     var lastTime = 0,

@@ -41,23 +41,8 @@
                 {{> shopping-cart/cart-content}}
                 {{> shopping-cart/cart-content}}
             </div>
             </div>
         {{/ preSellCart}}
         {{/ preSellCart}}
-
     {{/ shoppingCart}}
     {{/ shoppingCart}}
 </div>
 </div>
-<div id="advanceBuy" class="shopping-cart-page yoho-page hide">
-{{# shoppingCart}}
-    {{# commonCart}}
-        {{# advanceBuy}}
-        <span>
-            {{promotionTitle}}
-        </span>
-        {{# goods}}
-            {{> shopping-cart/gift-advance-good}}
-        {{/ goods}}
-        {{/ advanceBuy}}
-    {{/ commonCart}}
-{{/ shoppingCart}}
-</div>
 
 
 <div class="shopping-cart-zero yoho-page hide">
 <div class="shopping-cart-zero yoho-page hide">
     <div class="cart-zero">
     <div class="cart-zero">
@@ -67,6 +52,5 @@
     </div>
     </div>
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
 </div>
 </div>
-
-        {{> shopping-cart/chose-panel}}
-{{> layout/footer}}
+{{> shopping-cart/chose-panel}}
+{{> layout/footer}}

@@ -4,14 +4,14 @@
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
     {{/navBack}}
     {{/navBack}}
     {{#navHome}}
     {{#navHome}}
-    <a class="iconfont nav-home">&#xe611;</a>
+    <a href="{{.}}" class="iconfont nav-home">&#xe611;</a>
     {{/navHome}}
     {{/navHome}}
     {{#navTitle}}
     {{#navTitle}}
     <p class="nav-title">{{.}}</p>
     <p class="nav-title">{{.}}</p>
     {{/navTitle}}
     {{/navTitle}}
     {{# navBtn}}
     {{# navBtn}}
     <!-- <span class="nav-btn">{{.}}</span> -->
     <!-- <span class="nav-btn">{{.}}</span> -->
-    <i class="iconfont nav-home">&#xe638;</i>
+    <!-- <i class="iconfont nav-home">&#xe638;</i> -->
     {{/ navBtn}}
     {{/ navBtn}}
 </header>
 </header>
     <div class="homebuttom none">
     <div class="homebuttom none">

 <div class="shopping-cart-good clearfix" data-id={{id}}>
 <div class="shopping-cart-good clearfix" data-id={{id}}>
-        {{#if isSoldOut}}
-             <p class="">失效</p>
+    <span class="checkbox icon-cb-checked iconfont"></span>
+    <!--    {{#if isSoldOut}}
+<p class="">失效</p>
         {{^}}
         {{^}}
-            {{#if isGift}}
-            {{^}}
-                <span class="checkbox icon-cb-checked iconfont"></span>
-            {{/if}}
-
+        {{#if isGift}}
+        {{^}}
+<span class="checkbox icon-cb-checked iconfont"></span>
         {{/if}}
         {{/if}}
 
 
-    <div class="">
-        <a class="" href="{{url}}">
+        {{/if}}-->
+    <div class="info">
+        <img class="thumb lazy" data-original={{thumb}}>
+        <!--
+         <a class="" href="{{url}}">
             <img class="thumb lazy" data-original="{{thumb}}">
             <img class="thumb lazy" data-original="{{thumb}}">
         </a>
         </a>
         {{#if isAdvanceBuy}}
         {{#if isAdvanceBuy}}
@@ -23,7 +25,8 @@
         {{#if isSoldOut}}
         {{#if isSoldOut}}
         <p class="few-tag">失效</p>
         <p class="few-tag">失效</p>
         {{/if}}
         {{/if}}
-    </div>
+
+        -->
 
 
         <div class="deps show">
         <div class="deps show">
             <p class="name row">{{name}}</p>
             <p class="name row">{{name}}</p>
@@ -55,7 +58,7 @@
                 {{/if}}
                 {{/if}}
 
 
 
 
-                <span class="iconfont icon-edit">&#xe61e;</span>
+                
                 <span class="iconfont icon-del">&#xe621;</span>
                 <span class="iconfont icon-del">&#xe621;</span>
             </p>
             </p>
             <p class="row">
             <p class="row">

@@ -41,11 +41,12 @@ class HomeController extends AbstractAction
     {
     {
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('个人中心');
         $this->setTitle('个人中心');
-        $this->setNavHeader('个人中心', SITE_MAIN . '/?go=1', '', true);
+        $this->setNavHeader('个人中心', SITE_MAIN . '/?go=1');
 
 
         $data = array(
         $data = array(
             'myIndexPage' => true,
             'myIndexPage' => true,
             'showDownloadApp' => true,
             'showDownloadApp' => true,
+            'navHome' => true,
             'pageFooter' => true,
             'pageFooter' => true,
             'cartUrl' => Helpers::url('/cart/index/index', null),
             'cartUrl' => Helpers::url('/cart/index/index', null),
             'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),
             'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home'))),