Merge branch 'develop/wap' into beta/wap

@@ -79,6 +79,8 @@ function loadData($parent, url, page) {
             page: page
             page: page
         },
         },
         success: function(data) {
         success: function(data) {
+            var $loadingMask = $parent.closest('.fav-type').find('.fav-content-loading');
+
             if (url === 'favBrand') {
             if (url === 'favBrand') {
                 $brandLoadMore.addClass('hide');
                 $brandLoadMore.addClass('hide');
             } else {
             } else {
@@ -86,9 +88,16 @@ function loadData($parent, url, page) {
             }
             }
 
 
             if (data === ' ') {
             if (data === ' ') {
-                $parent.closest('.fav-type').find('.fav-content-loading').addClass('hide');
+                $loadingMask.addClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
             } else if (data === 'end') {
             } else if (data === 'end') {
+
+                //处理data等于end时如果loadingMask存在且没有hide样式的情况
+                if ($loadingMask && !$loadingMask.hasClass('hide')) {
+                    $loadingMask.addClass('hide');
+                    $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
+                }
+
                 $parent.closest('.fav-type').find('.fav-load-background')
                 $parent.closest('.fav-type').find('.fav-load-background')
                     .removeClass('fav-load-background').html('没有更多了');
                     .removeClass('fav-load-background').html('没有更多了');
 
 
@@ -97,7 +106,9 @@ function loadData($parent, url, page) {
                 lockId = true;
                 lockId = true;
             } else if (data.length > 10) {
             } else if (data.length > 10) {
                 $parent.append(data);
                 $parent.append(data);
-                $parent.closest('.fav-type').find('.fav-content-loading').remove();
+
+                //如果有数据loadingMask会被remove掉
+                $loadingMask.remove();
                 if (url === 'favBrand') {
                 if (url === 'favBrand') {
                     initSwiper(data);//如果是收藏品牌需要初始化swiper
                     initSwiper(data);//如果是收藏品牌需要初始化swiper
 
 

@@ -332,6 +332,22 @@ $clothes: sprite-map("guang/clothes/*.png");
         }
         }
     }
     }
 
 
+    .link-block {
+        display: block;
+        height: 80rem / $pxConvertRem;
+        line-height: 80rem / $pxConvertRem;
+        padding: 0 30rem / $pxConvertRem;
+        font-size: 16px;
+        background: #fff;
+        border-top: 1px solid #e0e0e0;
+        border-bottom: 1px solid #e0e0e0;
+
+        .iconfont {
+            float: right;
+            color: #ccc;
+        }
+    }
+
     .related-brand {
     .related-brand {
         margin-top: 30rem / $pxConvertRem;
         margin-top: 30rem / $pxConvertRem;
 
 

@@ -43,7 +43,7 @@
         width: 100%;
         width: 100%;
         white-space: nowrap;
         white-space: nowrap;
         margin-top: pxToRem(20px);
         margin-top: pxToRem(20px);
-        color: gray;
+        color: #444;
     }
     }
 
 
     .price {
     .price {

@@ -63,6 +63,13 @@
                                     </div>
                                     </div>
                                 {{/if}}
                                 {{/if}}
 
 
+                                {{#if moreLink}}
+                                    <a class="post-block link-block" href="{{moreLink}}">
+                                        更多商品
+                                        <span class="iconfont">&#xe604;</span>
+                                    </a>
+                                {{/if}}
+
                                 {{#if relatedReco}}
                                 {{#if relatedReco}}
                                     <div class="post-block related-reco-block clearfix">
                                     <div class="post-block related-reco-block clearfix">
                                         <h2>相关推荐</h2>
                                         <h2>相关推荐</h2>

@@ -375,7 +375,7 @@ class IndexController extends AbstractAction
 
 
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('选择地址');
         $this->setTitle('选择地址');
-        $this->setNavHeader('选择地址', Helpers::url('/cart/index/orderEnsure'));
+        $this->setNavHeader('选择地址', Helpers::url('/cart/index/orderEnsure'), false);
 
 
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
         $address = UserModel::getAddressData($uid);
         $address = UserModel::getAddressData($uid);
@@ -397,7 +397,7 @@ class IndexController extends AbstractAction
 
 
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('选择优惠券');
         $this->setTitle('选择优惠券');
-        $this->setNavHeader('选择优惠券', Helpers::url('/cart/index/orderEnsure'));
+        $this->setNavHeader('选择优惠券', Helpers::url('/cart/index/orderEnsure'), false);
 
 
         $this->_view->display('select-coupon', array(
         $this->_view->display('select-coupon', array(
             'selectCouponPage' => true,
             'selectCouponPage' => true,
@@ -410,8 +410,6 @@ class IndexController extends AbstractAction
      */
      */
     public function orderSubAction()
     public function orderSubAction()
     {
     {
-        $result = array();
-
         if ($this->isAjax()) {
         if ($this->isAjax()) {
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $addressId = $this->post('addressId', null);
             $addressId = $this->post('addressId', null);

@@ -18,7 +18,7 @@ class BrandController extends AbstractAction
     public function indexAction()
     public function indexAction()
     {
     {
         $this->setTitle('品牌一览');
         $this->setTitle('品牌一览');
-        $this->setNavHeader('品牌一览', '/boys?go=1&t=' . time());
+        $this->setNavHeader('品牌一览', '/boys?go=1&t=' . time(), false);
 
 
         /* 判断参数是否有效 */
         /* 判断参数是否有效 */
         $channel = null;
         $channel = null;

@@ -146,6 +146,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['moreLink'] = $value['link']['data'][0]['url'];
+                }
 
 
                 $data['detail']['content'][] = $build;
                 $data['detail']['content'][] = $build;
             }
             }
@@ -313,6 +317,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['moreLink'] = $value['link']['data'][0]['url'];
+                }
 
 
                 $data['detail']['content'][] = $build;
                 $data['detail']['content'][] = $build;
             }
             }
@@ -445,6 +453,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['moreLink'] = $value['link']['data'][0]['url'];
+                }
                 
                 
                 // 内容详情
                 // 内容详情
                 if (array() !== $build) {
                 if (array() !== $build) {