diff --git a/doc/platform.md b/doc/platform.md index dc1adbde..f27e72be 100644 --- a/doc/platform.md +++ b/doc/platform.md @@ -1090,7 +1090,7 @@ public interface Storage { public class WxTopicController { @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { ... @@ -1144,7 +1144,7 @@ public interface Storage { public class WxTopicController { @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { ... diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallIssueService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallIssueService.java index 440e06f3..10cd6856 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallIssueService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallIssueService.java @@ -26,7 +26,7 @@ public class LitemallIssueService { issueMapper.insertSelective(issue); } - public List querySelective(String question, Integer page, Integer size, String sort, String order) { + public List querySelective(String question, Integer page, Integer limit, String sort, String order) { LitemallIssueExample example = new LitemallIssueExample(); LitemallIssueExample.Criteria criteria = example.createCriteria(); @@ -39,7 +39,7 @@ public class LitemallIssueService { example.setOrderByClause(sort + " " + order); } - PageHelper.startPage(page, size); + PageHelper.startPage(page, limit); return issueMapper.selectByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallKeywordService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallKeywordService.java index 696e3d40..d91437dd 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallKeywordService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallKeywordService.java @@ -28,11 +28,11 @@ public class LitemallKeywordService { return keywordsMapper.selectByExample(example); } - public List queryByKeyword(String keyword, Integer page, Integer size) { + public List queryByKeyword(String keyword, Integer page, Integer limit) { LitemallKeywordExample example = new LitemallKeywordExample(); example.setDistinct(true); example.or().andKeywordLike("%" + keyword + "%").andDeletedEqualTo(false); - PageHelper.startPage(page, size); + PageHelper.startPage(page, limit); return keywordsMapper.selectByExampleSelective(example, LitemallKeyword.Column.keyword); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java index 466de49f..44059941 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java @@ -69,7 +69,7 @@ public class LitemallOrderService { return orderSn; } - public List queryByOrderStatus(Integer userId, List orderStatus, Integer page, Integer size) { + public List queryByOrderStatus(Integer userId, List orderStatus, Integer page, Integer limit) { LitemallOrderExample example = new LitemallOrderExample(); example.setOrderByClause(LitemallOrder.Column.addTime.desc()); LitemallOrderExample.Criteria criteria = example.or(); @@ -78,11 +78,11 @@ public class LitemallOrderService { criteria.andOrderStatusIn(orderStatus); } criteria.andDeletedEqualTo(false); - PageHelper.startPage(page, size); + PageHelper.startPage(page, limit); return litemallOrderMapper.selectByExample(example); } - public List querySelective(Integer userId, String orderSn, List orderStatusArray, Integer page, Integer size, String sort, String order) { + public List querySelective(Integer userId, String orderSn, List orderStatusArray, Integer page, Integer limit, String sort, String order) { LitemallOrderExample example = new LitemallOrderExample(); LitemallOrderExample.Criteria criteria = example.createCriteria(); @@ -101,7 +101,7 @@ public class LitemallOrderService { example.setOrderByClause(sort + " " + order); } - PageHelper.startPage(page, size); + PageHelper.startPage(page, limit); return litemallOrderMapper.selectByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java index ede69ade..4eebfefc 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallRoleService.java @@ -37,7 +37,7 @@ public class LitemallRoleService { } - public List querySelective(String name, Integer page, Integer size, String sort, String order) { + public List querySelective(String name, Integer page, Integer limit, String sort, String order) { LitemallRoleExample example = new LitemallRoleExample(); LitemallRoleExample.Criteria criteria = example.createCriteria(); @@ -50,7 +50,7 @@ public class LitemallRoleService { example.setOrderByClause(sort + " " + order); } - PageHelper.startPage(page, size); + PageHelper.startPage(page, limit); return roleMapper.selectByExample(example); } diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java index a8dafd51..748c2282 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java @@ -127,18 +127,18 @@ public class WxOrderService { * 3,待收货; * 4,待评价。 * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 订单列表 */ - public Object list(Integer userId, Integer showType, Integer page, Integer size) { + public Object list(Integer userId, Integer showType, Integer page, Integer limit) { if (userId == null) { return ResponseUtil.unlogin(); } List orderStatus = OrderUtil.orderStatus(showType); - List orderList = orderService.queryByOrderStatus(userId, orderStatus, page, size); + List orderList = orderService.queryByOrderStatus(userId, orderStatus, page, limit); long count = PageInfo.of(orderList).getTotal(); - int totalPages = (int) Math.ceil((double) count / size); + int totalPages = (int) Math.ceil((double) count / limit); List> orderVoList = new ArrayList<>(orderList.size()); for (LitemallOrder order : orderList) { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java index b6f9c8b9..e86a1496 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxBrandController.java @@ -33,16 +33,16 @@ public class WxBrandController { * 品牌列表 * * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 品牌列表 */ @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { + @RequestParam(defaultValue = "10") Integer limit) { - List brandList = brandService.queryVO(page, size); + List brandList = brandService.queryVO(page, limit); int total = brandService.queryTotalCount(); - int totalPages = (int) Math.ceil((double) total / size); + int totalPages = (int) Math.ceil((double) total / limit); Map data = new HashMap(); data.put("brandList", brandList); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java index ae711c3e..71826abd 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java @@ -40,21 +40,21 @@ public class WxCollectController { * @param userId 用户ID * @param type 类型,如果是0则是商品收藏,如果是1则是专题收藏 * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 用户收藏列表 */ @GetMapping("list") public Object list(@LoginUser Integer userId, @NotNull Byte type, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { + @RequestParam(defaultValue = "10") Integer limit) { if (userId == null) { return ResponseUtil.unlogin(); } - List collectList = collectService.queryByType(userId, type, page, size); + List collectList = collectService.queryByType(userId, type, page, limit); int count = collectService.countByType(userId, type); - int totalPages = (int) Math.ceil((double) count / size); + int totalPages = (int) Math.ceil((double) count / limit); List collects = new ArrayList<>(collectList.size()); for (LitemallCollect collect : collectList) { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java index b371e469..3857f277 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java @@ -126,7 +126,7 @@ public class WxCommentController { * @param valueId 商品或专题ID。如果type是0,则是商品ID;如果type是1,则是专题ID。 * @param showType 显示类型。如果是0,则查询全部;如果是1,则查询有图片的评论。 * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 评论列表 */ @GetMapping("list") @@ -134,8 +134,8 @@ public class WxCommentController { @NotNull Integer valueId, @NotNull Integer showType, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { - List commentList = commentService.query(type, valueId, showType, page, size); + @RequestParam(defaultValue = "10") Integer limit) { + List commentList = commentService.query(type, valueId, showType, page, limit); long count = PageInfo.of(commentList).getTotal(); List> commentVoList = new ArrayList<>(commentList.size()); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java index 1963e904..2644f330 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCouponController.java @@ -51,18 +51,18 @@ public class WxCouponController { * 优惠券列表 * * @param page - * @param size + * @param limit * @param sort * @param order * @return */ @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { - List couponList = couponService.queryList(page, size, sort, order); + List couponList = couponService.queryList(page, limit, sort, order); int total = couponService.queryTotal(); Map data = new HashMap(); data.put("data", couponList); @@ -76,7 +76,7 @@ public class WxCouponController { * @param userId * @param status * @param page - * @param size + * @param limit * @param sort * @param order * @return @@ -85,14 +85,14 @@ public class WxCouponController { public Object mylist(@LoginUser Integer userId, @NotNull Short status, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { if (userId == null) { return ResponseUtil.unlogin(); } - List couponUserList = couponUserService.queryList(userId, null, status, page, size, sort, order); + List couponUserList = couponUserService.queryList(userId, null, status, page, limit, sort, order); List couponVoList = change(couponUserList); int total = couponService.queryTotal(); Map data = new HashMap(); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java index cc17b98d..22408574 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxFootprintController.java @@ -70,20 +70,20 @@ public class WxFootprintController { * 用户足迹列表 * * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 用户足迹列表 */ @GetMapping("list") public Object list(@LoginUser Integer userId, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { + @RequestParam(defaultValue = "10") Integer limit) { if (userId == null) { return ResponseUtil.unlogin(); } - List footprintList = footprintService.queryByAddTime(userId, page, size); + List footprintList = footprintService.queryByAddTime(userId, page, limit); long count = PageInfo.of(footprintList).getTotal(); - int totalPages = (int) Math.ceil((double) count / size); + int totalPages = (int) Math.ceil((double) count / limit); List footprintVoList = new ArrayList<>(footprintList.size()); for (LitemallFootprint footprint : footprintList) { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java index a595c2e3..f2fcbed7 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java @@ -237,7 +237,7 @@ public class WxGoodsController { * @param isHot 是否热买,可选 * @param userId 用户ID * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @param sort 排序方式,支持"add_time", "retail_price"或"name" * @param order 排序类型,顺序或者降序 * @return 根据条件搜素的商品详情 @@ -251,7 +251,7 @@ public class WxGoodsController { Boolean isHot, @LoginUser Integer userId, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort(accepts = {"add_time", "retail_price", "name"}) @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { @@ -265,7 +265,7 @@ public class WxGoodsController { } //查询列表数据 - List goodsList = goodsService.querySelective(categoryId, brandId, keyword, isHot, isNew, page, size, sort, order); + List goodsList = goodsService.querySelective(categoryId, brandId, keyword, isHot, isNew, page, limit, sort, order); // 查询商品所属类目列表。 List goodsCatIds = goodsService.getCatIds(brandId, keyword, isHot, isNew); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java index 351ce2f9..9f4524b0 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGrouponController.java @@ -59,15 +59,15 @@ public class WxGrouponController { * 团购规则列表 * * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 团购规则列表 */ @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { - List> topicList = grouponRulesService.queryList(page, size, sort, order); + List> topicList = grouponRulesService.queryList(page, limit, sort, order); long total = PageInfo.of(topicList).getTotal(); Map data = new HashMap(); data.put("data", topicList); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java index 98c46101..356b1c6a 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java @@ -27,15 +27,15 @@ public class WxOrderController { * @param userId 用户ID * @param showType 订单信息 * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 订单列表 */ @GetMapping("list") public Object list(@LoginUser Integer userId, @RequestParam(defaultValue = "0") Integer showType, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { - return wxOrderService.list(userId, showType, page, size); + @RequestParam(defaultValue = "10") Integer limit) { + return wxOrderService.list(userId, showType, page, limit); } /** diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java index 89f54ff6..92be3734 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java @@ -76,8 +76,8 @@ public class WxSearchController { @GetMapping("helper") public Object helper(@NotEmpty String keyword, @RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size) { - List keywordsList = keywordsService.queryByKeyword(keyword, page, size); + @RequestParam(defaultValue = "10") Integer limit) { + List keywordsList = keywordsService.queryByKeyword(keyword, page, limit); String[] keys = new String[keywordsList.size()]; int index = 0; for (LitemallKeyword key : keywordsList) { diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java index 5ee02b5a..2b4e2b70 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxTopicController.java @@ -40,15 +40,15 @@ public class WxTopicController { * 专题列表 * * @param page 分页页数 - * @param size 分页大小 + * @param limit 分页大小 * @return 专题列表 */ @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, - @RequestParam(defaultValue = "10") Integer size, + @RequestParam(defaultValue = "10") Integer limit, @Sort @RequestParam(defaultValue = "add_time") String sort, @Order @RequestParam(defaultValue = "desc") String order) { - List topicList = topicService.queryList(page, size, sort, order); + List topicList = topicService.queryList(page, limit, sort, order); int total = topicService.queryTotal(); Map data = new HashMap(); data.put("data", topicList); diff --git a/litemall-wx/pages/comment/comment.js b/litemall-wx/pages/comment/comment.js index 688eb4f2..4ab06a70 100644 --- a/litemall-wx/pages/comment/comment.js +++ b/litemall-wx/pages/comment/comment.js @@ -14,7 +14,7 @@ Page({ hasPicCount: 0, allPage: 1, picPage: 1, - size: 20 + limit: 20 }, getCommentCount: function() { let that = this; diff --git a/litemall-wx/pages/coupon/coupon.js b/litemall-wx/pages/coupon/coupon.js index 03dcff23..3cce7f20 100644 --- a/litemall-wx/pages/coupon/coupon.js +++ b/litemall-wx/pages/coupon/coupon.js @@ -7,7 +7,7 @@ Page({ data: { couponList: [], page: 1, - size: 10, + limit: 10, count: 0, scrollTop: 0, showPage: false @@ -86,7 +86,7 @@ Page({ util.request(api.CouponList, { page: that.data.page, - size: that.data.size + limit: that.data.limit }).then(function (res) { if (res.errno === 0) { @@ -124,7 +124,7 @@ Page({ }, nextPage: function (event) { var that = this; - if (this.data.page > that.data.count / that.data.size) { + if (this.data.page > that.data.count / that.data.limit) { return true; } diff --git a/litemall-wx/pages/coupon/coupon.wxml b/litemall-wx/pages/coupon/coupon.wxml index 58738b29..3bb12961 100644 --- a/litemall-wx/pages/coupon/coupon.wxml +++ b/litemall-wx/pages/coupon/coupon.wxml @@ -22,7 +22,7 @@ 上一页 - 下一页 + 下一页 \ No newline at end of file diff --git a/litemall-wx/pages/newGoods/newGoods.js b/litemall-wx/pages/newGoods/newGoods.js index 315d4dc4..9fb7d774 100644 --- a/litemall-wx/pages/newGoods/newGoods.js +++ b/litemall-wx/pages/newGoods/newGoods.js @@ -16,7 +16,7 @@ Page({ currentSort: 'add_time', currentSortOrder: 'desc', page: 1, - size: 100 + limit: 100 }, getGoodsList: function() { var that = this; diff --git a/litemall-wx/pages/search/search.js b/litemall-wx/pages/search/search.js index 88a4c61a..22fb863d 100644 --- a/litemall-wx/pages/search/search.js +++ b/litemall-wx/pages/search/search.js @@ -17,7 +17,7 @@ Page({ defaultKeyword: {}, hotKeyword: [], page: 1, - size: 20, + limit: 20, categoryId: 0 }, //事件处理函数 @@ -95,7 +95,7 @@ Page({ util.request(api.GoodsList, { keyword: that.data.keyword, page: that.data.page, - size: that.data.size, + limit: that.data.limit, sort: that.data.currentSort, order: that.data.currentSortOrder, categoryId: that.data.categoryId diff --git a/litemall-wx/pages/topic/topic.js b/litemall-wx/pages/topic/topic.js index d4797017..ed9c9872 100644 --- a/litemall-wx/pages/topic/topic.js +++ b/litemall-wx/pages/topic/topic.js @@ -5,7 +5,7 @@ Page({ data: { topicList: [], page: 1, - size: 10, + limit: 10, count: 0, scrollTop: 0, showPage: false @@ -28,7 +28,7 @@ Page({ }, nextPage: function(event) { var that = this; - if (this.data.page > that.data.count / that.data.size) { + if (this.data.page > that.data.count / that.data.limit) { return true; } @@ -57,7 +57,7 @@ Page({ util.request(api.TopicList, { page: that.data.page, - size: that.data.size + limit: that.data.limit }).then(function(res) { if (res.errno === 0) { diff --git a/renard-wx/pages/category/category.js b/renard-wx/pages/category/category.js index bf26877a..de2568b1 100644 --- a/renard-wx/pages/category/category.js +++ b/renard-wx/pages/category/category.js @@ -11,7 +11,7 @@ Page({ scrollTop: 0, scrollHeight: 0, page: 1, - size: 100 + limit: 100 }, onLoad: function(options) { @@ -103,7 +103,7 @@ Page({ util.request(api.GoodsList, { categoryId: that.data.currentCategory.id, page: that.data.page, - size: that.data.size + limit: that.data.limit }) .then(function(res) { that.setData({ diff --git a/renard-wx/pages/hotGoods/hotGoods.js b/renard-wx/pages/hotGoods/hotGoods.js index 1b10ce6a..80e02eec 100644 --- a/renard-wx/pages/hotGoods/hotGoods.js +++ b/renard-wx/pages/hotGoods/hotGoods.js @@ -16,7 +16,7 @@ Page({ currentSort: 'add_time', currentSortOrder: 'desc', page: 1, - size: 100 + limit: 100 }, getCategoryList: function() { var that = this; @@ -38,7 +38,7 @@ Page({ util.request(api.GoodsList, { isHot: true, page: that.data.page, - size: that.data.size, + limit: that.data.size, order: that.data.currentSortOrder, sort: that.data.currentSort, categoryId: that.data.categoryId