From 674598c6ae90701184c9773b5ebc37f8b2963485 Mon Sep 17 00:00:00 2001
From: weiqingting <qingting.wei@yoho.cn>
Date: Wed, 2 Dec 2015 17:36:06 +0800
Subject: [PATCH] 细节修改
---
template/www.yohobuy.com/partials/index/commodity.phtml | 2 +-
web-static/js/common/new-arrivls.js | 5 +++--
web-static/sass/home/_index.scss | 7 +++----
yohobuy/www.yohobuy.com/application/controllers/Boys.php | 8 ++++++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/template/www.yohobuy.com/partials/index/commodity.phtml b/template/www.yohobuy.com/partials/index/commodity.phtml
index 7ed893b..62d7b9a 100644
--- a/template/www.yohobuy.com/partials/index/commodity.phtml
+++ b/template/www.yohobuy.com/partials/index/commodity.phtml
@@ -5,6 +5,6 @@
</ul>
<div class="loading">
- <p>Loading...</p>
+ <a>Loading...</a>
</div>
</div>
\ No newline at end of file
diff --git a/web-static/js/common/new-arrivls.js b/web-static/js/common/new-arrivls.js
index 107f69d..1153feb 100644
--- a/web-static/js/common/new-arrivls.js
+++ b/web-static/js/common/new-arrivls.js
@@ -6,7 +6,7 @@ var InfiniteLoad = require('../common/infinite-load');
(function($) {
var $container = $('div.commodity ul');
- var $load = $('.loading');
+ var $load = $('.loading a');
var load = new InfiniteLoad({
offset: {
height: function() {
@@ -16,6 +16,7 @@ var InfiniteLoad = require('../common/infinite-load');
});
load.on('after', function(p) {
+ console.log(p.index);
var options = {
type: 'POST',
url: '/boys/commodity',
@@ -40,7 +41,7 @@ var InfiniteLoad = require('../common/infinite-load');
load.emit();
} else {
- $load.html('END');
+ $load.html('查看更多');
}
},
error: function() {
diff --git a/web-static/sass/home/_index.scss b/web-static/sass/home/_index.scss
index d09194f..d7c7561 100644
--- a/web-static/sass/home/_index.scss
+++ b/web-static/sass/home/_index.scss
@@ -342,6 +342,7 @@
.commodity{
margin-left: -10px;
+ margin-bottom:80px;
position: relative;
li{
float: left;
@@ -383,10 +384,8 @@
position: absolute;
bottom: 0;
width: 100%;
- p{
- text-align: center;
- font-size: 20px;
- }
+ text-align: center;
+ font-size: 20px;
}
}
diff --git a/yohobuy/www.yohobuy.com/application/controllers/Boys.php b/yohobuy/www.yohobuy.com/application/controllers/Boys.php
index d23f1df..32daa7a 100644
--- a/yohobuy/www.yohobuy.com/application/controllers/Boys.php
+++ b/yohobuy/www.yohobuy.com/application/controllers/Boys.php
@@ -443,8 +443,8 @@ class BoysController extends AbstractAction
/**
* 男装首页 新品上架 接口数据
*
- * @param int $pageIndex 当前页数
- * @param int $pageCount 一页显示个数
+ * @param int pageIndex 当前页数
+ * @param int pageCount 一页显示个数
* @param string flag 类型(男装/女装等,用于区分)
* @return json
*/
@@ -457,6 +457,10 @@ class BoysController extends AbstractAction
if (!$this->isAjax()) {
break;
}
+ $pageIndex = $this->post('pageIndex');
+ if($pageIndex>=3){
+ break;
+ }
$result=array(
'code'=>200,
--
libgit2 0.24.0