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

@@ -25,7 +25,6 @@ var end = false,
 var winH = $(window).height();
 
 load.init();
-
 function moreRecord(cb) {
     var count = $page.children('.browse-record-good').length;
 
@@ -61,7 +60,7 @@ function moreRecord(cb) {
 
                     lazyLoad($page.find('.browse-record-good:gt(' + (count - 1) + ') .lazy'));
                 }
-
+                window.rePosFooter();
                 page++;
 
                 if (cb) {
@@ -99,6 +98,7 @@ $page.on('touchstart', '.del-icon', function() {
             rightBtnText: '确定'
         }
     }, function() {
+
         $.ajax({
             type: 'GET',
             url: '/home/delRecord',
@@ -107,7 +107,12 @@ $page.on('touchstart', '.del-icon', function() {
             },
             success: function(data) {
                 if (data.code === 200) {
-                    window.history.go(0);
+                       dialog.showDialog({
+                            dialogText: '删除浏览记录成功',
+                            autoHide: true,
+                            fast: true
+                        });
+                       setTimeout(function(){window.history.go(0);},1000);
                 }
             },
             complete: function() {

@@ -119,7 +119,8 @@ $likeBtn.bind('click', function() {
         method: 'post',
         url: '/home/upAndDown',
         data: {
-            suggest_id: id
+            suggest_id: id,
+            reliable: 1
         }
     }).then(function(data) {
         if (data.code === 200) {
@@ -146,7 +147,8 @@ $disLikeBtn.bind('click', function() {
         method: 'post',
         url: '/home/upAndDown',
         data: {
-            suggest_id: id
+            suggest_id: id,
+            reliable: 2
         }
     }).then(function(data) {
         if (data.code === 200) {

@@ -97,8 +97,7 @@ a {
     left: 50%;
     margin-left: -35%;
     margin-top: -45px;
-    background-color: #000;
-    opacity: 0.7;
+    background-color: rgba(0,0,0,.7);
     color: #fff;
     font-size: 18px;
     border: none;

@@ -11,6 +11,6 @@
 <div class="null">
 	<i></i>
 	<p>您还没有优惠券!</p>
-	<a href="{{topURL}}">随便逛逛</a>
+	<a href="/product/new">随便逛逛</a>
 </div>
 {{/ noRecord}}

 {{> layout/header}}
 <div class="discount-page yoho-page">
 	{{# headerBanner}}
-	{{> product/banner_swipe_and_single}}
+	{{> product/banner-swipe-and-single}}
 	{{/ headerBanner}}
 	<div id="hotRank"></div>
 	{{#if brand}}

@@ -181,7 +181,8 @@ class HomeController extends AbstractAction
         $this->setNavHeader('浏览记录', true, SITE_MAIN);
 
         $this->_view->display('browse-record', array(
-            'browseRecordPage' => true
+            'browseRecordPage' => true,
+            'pageFooter' => true
         ));
     }
 

@@ -84,6 +84,18 @@ class BrandModel
                 $result['bannerTop']['list'][] = $build;
             }
         }
+        // 顶部的轮翻广告列表
+        elseif (!empty($brand['brandTop']['list'][0]['data'])) {
+            $build = array();
+            foreach ($brand['brandTop']['list'][0]['data'] as $value) {
+                if (isset($value['url'])) {
+                    $build['url'] = Helpers::getFilterUrl($value['url']);
+                }
+                $build['img'] = Helpers::getImageUrl($value['src'], 640, 310);
+                $build['title'] = $value['title'];
+                $result['bannerTop']['list'][] = $build;
+            }
+        }
 
         /* 顶部的热门品牌列表 (备注: 当没有轮翻广告的时候，此处内部的foreach不会被执行) */
         if (!empty($brand['brandTop'][1]['data']['list'])) {

@@ -98,8 +98,8 @@ class HomeModel
 
         // 调用接口获取数据
         $banner = IndexData::getBannerStart(self::CODE_BG);
-        if (isset($banner['data'][0]['data']['list'][0]['src'])) {
-            $result = Helpers::getImageUrl($banner['data'][0]['data']['list'][0]['src'], 640, 800, 2);
+        if (isset($banner['code']) && $banner['code'] == 200 && $banner['data']['total'] > 0) {
+            $result = Helpers::getImageUrl($banner['data']['list'][0]['data']['list'][0]['src'], 640, 800, 2);
         }
 
         if (USE_CACHE) {

@@ -302,7 +302,7 @@ class UserModel
                 $data = $records['data']['product_list'];
                 foreach ($data as &$val) {
 	                $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
-                    $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 140, 140) : '';
+                    $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                     $val['sales_price'] = !empty($val['sales_price']) ? $val['sales_price'] . '.00' : 0;
                     $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
                 }

@@ -184,12 +184,12 @@ class NewsaleModel
         $newsale = NewsaleData::getNewsaleFocus($codeKey);
 
         // 调用接口获取数据并封装
-        if (isset($newsale['code']) && isset($newsale['data']['list'])) {
-            if(count($newsale['data']['list']) === 1) {
+        if (isset($newsale['code']) && isset($newsale['data']['list']) && !empty($newsale['data']['list'])) {
+            if(count($newsale['data']['list'][0]['data']) === 1) {
                 $result = Helpers::formatBanner($newsale['data']['list'][0]['data'][0], 640, 240);
             } else {
-                foreach ($newsale['data']['list'] as $one) {
-                    $result['list'][] = Helpers::formatBanner($one['data'], 640, 240);
+                foreach ($newsale['data']['list'][0]['data'] as $one) {
+                    $result['list'][] = Helpers::formatBanner($one, 640, 240);
                 }
             }
         }