From 54bd8176422afd74af7271ca0d2dfe988af4a892 Mon Sep 17 00:00:00 2001 From: youc <357649470@qq.com> Date: Mon, 20 Aug 2018 13:03:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../litemall/wx/web/WxTopicController.java | 66 +++++++++++-------- litemall-wx/pages/topic/topic.wxss | 51 ++++++++++++++ litemall-wx/pages/topicDetail/topicDetail.js | 12 ++-- .../pages/topicDetail/topicDetail.wxml | 20 ++++++ .../pages/topicDetail/topicDetail.wxss | 54 ++++++++++++++- 5 files changed, 168 insertions(+), 35 deletions(-) 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 173427be..0449c475 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 @@ -1,6 +1,8 @@ package org.linlinjava.litemall.wx.web; +import org.linlinjava.litemall.db.domain.LitemallGoods; import org.linlinjava.litemall.db.domain.LitemallTopic; +import org.linlinjava.litemall.db.service.LitemallGoodsService; import org.linlinjava.litemall.db.service.LitemallTopicService; import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,6 +24,8 @@ import java.util.Map; public class WxTopicController { @Autowired private LitemallTopicService topicService; + @Autowired + private LitemallGoodsService goodsService; /** * 专题列表 @@ -28,17 +33,17 @@ public class WxTopicController { * @param page 分页页数 * @param size 分页大小 * @return 专题列表 - * 成功则 - * { - * errno: 0, - * errmsg: '成功', - * data: - * { - * data: xxx, - * count: xxx - * } - * } - * 失败则 { errno: XXX, errmsg: XXX } + * 成功则 + * { + * errno: 0, + * errmsg: '成功', + * data: + * { + * data: xxx, + * count: xxx + * } + * } + * 失败则 { errno: XXX, errmsg: XXX } */ @GetMapping("list") public Object list(@RequestParam(defaultValue = "1") Integer page, @@ -56,18 +61,27 @@ public class WxTopicController { * * @param id 专题ID * @return 专题详情 - * 成功则 - * { - * errno: 0, - * errmsg: '成功', - * data: xxx - * } - * 失败则 { errno: XXX, errmsg: XXX } + * 成功则 + * { + * errno: 0, + * errmsg: '成功', + * data: xxx + * } + * 失败则 { errno: XXX, errmsg: XXX } */ @GetMapping("detail") public Object detail(@NotNull Integer id) { + Map data = new HashMap<>(); LitemallTopic topic = topicService.findById(id); - return ResponseUtil.ok(topic); + data.put("topic", topic); + List goods = new ArrayList<>(); + for (Integer i : topic.getGoods()) { + LitemallGoods good = goodsService.findByIdVO(i); + if (null != good) + goods.add(good); + } + data.put("goods", goods); + return ResponseUtil.ok(data); } /** @@ -75,13 +89,13 @@ public class WxTopicController { * * @param id 专题ID * @return 相关专题 - * 成功则 - * { - * errno: 0, - * errmsg: '成功', - * data: xxx - * } - * 失败则 { errno: XXX, errmsg: XXX } + * 成功则 + * { + * errno: 0, + * errmsg: '成功', + * data: xxx + * } + * 失败则 { errno: XXX, errmsg: XXX } */ @GetMapping("related") public Object related(@NotNull Integer id) { diff --git a/litemall-wx/pages/topic/topic.wxss b/litemall-wx/pages/topic/topic.wxss index 00f4debe..e40ee140 100644 --- a/litemall-wx/pages/topic/topic.wxss +++ b/litemall-wx/pages/topic/topic.wxss @@ -91,4 +91,55 @@ page ,.container{ .page .disabled{ color: #ccc; +} +.b .item { + border-top: 1px solid #d9d9d9; + margin: 0 20rpx; + height: 244rpx; + width: 710rpx; +} +.b .img { + margin-top: 12rpx; + margin-right: 12rpx; + float: left; + width: 220rpx; + height: 220rpx; +} +.b .right { + float: left; + height: 244rpx; + width: 476rpx; + display: flex; + flex-flow: row nowrap; +} +.b .text { + display: flex; + flex-wrap: nowrap; + flex-direction: column; + justify-content: center; + overflow: hidden; + height: 244rpx; + width: 476rpx; +} + .b .name { + float: left; + width: 330rpx; + display: block; + color: #333; + line-height: 50rpx; + font-size: 30rpx; +} +.b .desc { + width: 476rpx; + display: block; + color: #999; + line-height: 50rpx; + font-size: 25rpx; +} +.b .price { + width: 476rpx; + display: flex; + color: #b4282d; + line-height: 50rpx; + font-size: 33rpx; } \ No newline at end of file diff --git a/litemall-wx/pages/topicDetail/topicDetail.js b/litemall-wx/pages/topicDetail/topicDetail.js index a5a1d1a9..096a7b42 100644 --- a/litemall-wx/pages/topicDetail/topicDetail.js +++ b/litemall-wx/pages/topicDetail/topicDetail.js @@ -9,7 +9,8 @@ Page({ topic: {}, topicList: [], commentCount: 0, - commentList: [] + commentList: [], + topicGoods: [] }, onLoad: function (options) { // 页面初始化 options为页面跳转所带来的参数 @@ -20,12 +21,12 @@ Page({ util.request(api.TopicDetail, { id: that.data.id }).then(function (res) { if (res.errno === 0) { - that.setData({ - topic: res.data, + topic: res.data.topic, + topicGoods: res.data.goods }); - WxParse.wxParse('topicDetail', 'html', res.data.content, that); + WxParse.wxParse('topicDetail', 'html', res.data.topic.content, that); } }); @@ -41,9 +42,8 @@ Page({ let that = this; util.request(api.CommentList, { valueId: that.data.id, type: 1, showType: 0, page: 1, size: 5 }).then(function (res) { if (res.errno === 0) { - that.setData({ - commentList: res.data.data, + commentList: res.data, commentCount: res.data.count }); } diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxml b/litemall-wx/pages/topicDetail/topicDetail.wxml index da0123b6..501ffc3c 100644 --- a/litemall-wx/pages/topicDetail/topicDetail.wxml +++ b/litemall-wx/pages/topicDetail/topicDetail.wxml @@ -3,8 +3,28 @@