diff --git a/models/topic.js b/models/topic.js index 87e6835..1558065 100644 --- a/models/topic.js +++ b/models/topic.js @@ -31,13 +31,14 @@ class TopicModel extends HTTP { } // 新建议题 - topicAddGroup(){ + topicAddGroup(title, content,images,success){ let params = { - url: TopicBaseUrl.topic_list_url, + url: TopicBaseUrl.topic_addGroup_url, method: Method.POST, data: { - page: page, - pageSize: 10, + title: title, + content: content, + images: images, }, success: success } diff --git a/models/user.js b/models/user.js index a11bfba..a838d69 100644 --- a/models/user.js +++ b/models/user.js @@ -1,6 +1,7 @@ import { HTTP, Method} from '../utils/http.js' const UserConst = { user_info: '', // 个人信息 + user_unMessage_url:'/api/message/page', // 我的消息未读 user_myMessage_url:'/api/message/page', // 我的消息 user_myFavorite_url: '/api/collect/collectionList', // 我的收藏 user_goldenList_url: '/api/comment/goldenList', // 我的金点子 @@ -26,9 +27,10 @@ class UserModel extends HTTP { getMyMessageTotal(success) { let params = { - url: UserConst.user_myTopics_url, + url: UserConst.user_unMessage_url, method: Method.POST, data:{ + messageStatus:0, page:1, pageSize:10, }, diff --git a/pages/topics/goodIdea/cell/index.js b/pages/topics/goodIdea/cell/index.js index 5145172..bb4d002 100644 --- a/pages/topics/goodIdea/cell/index.js +++ b/pages/topics/goodIdea/cell/index.js @@ -29,12 +29,13 @@ Component({ }, onClickPraise(e) { const sIndex = e.currentTarget.dataset.index - // var selectItem = e.currentTarget.dataset.item + var selectItem = e.currentTarget.dataset.item + console.log(selectItem) // var isPraise = "itemData.isPraise" // this.setData({ // [isPraise]:!isPraise // }) - + console.log('啦啦啦') this.triggerEvent('tapGoodIdeaPraise', {index:sIndex}) // const commentList = this.data.commentList // const tempList = [] @@ -47,8 +48,21 @@ Component({ // this.setData({ // commentList: tempList, // }) - // this.fetchGoodIdeaPraise(selectItem.id) + this.fetchGoodIdeaPraise(selectItem.groupId) // 评论点赞 - } + }, + + fetchGoodIdeaPraise(id) { + topicModel.topicCommentPraise(id, res => { + console.log(res) + if (res.code === 200) { + wx.showToast({ + title: res.message, + icon: 'none' + }) + // this.fetchDetailComment() + } + }) + }, } }) diff --git a/pages/topics/index.js b/pages/topics/index.js index 5baebfb..302060a 100644 --- a/pages/topics/index.js +++ b/pages/topics/index.js @@ -23,10 +23,10 @@ Page({ /** * 生命周期函数--监听页面加载 */ + onLoad: function () { if (!store.hasPhone()) { console.log('已经绑定手机号码') - this.fetchTopicList(); } else { console.log('未绑定手机号码') wx.redirectTo({ @@ -34,6 +34,11 @@ Page({ }) } }, + onShow: function () { + // 页面出现在前台时执行 + console.log('啦啦啦') + this.fetchTopicList(); + }, fetchTopicList() { let page = this.data.currPage topicModel.getTopicList(page, res => { @@ -133,33 +138,6 @@ Page({ wx.stopPullDownRefresh() }) }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - /** * 页面相关事件处理函数--监听用户下拉动作 */ @@ -191,13 +169,6 @@ Page({ } }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - }, - // 定义点击标题的事件处理函数，将选中标题的id赋值给selectedTitle tapSegment: function (e) { console.log(e) @@ -214,10 +185,5 @@ Page({ case 1: return this.fetchGoodIdeaList() } - }, - - // tapGoodIdeaPraise(e){ - // console.log('华加快速度') - // console.log(e) - // } + } }) \ No newline at end of file diff --git a/pages/topics/interactive/submitTopic/index.js b/pages/topics/interactive/submitTopic/index.js index 14c1c2c..8877645 100644 --- a/pages/topics/interactive/submitTopic/index.js +++ b/pages/topics/interactive/submitTopic/index.js @@ -1,12 +1,17 @@ // pages/topics/interactive/submitTopic/index.js +import { config } from '../../../../config.js' +import { store } from '../../../../utils/store.js' +import { TopicModel } from '../../../../models/topic.js' +let topicModel = new TopicModel() + Page({ /** * 页面的初始数据 */ data: { - topicTitle:String, - topicDetail:String, + topicTitle:"", + topicDetail:"", files:[] }, @@ -15,50 +20,8 @@ Page({ */ onLoad: function (options) { this.setData({ - selectFile: this.selectFile.bind(this), uplaodFile: this.uplaodFile.bind(this) }) - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - }, bindTextInput(e){ this.setData({ @@ -70,74 +33,78 @@ Page({ topicDetail: e.detail.value }) }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - }, - upload: function (e) { - console.log(e) - var that = this; - wx.chooseImage({ - sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - success: function (res) { - // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 - that.setData({ - files: that.data.files.concat(res.tempFilePaths) - }); - } - }) - }, - chooseImage: function (e) { - console.log('啦啦啦') - // console.log(e) - // var that = this; - // wx.chooseImage({ - // sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有 - // sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有 - // success: function (res) { - // console.log('啦啦啦') - // // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片 - // that.setData({ - // files: res.tempFilePaths - // }); - // } - // }) - }, - // previewImage: function (e) { - // console.log(e) - // wx.previewImage({ - // current: e.currentTarget.id, // 当前显示图片的http链接 - // urls: this.data.files // 需要预览的图片http链接列表 - // }) - // }, - uploadError(e) { - console.log('upload error', e.detail) - }, - uploadSuccess(e) { - console.log('upload success', e.detail) - }, - selectFile(files) { - console.log('files', files) - // 返回false可以阻止某次文件上传 - }, uplaodFile(files) { console.log('upload files', files) // 文件上传的函数，返回一个promise + const token = store.readToken() + console.log(token) return new Promise((resolve, reject) => { - setTimeout(() => { - reject('some error') - }, 1000) + files.tempFilePaths.forEach(item=>{ + wx.uploadFile({ + url: config.api_url + "/api/common/upload", + filePath: item, + header: { + 'token': token, + 'content-type': 'application/json', + }, + name: 'files', + success: (res)=> { + console.log(res); + const data = JSON.parse(res.data) + const image = { + url: config.api_url + '/' + data.result.imgUrl, + } + this.setData({ + files: [...this.data.files, image] + }) + resolve(this.data.files) + } + }) + }) }) }, - deleteFile(e){ - console.log(e.detai) - }, submit(){ - console.log(this.data.topicTitle,this.data.topicDetail) - console.log(this.data.files) + if (this.data.topicTitle === ""){ + wx.showToast({ + title: '请输入议题标题', + icon: 'none' + }) + return + } + // if (this.data.topicDetail === "") { + // wx.showToast({ + // title: '请输入议题内容', + // icon: 'none' + // }) + // return + // } + const tempImages = [] + this.data.files.forEach(item=>{ + tempImages.push(item.url) + }) + + let title = this.data.topicTitle + let content = this.data.topicDetail + let images = '' + if (this.data.files.length > 0) { + images = tempImages.join('') + } + topicModel.topicAddGroup(title,content,images,res=>{ + console.log(res) + wx.showToast({ + title: res.message, + icon: 'none', + duration:2000, + success(res){ + setTimeout(function () { + wx.navigateBack({ + delta: 1 + }) + }, 2000) + } + }) + }) } }) diff --git a/pages/topics/interactive/submitTopic/index.wxml b/pages/topics/interactive/submitTopic/index.wxml index 1d9011e..1e0897f 100644 --- a/pages/topics/interactive/submitTopic/index.wxml +++ b/pages/topics/interactive/submitTopic/index.wxml @@ -5,7 +5,7 @@