Authored by uedxwg

解决代码冲突

@@ -25,7 +25,6 @@ var end = false, @@ -25,7 +25,6 @@ var end = false,
25 var winH = $(window).height(); 25 var winH = $(window).height();
26 26
27 load.init(); 27 load.init();
28 -  
29 function moreRecord(cb) { 28 function moreRecord(cb) {
30 var count = $page.children('.browse-record-good').length; 29 var count = $page.children('.browse-record-good').length;
31 30
@@ -61,7 +60,7 @@ function moreRecord(cb) { @@ -61,7 +60,7 @@ function moreRecord(cb) {
61 60
62 lazyLoad($page.find('.browse-record-good:gt(' + (count - 1) + ') .lazy')); 61 lazyLoad($page.find('.browse-record-good:gt(' + (count - 1) + ') .lazy'));
63 } 62 }
64 - 63 + window.rePosFooter();
65 page++; 64 page++;
66 65
67 if (cb) { 66 if (cb) {
@@ -97,8 +97,7 @@ a { @@ -97,8 +97,7 @@ a {
97 left: 50%; 97 left: 50%;
98 margin-left: -35%; 98 margin-left: -35%;
99 margin-top: -45px; 99 margin-top: -45px;
100 - background-color: #000;  
101 - opacity: 0.7; 100 + background-color: rgba(0,0,0,.7);
102 color: #fff; 101 color: #fff;
103 font-size: 18px; 102 font-size: 18px;
104 border: none; 103 border: none;
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
11 <div class="null"> 11 <div class="null">
12 <i></i> 12 <i></i>
13 <p>您还没有优惠券!</p> 13 <p>您还没有优惠券!</p>
14 - <a href="{{topURL}}">随便逛逛</a> 14 + <a href="/product/new">随便逛逛</a>
15 </div> 15 </div>
16 {{/ noRecord}} 16 {{/ noRecord}}
@@ -182,7 +182,7 @@ class HomeController extends AbstractAction @@ -182,7 +182,7 @@ class HomeController extends AbstractAction
182 182
183 $this->_view->display('browse-record', array( 183 $this->_view->display('browse-record', array(
184 'browseRecordPage' => true, 184 'browseRecordPage' => true,
185 - 'pageFooter' => true 185 + 'pageFooter' => true
186 )); 186 ));
187 } 187 }
188 188