From 293510ccb373a4ec73443835a3bb3dd848a96f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= Date: Fri, 24 Sep 2021 14:30:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E3=80=81=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E3=80=81=E7=82=B9=E8=B5=9E=E5=AE=8C=E6=88=90=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/main.wxss | 41 +++- packagecard/cardList/cardList.wxml | 8 +- packagecard/marketing/marketingposter.js | 5 +- packagecard/marketing/marketingposter.wxml | 6 +- .../moments/momentsdetail/momentsdetail.js | 11 +- .../moments/momentsdetail/momentsdetail.wxml | 19 +- .../moments/momentsdetail/momentsdetail.wxss | 2 +- packagecard/moments/showlist/showlist.js | 145 ++++++++++++++ packagecard/moments/showlist/showlist.wxml | 52 ++++- packagecard/moments/showlist/showlist.wxss | 2 + pages/index/index.js | 3 + pages/index/index.wxml | 7 +- pages/index/index.wxss | 39 ---- pages/mine/otherCard/othercarddetail.js | 184 ++++++++++++++++-- pages/mine/otherCard/othercarddetail.wxml | 83 ++++---- pages/mine/otherCard/othercarddetail.wxss | 34 ---- 16 files changed, 488 insertions(+), 153 deletions(-) diff --git a/class/main.wxss b/class/main.wxss index 659ff87..2043711 100644 --- a/class/main.wxss +++ b/class/main.wxss @@ -4326,6 +4326,7 @@ l .text-depblack { padding: 15rpx; min-height: 1000rpx; margin-bottom: 100rpx; + margin-top: 15rpx; } .comment-list-title { @@ -4464,6 +4465,44 @@ l .text-depblack { margin-left: 15rpx; } +.func-items { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + padding: 15rpx; + } + + .func-item { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + flex: 1; + color: #000; + width: 23%; + border-right: 1rpx solid #f8f8f8; + } + + .func-item:last-child { + border-right: 0rpx; + } + + .func-item:active { + background-color: #f3f3f3; + color: #dfdfdf; + } + + .func-item image { + width: 48rpx; + height: 48rpx; + } + + .func-item text { + margin-left: 10rpx; + text-align: center; + } .tab { position: fixed; display: flex; @@ -4647,7 +4686,7 @@ l .text-depblack { } .line-gray-ssm { - background-color: rgb(243, 243, 243); + background-color: #f8f8f8; height: 2rpx; width: 95%; align-self: center; diff --git a/packagecard/cardList/cardList.wxml b/packagecard/cardList/cardList.wxml index 986da7c..25bcca5 100644 --- a/packagecard/cardList/cardList.wxml +++ b/packagecard/cardList/cardList.wxml @@ -11,9 +11,11 @@ - + + + diff --git a/packagecard/marketing/marketingposter.js b/packagecard/marketing/marketingposter.js index 959c61f..83fd6e5 100644 --- a/packagecard/marketing/marketingposter.js +++ b/packagecard/marketing/marketingposter.js @@ -27,7 +27,8 @@ Page({ curTypeId: '', isShowOptions: false, //是否显示选项 curItemIndex: -1, //点击分享按钮弹出的 - curTypeName: '全部' + curTypeName: '全部', + contentHeight: app.globalData.windowHeight }, /** @@ -95,7 +96,7 @@ Page({ _self.setData({ currentTypeIndex: idx, curTypeId: id, - curTypeName:name , + curTypeName: name, posterHistoryList: [], posterTempleteList: [], isShowOptions: false diff --git a/packagecard/marketing/marketingposter.wxml b/packagecard/marketing/marketingposter.wxml index bd0bc7a..4a45673 100644 --- a/packagecard/marketing/marketingposter.wxml +++ b/packagecard/marketing/marketingposter.wxml @@ -29,9 +29,10 @@ - + @@ -63,9 +64,10 @@ - + diff --git a/packagecard/moments/momentsdetail/momentsdetail.js b/packagecard/moments/momentsdetail/momentsdetail.js index c71e83f..92a9fe8 100644 --- a/packagecard/moments/momentsdetail/momentsdetail.js +++ b/packagecard/moments/momentsdetail/momentsdetail.js @@ -40,6 +40,7 @@ Page({ likeStatus: false, //点赞 collectStatus: false, //收藏, restoreLikeStatus: false, //评论点赞 + contentHeight: app.globalData.windowHeight }, onLoad(options) { var _self = this @@ -53,7 +54,6 @@ Page({ shareSwitch: options.shareSwitch, //转发的开关 }) var isShow = options.collectSwitch == '3' || options.collectSwitch == '4' || options.likeSwitch == '3' && options.likeSwitch == '4' || options.shareSwitch == '3' || options.shareSwitch == '4' || options.commentSwitch == '3' || options.commentSwitch == '4' - console.log(isShow) if (isShow) { _self.setData({ isShowCommentInput: true @@ -160,7 +160,14 @@ Page({ data.list.forEach(it => { switch (it.dataType) { case '2': //图片 - var items = it.value.split(',') + var photoIds = it.value.split('@') + if (photoIds.length > 1) { + //展示方式 + it.dataMode = photoIds[1] + } else { + it.dataMode = '1' + } + var items = photoIds[0].split(',') var tempList = [] items.forEach(item => { if (item.length > 0) { diff --git a/packagecard/moments/momentsdetail/momentsdetail.wxml b/packagecard/moments/momentsdetail/momentsdetail.wxml index 0e50d12..9953410 100644 --- a/packagecard/moments/momentsdetail/momentsdetail.wxml +++ b/packagecard/moments/momentsdetail/momentsdetail.wxml @@ -1,7 +1,7 @@ 详情 - + @@ -31,9 +31,8 @@ - - + + @@ -41,10 +40,9 @@ - + + autoplay="{{child.dataMode=='3'}}"> @@ -56,8 +54,7 @@ - + @@ -191,7 +188,7 @@ - + 评论{{commentCount}} @@ -275,7 +272,7 @@ - 发布 diff --git a/packagecard/moments/momentsdetail/momentsdetail.wxss b/packagecard/moments/momentsdetail/momentsdetail.wxss index 14de068..8945afb 100644 --- a/packagecard/moments/momentsdetail/momentsdetail.wxss +++ b/packagecard/moments/momentsdetail/momentsdetail.wxss @@ -395,7 +395,7 @@ } .top-box { - padding: 15rpx 15rpx 20rpx 15rpx; + width: 100%; } .good { diff --git a/packagecard/moments/showlist/showlist.js b/packagecard/moments/showlist/showlist.js index fb96713..e09904f 100644 --- a/packagecard/moments/showlist/showlist.js +++ b/packagecard/moments/showlist/showlist.js @@ -91,7 +91,26 @@ Page({ }, buildMainData(datas) { var _self = this + var ids = '' datas.forEach(it => { + var options = _self.data.tabList[_self.data.currentIndex] + var isOpen = options.configColumnCollect == '2' || options.configColumnCollect == '4' || options.configColumnLike == '2' && options.configColumnLike == '4' || options.configColumnDispatch == '2' || options.configColumnDispatch == '4' || options.configColumnComment == '2' || options.configColumnComment == '4' + + it.cId = _self.data.tabList[_self.data.currentIndex].configColumnId + it.collectSwitch = _self.data.tabList[_self.data.currentIndex].configColumnCollect //收藏开关 + it.commentSwitch = _self.data.tabList[_self.data.currentIndex].configColumnComment //评论开关 + it.shareSwitch = _self.data.tabList[_self.data.currentIndex].configColumnDispatch //转发开关 + it.likeSwitch = _self.data.tabList[_self.data.currentIndex].configColumnLike //点赞开关 + it.funcSwitch = isOpen + ids += it.uid + ',' + // 初始化评论 点赞 收藏状态 + it.collectCount = 0 + it.collectStatus = false + it.commentCount = 0 + it.dispatchCount = 0 + it.likeCount = 0 + it.likeStatus = false + it.scansCount = 0 it.list.forEach(iem => { switch (iem.dataType) { case '2': //图片 @@ -200,6 +219,44 @@ Page({ _self.setData({ dataList: datas }) + _self.getColumnContentHandle(ids) + }, + //获取栏目内容点赞 收藏 评论 + getColumnContentHandle(ids) { + var _self = this + wx.showLoading({ + title: '加载中...', + }) + app.http.get(app.urls.getColumnContentHandle.format({ + projectId: 'column', + businessIds: ids + }), { + header: { + token: app.globalData.token + } + }) + .then(res => { + wx.hideLoading({}) + res.data.forEach(it => { + _self.data.dataList.forEach(item => { + if (item.uid == it.businessId) { + item.collectCount = it.collectCount + item.collectStatus = it.collectStatus + item.commentCount = it.commentCount + item.dispatchCount = it.dispatchCount + item.likeCount = it.likeCount + item.likeStatus = it.likeStatus + item.scansCount = it.scansCount + } + }) + }) + _self.setData({ + dataList: _self.data.dataList + }) + }) + .catch(err => { + + }) }, //预览图片 viewImg(e) { @@ -361,14 +418,102 @@ Page({ innerAudioContext.stop() } }, + // 显示详情 showDetail(e) { if (this.data.currentTab.configColumnType.indexOf('dda5007c-5fb7-48f2-8537-3cb8ea298242') != -1) { //需要跳详情 var cId = this.data.currentTab.configColumnId var uId = e.currentTarget.dataset.uid + console.log(e) wx.navigateTo({ url: '/packagecard/moments/momentsdetail/momentsdetail?uId=' + uId + '&cId=' + cId, }) } + }, + //显示评论 + showComment(e) { + //需要跳详情 + var cId = e.currentTarget.dataset.cid + var uId = e.currentTarget.dataset.uid + var like = e.currentTarget.dataset.like + var collect = e.currentTarget.dataset.collect + var comment = e.currentTarget.dataset.comment + var share = e.currentTarget.dataset.share + var params = '&collectSwitch=' + collect + '&likeSwitch=' + like + '&commentSwitch=' + comment + '&shareSwitch=' + share + console.log(params) + wx.navigateTo({ + url: '/packagecard/moments/momentsdetail/momentsdetail?uId=' + uId + '&cId=' + cId + params, + }) + }, + //点赞 + doLike(e) { + var _self = this + var item = e.currentTarget.dataset.item + var index = e.currentTarget.dataset.index //栏目索引 + var favor = item.likeStatus + var msg = '' + if (favor) { + msg = '取消中...' + } else { + msg = '保存中...' + } + wx.showLoading({ + title: msg, + }) + app.http.post(app.urls.doSaveLike, { + header: { + token: app.globalData.token + }, + data: { + businessId: item.uid, + projectId: 'column' + } + }) + .then(res => { + wx.hideLoading({}) + _self.data.dataList[index].likeStatus = !item.likeStatus + if (item.likeStatus) { + --_self.data.dataList[index].likeCount + } else { + ++_self.data.dataList[index].likeCount + } + _self.setData({ + dataList: _self.data.dataList + }) + }) + .catch(err => {}) + }, + //收藏 + doCollect(e) { + var _self = this + var item = e.currentTarget.dataset.item + var index = e.currentTarget.dataset.index //栏目索引 + var favor = item.collectStatus + var msg = '' + if (favor) { + msg = '取消收藏...' + } else { + msg = '收藏中...' + } + wx.showLoading({ + title: msg, + }) + app.http.post(app.urls.doSaveCollect, { + header: { + token: app.globalData.token + }, + data: { + businessId: item.uid, + projectId: 'column' + } + }) + .then(res => { + wx.hideLoading({}) + _self.data.dataList[index].collectStatus = !item.collectStatus + _self.setData({ + dataList: _self.data.dataList + }) + }) + .catch(err => {}) } }) \ No newline at end of file diff --git a/packagecard/moments/showlist/showlist.wxml b/packagecard/moments/showlist/showlist.wxml index caa1e51..eb28a40 100644 --- a/packagecard/moments/showlist/showlist.wxml +++ b/packagecard/moments/showlist/showlist.wxml @@ -23,7 +23,10 @@ + data-like="{{item.likeSwitch}}" data-share="{{item.shareSwitch}}" + data-collect="{{item.collectSwitch}}" data-comment="{{item.commentSwitch}}" + data-ctype="{{item.type}}" data-ctype="{{item.type}}" data-cid="{{item.cId}}" + data-id="{{it.uid}}"> @@ -59,11 +62,15 @@ - + @@ -220,6 +227,45 @@ + + + + + + + + + + + 收藏 + + + + + {{item.commentCount>1000 ? + '1000+':item.commentCount}} + + + + + {{item.likeCount>1000? '1000+':item.likeCount}} + + + diff --git a/packagecard/moments/showlist/showlist.wxss b/packagecard/moments/showlist/showlist.wxss index 89afa6d..f2421a0 100644 --- a/packagecard/moments/showlist/showlist.wxss +++ b/packagecard/moments/showlist/showlist.wxss @@ -156,6 +156,7 @@ letter-spacing: 2rpx; position: relative; } + .column-item { margin: 0rpx; padding: 7.5rpx 15rpx 7.5rpx 15rpx; @@ -181,6 +182,7 @@ .img-item:last-child { padding: 7.5rpx 0rpx 7.5rpx 0rpx; } + .movie-box { display: flex; width: 100%; diff --git a/pages/index/index.js b/pages/index/index.js index 710027c..60c4fef 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -249,7 +249,10 @@ Page({ }) .then(res => { if (res.data.length > 0) { + var options = datas[_self.data.curIndex] + var isOpen = options.configColumnCollect == '2' || options.configColumnCollect == '4' || options.configColumnLike == '2' && options.configColumnLike == '4' || options.configColumnDispatch == '2' || options.configColumnDispatch == '4' || options.configColumnComment == '2' || options.configColumnComment == '4' var tempItem = { + funcSwitch: isOpen, collectSwitch: datas[_self.data.curIndex].configColumnCollect, //收藏开关 commentSwitch: datas[_self.data.curIndex].configColumnComment, //评论开关 shareSwitch: datas[_self.data.curIndex].configColumnDispatch, //转发开关 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index eac92de..dc73eba 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -156,13 +156,14 @@ - + @@ -311,7 +312,7 @@ - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index c0c73b7..f44751c 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -745,42 +745,3 @@ align-items: center; margin-top: 10rpx; } - -.func-items { - width: 100%; - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - padding: 15rpx; -} - -.func-item { - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - flex: 1; - color: #000; - width: 23%; - border-right: 1rpx solid #f0f0f0; -} - -.func-item:last-child { - border-right: 0rpx; -} - -.func-item:active { - background-color: #f3f3f3; - color: #dfdfdf; -} - -.func-item image { - width: 48rpx; - height: 48rpx; -} - -.func-item text { - margin-left: 10rpx; - text-align: center; -} \ No newline at end of file diff --git a/pages/mine/otherCard/othercarddetail.js b/pages/mine/otherCard/othercarddetail.js index c4df805..50e557f 100644 --- a/pages/mine/otherCard/othercarddetail.js +++ b/pages/mine/otherCard/othercarddetail.js @@ -118,7 +118,6 @@ Page({ }, //获取首页展示的栏目 getMainColumn(id) { - console.log(id) var _self = this _self.setData({ dataList: [] @@ -158,7 +157,10 @@ Page({ }) .then(res => { if (res.data.length > 0) { + var options = datas[_self.data.curIndex] + var isOpen = options.configColumnCollect == '2' || options.configColumnCollect == '4' || options.configColumnLike == '2' && options.configColumnLike == '4' || options.configColumnDispatch == '2' || options.configColumnDispatch == '4' || options.configColumnComment == '2' || options.configColumnComment == '4' var tempItem = { + funcSwitch: isOpen, collectSwitch: datas[_self.data.curIndex].configColumnCollect, //收藏开关 commentSwitch: datas[_self.data.curIndex].configColumnComment, //评论开关 shareSwitch: datas[_self.data.curIndex].configColumnDispatch, //转发开关 @@ -194,28 +196,40 @@ Page({ //构建主页显示数据 buildMainData() { var _self = this + var ids = '' _self.data.dataList.forEach(it => { it.list.forEach(item => { + ids += item.uid + ',' + // 初始化评论 点赞 收藏状态 + item.collectCount = 0 + item.collectStatus = false + item.commentCount = 0 + item.dispatchCount = 0 + item.likeCount = 0 + item.likeStatus = false + item.scansCount = 0 item.list.forEach(iem => { switch (iem.dataType) { case '2': //图片 - var photoIds = iem.value.split('@') - if (photoIds.length > 1) { - //展示方式 - iem.dataMode = photoIds[1] - } else { - iem.dataMode = '1' - } - var items = photoIds[0].split(',') - var tempList = [] - items.forEach(item => { - var tempItem = { - id: item, - path: app.urls.baseImgUrl + item, + if (iem.value.length > 0) { + var photoIds = iem.value.split('@') + if (photoIds.length > 1) { + //展示方式 + iem.dataMode = photoIds[1] + } else { + iem.dataMode = '1' } - tempList.push(tempItem) - }) - iem.valueList = tempList + var items = photoIds[0].split(',') + var tempList = [] + items.forEach(item => { + var tempItem = { + id: item, + path: app.urls.baseImgUrl + item, + } + tempList.push(tempItem) + }) + iem.valueList = tempList + } break case '3': //音频 var items = iem.value.split(',') @@ -304,6 +318,47 @@ Page({ curIndex: 0, dataList: _self.data.dataList }) + _self.getColumnContentHandle(ids) + }, + //获取栏目内容点赞 收藏 评论 + getColumnContentHandle(ids) { + var _self = this + wx.showLoading({ + title: '加载中...', + }) + app.http.get(app.urls.getColumnContentHandle.format({ + projectId: 'column', + businessIds: ids + }), { + header: { + token: app.globalData.token + } + }) + .then(res => { + wx.hideLoading({}) + res.data.forEach(it => { + _self.data.dataList.forEach(item => { + item.list.forEach(iem => { + if (iem.uid == it.businessId) { + iem.collectCount = it.collectCount + iem.collectStatus = it.collectStatus + iem.commentCount = it.commentCount + iem.dispatchCount = it.dispatchCount + iem.likeCount = it.likeCount + iem.likeStatus = it.likeStatus + iem.scansCount = it.scansCount + } + }) + }) + }) + _self.setData({ + curIndex: 0, + dataList: _self.data.dataList + }) + }) + .catch(err => { + + }) }, //获取首页基础数据 电话 微信号 地址 邮箱 getMainBaseUserInfo(userid) { @@ -377,8 +432,13 @@ Page({ //需要跳详情 var cId = e.currentTarget.dataset.cid var uId = e.currentTarget.dataset.id + var like = e.currentTarget.dataset.like + var collect = e.currentTarget.dataset.collect + var comment = e.currentTarget.dataset.comment + var share = e.currentTarget.dataset.share + var params = '&collectSwitch=' + collect + '&likeSwitch=' + like + '&commentSwitch=' + comment + '&shareSwitch=' + share wx.navigateTo({ - url: '/packagecard/moments/momentsdetail/momentsdetail?uId=' + uId + '&cId=' + cId, + url: '/packagecard/moments/momentsdetail/momentsdetail?uId=' + uId + '&cId=' + cId + params, }) } }, @@ -714,4 +774,92 @@ Page({ }) } }, + //显示评论 + showComment(e) { + //需要跳详情 + var cId = e.currentTarget.dataset.cid + var uId = e.currentTarget.dataset.uid + var like = e.currentTarget.dataset.like + var collect = e.currentTarget.dataset.collect + var comment = e.currentTarget.dataset.comment + var share = e.currentTarget.dataset.share + var params = '&collectSwitch=' + collect + '&likeSwitch=' + like + '&commentSwitch=' + comment + '&shareSwitch=' + share + console.log(params) + wx.navigateTo({ + url: '/packagecard/moments/momentsdetail/momentsdetail?uId=' + uId + '&cId=' + cId + params, + }) + }, + //点赞 + doLike(e) { + var _self = this + var item = e.currentTarget.dataset.item + var idx = e.currentTarget.dataset.idx //内容索引 + var index = e.currentTarget.dataset.index //栏目索引 + var favor = item.likeStatus + var msg = '' + if (favor) { + msg = '取消中...' + } else { + msg = '保存中...' + } + wx.showLoading({ + title: msg, + }) + app.http.post(app.urls.doSaveLike, { + header: { + token: app.globalData.token + }, + data: { + businessId: item.uid, + projectId: 'column' + } + }) + .then(res => { + wx.hideLoading({}) + _self.data.dataList[index].list[idx].likeStatus = !item.likeStatus + if (item.likeStatus) { + --_self.data.dataList[index].list[idx].likeCount + } else { + ++_self.data.dataList[index].list[idx].likeCount + } + _self.setData({ + dataList: _self.data.dataList + }) + }) + .catch(err => {}) + }, + //收藏 + doCollect(e) { + var _self = this + var item = e.currentTarget.dataset.item + var idx = e.currentTarget.dataset.idx //内容索引 + var index = e.currentTarget.dataset.index //栏目索引 + var favor = item.collectStatus + var msg = '' + if (favor) { + msg = '取消收藏...' + } else { + msg = '收藏中...' + } + wx.showLoading({ + title: msg, + }) + app.http.post(app.urls.doSaveCollect, { + header: { + token: app.globalData.token + }, + data: { + businessId: item.uid, + projectId: 'column' + } + }) + .then(res => { + wx.hideLoading({}) + _self.data.dataList[index].list[idx].collectStatus = !item.collectStatus + _self.setData({ + dataList: _self.data.dataList + }) + }) + .catch(err => {}) + } }) \ No newline at end of file diff --git a/pages/mine/otherCard/othercarddetail.wxml b/pages/mine/otherCard/othercarddetail.wxml index 6061ef8..38b46c0 100644 --- a/pages/mine/otherCard/othercarddetail.wxml +++ b/pages/mine/otherCard/othercarddetail.wxml @@ -147,13 +147,16 @@ - + @@ -198,6 +201,9 @@ + + + @@ -302,39 +308,48 @@ - - - - - - - - - - - - 收藏 + + + - - - - {{it.commentCount>1000 ? '1000+':it.commentCount}} - - - - - {{it.likeCount>1000? '1000+':it.likeCount}} + + + + + + + 收藏 + + + + + {{it.commentCount>1000 ? '1000+':it.commentCount}} + + + + + {{it.likeCount>1000? '1000+':it.likeCount}} + diff --git a/pages/mine/otherCard/othercarddetail.wxss b/pages/mine/otherCard/othercarddetail.wxss index 3e7b7e8..f933ee3 100644 --- a/pages/mine/otherCard/othercarddetail.wxss +++ b/pages/mine/otherCard/othercarddetail.wxss @@ -712,38 +712,4 @@ .bar-code image { width: 300rpx; height: 300rpx; -} - -.func-box { - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: center; - margin-top: 10rpx; -} - -.func-items { - width: 100%; - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - margin-top: 10rpx; -} - -.func-item { - display: flex; - flex-direction: row; - justify-content: center; - align-items: center; - flex: 1; -} - -.func-item image { - width: 48rpx; - height: 48rpx; -} - -.func-item text { - margin-left: 10rpx; } \ No newline at end of file