From 35b161cb844f75364da363bcbb4778a4c09cda6b Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Wed, 17 Apr 2019 10:36:00 +0800 Subject: [PATCH] =?UTF-8?q?feat[litemall-wx,=20litemall-wx-api]:=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/service/LitemallIssueService.java | 6 - .../litemall/wx/web/WxGoodsController.java | 2 +- .../litemall/wx/web/WxIssueController.java | 45 +++++++ litemall-wx/app.json | 3 +- litemall-wx/config/api.js | 1 + litemall-wx/pages/help/help.js | 120 ++++++++++++++++++ litemall-wx/pages/help/help.json | 3 + litemall-wx/pages/help/help.wxml | 20 +++ litemall-wx/pages/help/help.wxss | 70 ++++++++++ litemall-wx/pages/ucenter/index/index.js | 5 + litemall-wx/pages/ucenter/index/index.wxml | 20 ++- litemall-wx/project.config.json | 9 +- 12 files changed, 288 insertions(+), 16 deletions(-) create mode 100644 litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIssueController.java create mode 100644 litemall-wx/pages/help/help.js create mode 100644 litemall-wx/pages/help/help.json create mode 100644 litemall-wx/pages/help/help.wxml create mode 100644 litemall-wx/pages/help/help.wxss 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 6fc30155..440e06f3 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 @@ -16,12 +16,6 @@ public class LitemallIssueService { @Resource private LitemallIssueMapper issueMapper; - public List query() { - LitemallIssueExample example = new LitemallIssueExample(); - example.or().andDeletedEqualTo(false); - return issueMapper.selectByExample(example); - } - public void deleteById(Integer id) { issueMapper.logicalDeleteByPrimaryKey(id); } 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 a89af310..a595c2e3 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 @@ -105,7 +105,7 @@ public class WxGoodsController { Callable productListCallable = () -> productService.queryByGid(id); // 商品问题，这里是一些通用问题 - Callable issueCallable = () -> goodsIssueService.query(); + Callable issueCallable = () -> goodsIssueService.querySelective("", 1, 4, "", ""); // 商品品牌商 Callable brandCallable = ()->{ diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIssueController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIssueController.java new file mode 100644 index 00000000..18f579ca --- /dev/null +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxIssueController.java @@ -0,0 +1,45 @@ +package org.linlinjava.litemall.wx.web; + +import com.github.pagehelper.PageInfo; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.linlinjava.litemall.core.util.ResponseUtil; +import org.linlinjava.litemall.core.validator.Order; +import org.linlinjava.litemall.core.validator.Sort; +import org.linlinjava.litemall.db.domain.LitemallIssue; +import org.linlinjava.litemall.db.service.LitemallIssueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/wx/issue") +@Validated +public class WxIssueController { + private final Log logger = LogFactory.getLog(WxIssueController.class); + + @Autowired + private LitemallIssueService issueService; + + /** + * 帮助中心 + */ + @RequestMapping("/list") + public Object list(String question, + @RequestParam(defaultValue = "1") Integer page, + @RequestParam(defaultValue = "10") Integer size, + @Sort @RequestParam(defaultValue = "add_time") String sort, + @Order @RequestParam(defaultValue = "desc") String order) { + List issueList = issueService.querySelective(question, page, size, sort, order); + long total = PageInfo.of(issueList).getTotal(); + Map data = new HashMap(); + data.put("data", issueList); + data.put("count", total); + return ResponseUtil.ok(data); + } + +} diff --git a/litemall-wx/app.json b/litemall-wx/app.json index ca537f44..c014aab1 100644 --- a/litemall-wx/app.json +++ b/litemall-wx/app.json @@ -36,7 +36,8 @@ "pages/groupon/myGroupon/myGroupon", "pages/groupon/grouponDetail/grouponDetail", "pages/groupon/grouponList/grouponList", - "pages/coupon/coupon" + "pages/coupon/coupon", + "pages/help/help" ], "window": { "navigationBarBackgroundColor": "#FFFFFF", diff --git a/litemall-wx/config/api.js b/litemall-wx/config/api.js index 5cb86d6a..6d4700ba 100644 --- a/litemall-wx/config/api.js +++ b/litemall-wx/config/api.js @@ -96,5 +96,6 @@ module.exports = { StorageUpload: WxApiRoot + 'storage/upload', //图片上传, UserIndex: WxApiRoot + 'user/index', //个人页面用户相关信息 + IssueList: WxApiRoot + 'issue/list', //帮助信息 }; \ No newline at end of file diff --git a/litemall-wx/pages/help/help.js b/litemall-wx/pages/help/help.js new file mode 100644 index 00000000..ed8f16ce --- /dev/null +++ b/litemall-wx/pages/help/help.js @@ -0,0 +1,120 @@ +var util = require('../../utils/util.js'); +var api = require('../../config/api.js'); +var app = getApp() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + issueList: [], + page: 1, + size: 10, + count: 0, + showPage: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.getIssue(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + nextPage: function (event) { + var that = this; + if (this.data.page > that.data.count / that.data.size) { + return true; + } + + that.setData({ + page: that.data.page + 1 + }); + + this.getIssue(); + + }, + getIssue: function () { + + let that = this; + that.setData({ + showPage: false, + issueList: [] + }); + + util.request(api.IssueList, { + page: that.data.page, + size: that.data.size + }).then(function (res) { + if (res.errno === 0) { + + that.setData({ + issueList: res.data.data, + showPage: true, + count: res.data.count + }); + } + }); + + }, + prevPage: function (event) { + if (this.data.page <= 1) { + return false; + } + + var that = this; + that.setData({ + page: that.data.page - 1 + }); + this.getIssue(); + } +}) \ No newline at end of file diff --git a/litemall-wx/pages/help/help.json b/litemall-wx/pages/help/help.json new file mode 100644 index 00000000..b546013f --- /dev/null +++ b/litemall-wx/pages/help/help.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "帮助中心" +} \ No newline at end of file diff --git a/litemall-wx/pages/help/help.wxml b/litemall-wx/pages/help/help.wxml new file mode 100644 index 00000000..a2c604c5 --- /dev/null +++ b/litemall-wx/pages/help/help.wxml @@ -0,0 +1,20 @@ + + + + + + + {{item.question}} + + + {{item.answer}} + + + + + + 上一页 + 下一页 + + + \ No newline at end of file diff --git a/litemall-wx/pages/help/help.wxss b/litemall-wx/pages/help/help.wxss new file mode 100644 index 00000000..d49fc3e7 --- /dev/null +++ b/litemall-wx/pages/help/help.wxss @@ -0,0 +1,70 @@ +.common-problem { + width: 750rpx; + height: auto; + overflow: hidden; + padding: 0rpx 30rpx; + background: #fff; +} + +.item { + height: auto; + overflow: hidden; + padding-bottom: 25rpx; +} + +.question-box .spot { + float: left; + display: block; + height: 10rpx; + width: 10rpx; + background: #b4282d; + border-radius: 50%; + margin-top: 11rpx; +} + +.question-box .question { + float: left; + line-height: 30rpx; + padding-left: 8rpx; + display: block; + font-size: 26rpx; + padding-bottom: 15rpx; + color: #303030; + width: 680rpx; + +} + +.answer { + line-height: 36rpx; + padding-left: 16rpx; + font-size: 26rpx; + color: #787878; + display: block; + +} + + +.page{ + width: 750rpx; + height: 108rpx; + background: #fff; + margin-bottom: 20rpx; +} + +.page view{ + height: 108rpx; + width: 50%; + float: left; + font-size: 29rpx; + color: #333; + text-align: center; + line-height: 108rpx; +} + +.page .prev{ + border-right: 1px solid #D9D9D9; +} + +.page .disabled{ + color: #ccc; +} \ No newline at end of file diff --git a/litemall-wx/pages/ucenter/index/index.js b/litemall-wx/pages/ucenter/index/index.js index cd8f8111..8cbb4051 100644 --- a/litemall-wx/pages/ucenter/index/index.js +++ b/litemall-wx/pages/ucenter/index/index.js @@ -196,6 +196,11 @@ Page({ url: '/pages/about/about' }); }, + goHelp: function () { + wx.navigateTo({ + url: '/pages/help/help' + }); + }, exitLogin: function() { wx.showModal({ title: '', diff --git a/litemall-wx/pages/ucenter/index/index.wxml b/litemall-wx/pages/ucenter/index/index.wxml index 4fd9bdf5..f686bd86 100644 --- a/litemall-wx/pages/ucenter/index/index.wxml +++ b/litemall-wx/pages/ucenter/index/index.wxml @@ -35,6 +35,10 @@ 待评价 + + + 售后 + @@ -61,9 +65,10 @@ 我的拼团 - - - 售后 + + + + 地址管理 @@ -72,14 +77,15 @@ 必备工具 - - - 地址管理 - + + + + 帮助中心 + 意见反馈 diff --git a/litemall-wx/project.config.json b/litemall-wx/project.config.json index 368123e4..053d33e7 100644 --- a/litemall-wx/project.config.json +++ b/litemall-wx/project.config.json @@ -258,8 +258,15 @@ "name": "优惠券列表", "pathName": "pages/coupon/coupon", "query": "" + }, + { + "id": -1, + "name": "帮助中心", + "pathName": "pages/help/help", + "query": "", + "scene": null } ] } } -} +} \ No newline at end of file