From 9d2bec920ffa6ed0534c5c970d0a7278ca23de15 Mon Sep 17 00:00:00 2001 From: zengBin Date: Sun, 29 Sep 2024 09:32:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dynamicDiscuss.wpy | 75 +++-- src/components/dynamicList.wpy | 15 +- src/components/dynamicOperation.wpy | 30 +- src/mixins/plugins.js | 34 +- src/pages/dynamic/dynamicDetail.wpy | 13 +- src/pages/dynamic/hotTopic.wpy | 2 +- src/pages/dynamic/issue.wpy | 10 +- src/pages/dynamic/voteDetail.wpy | 33 +- src/pages/home/information.wpy | 34 +- src/pages/news/chitchat.wpy | 472 ++++++++++++++++------------ src/pages/news/groupChitchat.wpy | 229 +++++++++----- src/pages/news/review.wpy | 72 ++--- src/pages/tabBar/dynamic.wpy | 2 +- src/pages/tabBar/home.wpy | 60 ++-- src/pages/tabBar/news.wpy | 4 +- 15 files changed, 676 insertions(+), 409 deletions(-) diff --git a/src/components/dynamicDiscuss.wpy b/src/components/dynamicDiscuss.wpy index 798b3df..9428f50 100644 --- a/src/components/dynamicDiscuss.wpy +++ b/src/components/dynamicDiscuss.wpy @@ -214,8 +214,8 @@ - - + + 复制 @@ -229,29 +229,28 @@ - - + - {{ item.User.nickname || '未设置名称' }} - + {{ item.nickname || '未设置名称' }} + - + - {{ item.create_time }} + {{ item.created_at }} - 回复 {{item.Replyer.nickname}}： + 回复 {{item.reply_nickname}}： {{ item.comment }} - - + + - {{ item.likerCount }} + {{ item.liker_count }} - - {{ item.likerCount }} + + {{ item.liker_count }} @@ -289,6 +288,10 @@ detail: { type: Object, default: {} + }, + type: { + type: String, + default: '' } }, data: { @@ -298,7 +301,7 @@ defaultAvatar: 'https://images.ufutx.com/202007/01/e0de60525143427d4dd19515a5b387ba.png', gifurl: 'https://images.ufutx.com/202106/11/d40b92e053a693f30eb197bf6374af95.gif', name: '', - replyId: '', + replyId: 0, inputVal: '', showReplyView: true, inputBoxH: 86 @@ -310,23 +313,31 @@ let vm = this let comment = vm.replyId ? vm.inputVal.split(`回复@${vm.name}：`)[1] : vm.inputVal let data = { - reply_id: vm.replyId || '', + reply_id: vm.replyId || 0, comment: vm.replyId ? vm.inputVal.split(`回复@${vm.name}：`)[1] : vm.inputVal } if (!comment) { vm.$showToast('请输入评论内容') return } + let url = '' + if (vm.type == 'vote') { + // 投票动态评论 + url = `${service.host}/vote/${vm.detail.id}/comment` + } else { + // 正常动态评论 + url = `${service.host}/moment/${vm.detail.id}/comment` + } if (vm.throttle) { vm.throttle = false - vm.$post({url: `${service.host}/moment/${vm.detail.id}/comment`, data}).then(({code}) => { + vm.$post({url: url, data}).then(({code}) => { wx.hideLoading() if (code == 0) { vm.$emit('getList') vm.replyContent = '' vm.name = '' vm.inputVal = '' - vm.replyId = '' + vm.replyId = 0 } vm.throttle = true }).catch(() => { @@ -335,12 +346,29 @@ }) } }, + // 评论点赞 + commentLiker(e, index) { + let vm = this + if (vm.throttle) { + vm.throttle = false + vm.$post({url: `${service.host}/moment/comment/${e.comment_id}/like`}).then(({code, data}) => { + if (code == 0) { + vm.$emit('changLiker', index) + } + wx.hideLoading() + vm.throttle = true + }).catch(() => { + vm.throttle = true + wx.hideLoading() + }) + } + }, // 点击评论内容回复 changeReply(e) { let vm = this - vm.replyId = e.User.id - vm.name = e.User.nickname - vm.inputVal = `回复@${e.User.nickname}：` + vm.replyId = e.id + vm.name = e.nickname + vm.inputVal = `回复@${e.nickname}：` }, // 长按评论内容弹框复制等操作 commentsOperation(id) { @@ -370,7 +398,7 @@ vm.replyContent = '' vm.name = '' vm.inputVal = '' - vm.replyId = '' + vm.replyId = 0 } vm.changeInputHeight() }, @@ -394,6 +422,9 @@ vm.$showToast('复制成功') } }) + }, + jumpPath(url) { + wx.navigateTo({url: url}) } }, created() {} diff --git a/src/components/dynamicList.wpy b/src/components/dynamicList.wpy index 6ccb167..c3b6af6 100644 --- a/src/components/dynamicList.wpy +++ b/src/components/dynamicList.wpy @@ -134,8 +134,7 @@ scroll-view { .ui-img { width: 32rpx; height: 32rpx; - margin-right: 10rpx; - margin-left: 8rpx; + margin: 0 10rpx; } } @@ -216,7 +215,7 @@ scroll-view { {{item.work_user_tag}} - + 参与了投票： @@ -234,7 +233,7 @@ scroll-view { {{item.content}} - + {{item.vote.title}} @@ -253,10 +252,10 @@ scroll-view { - + - {{ item.mt_name }} + {{ item.topic.name }} @@ -409,14 +408,14 @@ scroll-view { vm.videoIndex = -1 } }, - jumpPath(url) { + jumpPath(url, type) { let vm = this // 校验是否完成注册资料 if (!vm.$signInVerify()) { vm.$emit('signInVerify') return } - if (vm.from != 'dynamic') { + if (vm.from != 'dynamic' && type != 'vote') { return } wx.navigateTo({url: url}) diff --git a/src/components/dynamicOperation.wpy b/src/components/dynamicOperation.wpy index 6971b9a..b633bcc 100644 --- a/src/components/dynamicOperation.wpy +++ b/src/components/dynamicOperation.wpy @@ -25,20 +25,20 @@ - 删除 - 隐藏动态 - 设置为推荐动态 - 取消推荐 - 设置为置顶 - 取消置顶 + 删除 + 隐藏动态 + 设置为推荐动态 + 取消推荐 + 设置为置顶 + 取消置顶 - 删除 + 删除 - 不感兴趣 - 举报 + 不感兴趣 + 举报 - 取消 + 取消 @@ -103,13 +103,16 @@ // 隐藏动态 conceal() { let vm = this + let data = { + is_show: 0 + } wx.showModal({ title: '温馨提示', content: '是否确认隐藏该动态？', success: function (res) { if (res.confirm) { vm.$showLoading('') - vm.$post({url: `${service.host}/moment/${vm.selectData.id}/hidden`}).then(({code, data}) => { + vm.$post({url: `${service.host}/moment/${vm.selectData.id}/hidden`, data}).then(({code, data}) => { if (code == 0) { vm.$showToast('动态已隐藏') vm.$emit('changeOperation', 'conceal') @@ -140,9 +143,7 @@ vm.$post({url: `${service.host}/moment/${vm.selectData.id}/hot`, data}).then(({code, data}) => { if (code == 0) { vm.$showToast(`${e == 1 ? '设置成功' : '取消成功'}`) - if (e == 0) { - vm.$emit('changeOperation', 'hot') - } + vm.$emit('changeOperation', 'hot') vm.hideModal() } wx.hideLoading() @@ -213,6 +214,7 @@ }) }, jumpPath(url) { + console.log(url, '*********') wx.navigateTo({url: url}) }, hideModal() { diff --git a/src/mixins/plugins.js b/src/mixins/plugins.js index e0e6ac9..75163d2 100644 --- a/src/mixins/plugins.js +++ b/src/mixins/plugins.js @@ -15,7 +15,7 @@ const getTime = (time) => { if (yea == year) { return argument.slice(5, 11) + (timeS.slice(0, 2) >= 12 ? '下午' + (timeS.slice(0, 2) == 12 ? 12 : timeS.slice(0, 2) - 12) + timeS.slice(2, 5) : '上午' + timeS.slice(0, 5)) } else { - return timeS.slice(0, 2) >= 12 ? '下午' + (timeS.slice(0, 2) == 12 ? 12 : timeS.slice(0, 2) - 12) + timeS.slice(2, 5) : '上午' + timeS.slice(0, 5) + return argument } } if (timeCha > todayT && timeCha < yestodayT) { @@ -51,6 +51,37 @@ const format = (timestamp) => { return y + '-' + add0(m) + '-' + add0(d) + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s) } +// 倒计时传递对象 +const formatRemainTimeData = (endTime) => { + let startDateV2 = new Date() // 开始时间 + let endTimeArrV2 = endTime.replace(/-/g, '/') + let endDateV2 = new Date(endTimeArrV2) // 结束时间 + let tV2 = endDateV2.getTime() - startDateV2.getTime() // 时间差 + let dV2 = 0, + hV2 = 0, + mV2 = 0, + sV2 = 0 + if (tV2 >= 0) { + dV2 = Math.floor(tV2 / 1000 / 3600 / 24) + hV2 = Math.floor((tV2 / 1000 / 60 / 60) % 24) + mV2 = Math.floor((tV2 / 1000 / 60) % 60) + sV2 = Math.floor((tV2 / 1000) % 60) + } + // 修改小时格式 + if (hV2 >= 0 && hV2 <= 9) { + hV2 = '0' + hV2 + } + // 修改分钟格式 + if (mV2 >= 0 && mV2 <= 9) { + mV2 = '0' + mV2 + } + // 修改秒格式 + if (sV2 >= 0 && sV2 <= 9) { + sV2 = '0' + sV2 + } + return { d: dV2, h: hV2, m: mV2, s: sV2 } +} + const timeContrast = (startTime, endTime) => { let dateEnd = new Date(endTime.replace(/-/g, '/')) let dateBegin = new Date(startTime.replace(/-/g, '/')) @@ -305,6 +336,7 @@ const getElement_WH = (element) => { // 获取元素位置 module.exports = { getTime, + formatRemainTimeData, format, timeContrast, getVideoTime, diff --git a/src/pages/dynamic/dynamicDetail.wpy b/src/pages/dynamic/dynamicDetail.wpy index 94034a9..56fa28b 100644 --- a/src/pages/dynamic/dynamicDetail.wpy +++ b/src/pages/dynamic/dynamicDetail.wpy @@ -11,7 +11,7 @@ page { - + { -navigationBarTitleText: '', +navigationBarTitleText: '我看过谁', enablePullDownRefresh: true, backgroundColorTop: '#ffffff', backgroundColorBottom: '#ffffff', diff --git a/src/pages/tabBar/dynamic.wpy b/src/pages/tabBar/dynamic.wpy index 9e94d07..18288a8 100644 --- a/src/pages/tabBar/dynamic.wpy +++ b/src/pages/tabBar/dynamic.wpy @@ -207,7 +207,7 @@ page { - + diff --git a/src/pages/tabBar/home.wpy b/src/pages/tabBar/home.wpy index 0ebb4a8..41a8203 100644 --- a/src/pages/tabBar/home.wpy +++ b/src/pages/tabBar/home.wpy @@ -100,9 +100,13 @@ page { swiper-item{ width: 640rpx !important; - left: 30rpx; + left: 60rpx; padding: 0 12zrpx; } + + .ui-swiper-item{ + left: 30rpx!important; + } } .card-swiper swiper-item.cur .swiper-item, .swiper-item{ @@ -230,7 +234,7 @@ page { - + 福恋会在每天 12 点为你推荐 7 个用户 @@ -258,17 +262,17 @@ page { - - + + - + - {{ item.nickname }} - + {{ item.nickname }}{{cardCur}} + @@ -279,7 +283,7 @@ page { - {{ item.year + ' · ' }}{{item.stature + 'cm · '}}{{ item.degree ? item.degree + ' · ' : '' }}{{ item.industry_sub ? item.industry_sub : '' }} + {{ item.year + ' · ' }}{{item.stature + ' · '}}{{ item.degree ? item.degree + ' · ' : '' }}{{ item.industry_sub ? item.industry_sub : '' }} {{ item.introduction || '介绍：未填写' }} @@ -325,6 +329,7 @@ import wepy from '@wepy/core' import https from '../../mixins/https' import base from '../../mixins/base' import {service} from '../../config' +import {formatRemainTimeData} from '../../mixins/plugins' wepy.page({ config: {}, @@ -340,15 +345,9 @@ wepy.page({ squarePage: 1, no_more: false, cardCur: 0, // 为你推荐轮播下标 - referrals: [ // 为你推荐 - {name: '焉然', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: 'Sady', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: 'Sunny', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: '焉然', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: '智锋', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: '志辉', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'}, - {name: '焉然', pic: 'https://image.fulllinkai.com/202409/24/ccd8c3e29b9bdfc89907d92584497154.jpeg'} - ] + referrals: [], // 为你推荐 + countdown: {d: '0', h: '00', m: '00', s: '00'}, + timer: null }, methods: { // 获取置顶推荐用户 @@ -382,7 +381,8 @@ wepy.page({ let vm = this vm.$get({url: `${service.host}/other/user/recommend`}).then(({code, data}) => { if (code === 0) { - // vm.topList = data || [] + vm.referrals = data + vm.referrals.push({type: 'time'}) } wx.hideLoading() }).catch(err => { @@ -458,6 +458,28 @@ wepy.page({ } }) }, + getTimeFn() { + let vm = this + let date = new Date() + date.setDate(date.getDate() + 1)// 获取明天的日期 + let year = date.getFullYear() + let month = date.getMonth() + 1 + if (month < 10) { + month = '0' + month + } + let day = date.getDate() + if (day < 10) { + day = '0' + day + } + let time = `${year}-${month}-${day} 12:00:00` + vm.timer = setInterval(() => { + vm.countdown = formatRemainTimeData(time) + if (vm.countdown.d == 0 && vm.countdown.h == '00' && vm.countdown.m == '00' && vm.countdown.s == '00') { + clearInterval(vm.timer) + vm.timer = null + } + }, 1000) + }, cardSwiper(e) { let vm = this let source = e.$wx.detail.source @@ -494,6 +516,8 @@ wepy.page({ vm.getSquare() }, onShow() { + let vm = this + vm.getTimeFn() }, onLoad() { let vm = this diff --git a/src/pages/tabBar/news.wpy b/src/pages/tabBar/news.wpy index 2078bec..2aa7e29 100644 --- a/src/pages/tabBar/news.wpy +++ b/src/pages/tabBar/news.wpy @@ -362,11 +362,11 @@ wepy.page({ let vm = this wx.showModal({ title: '温馨提示', - content: `是否确认退出${e.title}群聊？`, + content: `是否确认删除？`, success: function (res) { if (res.confirm) { vm.$showLoading('') - vm.$post({url: `${service.host}/team/${e.id}/leave`}).then(({code, data}) => { + vm.$delete({url: `${service.host}/chat/linkmen/${e.id}`}).then(({code, data}) => { if (code == 0) { vm.$showToast(`已删除`) vm.list.splice(index, 1)