Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -369,7 +369,7 @@ class AbstractAction extends Controller_Abstract
      * @param string $homeUrl 返回首页的链接
      * @param string $homeUrl 返回首页的链接
      * @return void
      * @return void
      */
      */
-    protected function setNavHeader($title = '', $backUrl = true, $homeUrl = '/')
+    protected function setNavHeader($title = '', $backUrl = true, $homeUrl = '/', $navBtn = false)
     {
     {
         $header = array();
         $header = array();
 
 
@@ -387,6 +387,9 @@ class AbstractAction extends Controller_Abstract
         if (!empty($homeUrl)) {
         if (!empty($homeUrl)) {
             $header['navHome'] = $homeUrl . '?go=1&t=' . time();
             $header['navHome'] = $homeUrl . '?go=1&t=' . time();
         }
         }
+        if ($navBtn) {
+            $header['navBtn'] = true;
+        }
 
 
 	    $controller = $this->getRequest()->getControllerName();
 	    $controller = $this->getRequest()->getControllerName();
 		if ($controller !== 'Home') {
 		if ($controller !== 'Home') {

@@ -301,7 +301,7 @@ class FloorProcess
 
 
 	    // 区别多张图与一张图
 	    // 区别多张图与一张图
 	    if (count($data['big_image']) > 1) {
 	    if (count($data['big_image']) > 1) {
-		    $result['big_image']['list'] = $data['big_image'];
+		    $result['big_image']['big_list'] = $data['big_image'];
 		    unset($data['big_image']);
 		    unset($data['big_image']);
 	    }
 	    }
 
 

@@ -131,6 +131,7 @@ $addressListPage.find('.address').each(function(i, elem) {
         $this.siblings().hide();
         $this.siblings().hide();
         $this.children('ul').show().children('li').show();
         $this.children('ul').show().children('li').show();
 
 
+        $(this).removeClass('highlight');
         e.srcEvent.preventDefault();
         e.srcEvent.preventDefault();
         e.srcEvent.stopPropagation();
         e.srcEvent.stopPropagation();
     });
     });

@@ -129,7 +129,7 @@ orderHammer.on('tap', function(e) {
                     if (data.code === 200) {
                     if (data.code === 200) {
 
 
                         //删除订单页面刷新
                         //删除订单页面刷新
-                        location.href = location.href;
+                        history.go(0);
                     }
                     }
                 }
                 }
             });
             });
@@ -154,7 +154,7 @@ orderHammer.on('tap', function(e) {
                     if (data.code === 200) {
                     if (data.code === 200) {
 
 
                         //取消订单页面刷新
                         //取消订单页面刷新
-                        location.href = location.href;
+                        history.go(0);
                     }
                     }
                 }
                 }
             });
             });

@@ -37,6 +37,12 @@ likeHammer.on('tap', function(e) {
         success: function(data) {
         success: function(data) {
             if (data.code === 200) {
             if (data.code === 200) {
                 $this.toggleClass('liked');
                 $this.toggleClass('liked');
+
+                if ('cancel' === opt) {
+                    tip.show('取消收藏成功');
+                } else if ('ok' === opt) {
+                    tip.show('收藏成功');
+                }
             } else if (data.code === 400) {
             } else if (data.code === 400) {
                 location.href = data.data;//未登录跳转登录页
                 location.href = data.data;//未登录跳转登录页
             } else {
             } else {

@@ -48,6 +48,10 @@
                 width: pxToRem(60px);
                 width: pxToRem(60px);
                 height: pxToRem(60px);
                 height: pxToRem(60px);
                 color: #999;
                 color: #999;
+
+                &:hover {
+                    color: #666;
+                }
             }
             }
 
 
             .edit {
             .edit {

@@ -45,9 +45,6 @@ $basicBtnC:#eb0313;
                     font-size: pxToRem(24px);
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     background-color: $tableCellC;
                     float: left;
                     float: left;
-                    &:last-child {
-                        border-bottom: none;
-                    }
                     &:nth-child(even) {
                     &:nth-child(even) {
                         border-right: none;
                         border-right: none;
                     }
                     }

@@ -66,12 +66,6 @@
                 }
                 }
             }
             }
         }
         }
-        // .material-type {
-        //     width: pxToRem(581px);
-        //     height: pxToRem(99px);
-        //     border-top: 1px solid $borderC;
-        //     padding: pxToRem(17px) 0;
-        // }
     }
     }
     .wash-tips{
     .wash-tips{
         padding-top:pxToRem(18px); 
         padding-top:pxToRem(18px); 

@@ -113,8 +113,8 @@
     </div> 
     </div> 
     {{/ enterStore}}
     {{/ enterStore}}
 
 
-    <div id="productDesc"></div>
-    <!-- {{> product/product-description}} -->
+    <!-- <div id="productDesc"></div> -->
+    {{> product/product-description}}
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
 
 
     {{#cartInfo}}
     {{#cartInfo}}
@@ -140,4 +140,3 @@
     
     
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}
-<div class="bottom-blank"></div>

 {{> home/floor_header_more}}
 {{> home/floor_header_more}}
 <div class="goods-category">
 <div class="goods-category">
 	{{# big_image}}
 	{{# big_image}}
-	{{#if list}}
+	{{#if big_list}}
 		<div class="category-swiper">
 		<div class="category-swiper">
 			<ul class="swiper-wrapper">
 			<ul class="swiper-wrapper">
-				{{# list}}
+				{{# big_list}}
 				<li class="swiper-slide">
 				<li class="swiper-slide">
 					<a href="{{url}}">
 					<a href="{{url}}">
 						<img class="lazy" data-original="{{img}}" alt="{{title}}">
 						<img class="lazy" data-original="{{img}}" alt="{{title}}">
 					</a>
 					</a>
 				</li>
 				</li>
-				{{/ list}}
+				{{/ big_list}}
 			</ul>
 			</ul>
 			<div class="swiper-pagination">
 			<div class="swiper-pagination">
 		        <div class="pagination-inner clearfix">
 		        <div class="pagination-inner clearfix">

@@ -52,7 +52,7 @@ class BrandModel
                 $brand = BrandData::package(self::CODE_TOPPOS_LIFESTYLE, 4);
                 $brand = BrandData::package(self::CODE_TOPPOS_LIFESTYLE, 4);
                 break;
                 break;
         }
         }
-        var_dump($brand); exit;
+
         // 模板中的使用JS标识
         // 模板中的使用JS标识
         $result['brandPage'] = true;
         $result['brandPage'] = true;
         // 是否显示app下载浮层标识
         // 是否显示app下载浮层标识

@@ -41,7 +41,6 @@ class BrandController extends AbstractAction
         }
         }
 
 
         // 渲染模板
         // 渲染模板
-        print_r(Category\BrandModel::getBrandByChannel($channel));
         $this->_view->display('index', Category\BrandModel::getBrandByChannel($channel));
         $this->_view->display('index', Category\BrandModel::getBrandByChannel($channel));
     }
     }