From 88d6c7746ed5298683966dd376fa45df6e920e71 Mon Sep 17 00:00:00 2001 From: lr Date: Mon, 24 Feb 2025 16:46:10 +0800 Subject: [PATCH] 1 --- jiuyi2/api/mine.js | 55 ++++++++++--------- jiuyi2/common/js/config.js | 4 -- jiuyi2/pages/index/videoHome.vue | 4 +- jiuyi2/pages/mine/myComment.vue | 94 +++++++++++++++----------------- jiuyi2/vite.config.js | 4 -- 5 files changed, 75 insertions(+), 86 deletions(-) diff --git a/jiuyi2/api/mine.js b/jiuyi2/api/mine.js index 2f585fea..6eac9571 100644 --- a/jiuyi2/api/mine.js +++ b/jiuyi2/api/mine.js @@ -354,19 +354,9 @@ const mine = { }, /** -<<<<<<< HEAD - * 解锁他人评论 - * @param {Object} param - */ - unlockComment(param) { - return util.request({ - url: `/video/comment/unlockOthersComment`, - data: param, - method: 'POST', -======= - * 查看已绑定的银行卡列表 - * @param {Object} param - */ + * 查看已绑定的银行卡列表 + * @param {Object} param + */ getBankCards(param) { return util.request({ url: '/user/bank-cards/getBankCards', @@ -374,22 +364,10 @@ const mine = { query: param.query, method: 'GET', load: true, ->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d }) }, - /** -<<<<<<< HEAD - * 拉黑 - * @param {Object} param - */ - blockUser(param) { - return util.request({ - url: `/video/statistics/block`, - data: param, - method: 'POST', -======= - * 添加银行卡 + * 添加银行卡 * @param {Object} param */ addBankCard(param) { @@ -412,7 +390,30 @@ const mine = { path: param.path, method: 'DELETE', load: true, ->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d + }) + }, + + /** + * 拉黑 + * @param {Object} param + */ + blockUser(param) { + return util.request({ + url: `/video/statistics/block`, + data: param, + method: 'POST', + }) + }, + + /** + * 解锁他人评论 + * @param {Object} param + */ + unlockComment(param) { + return util.request({ + url: `/video/comment/unlockOthersComment`, + data: param, + method: 'POST', }) }, } diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index d38f5920..cbca85b5 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -6,13 +6,9 @@ const config = { // host: 'h5api', // #endif // #ifndef H5 -<<<<<<< HEAD // host: 'http://91f.xyz:8080', // host: 'https://1a880cd5.r24.cpolar.top/', host: 'http://aere2w.natappfree.cc', -======= - host: 'http://91f.xyz:8080', ->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/pages/index/videoHome.vue b/jiuyi2/pages/index/videoHome.vue index 790d5895..7cce3588 100644 --- a/jiuyi2/pages/index/videoHome.vue +++ b/jiuyi2/pages/index/videoHome.vue @@ -420,8 +420,8 @@ function toCommentsList() { - - + + 设置备注 diff --git a/jiuyi2/pages/mine/myComment.vue b/jiuyi2/pages/mine/myComment.vue index 96248c7b..cfe7826b 100644 --- a/jiuyi2/pages/mine/myComment.vue +++ b/jiuyi2/pages/mine/myComment.vue @@ -35,7 +35,6 @@ const userinfo = computed(() => { return store.state.userinfo }) -<<<<<<< HEAD onLoad((option) => { if (option.userId) { uni.setNavigationBarTitle({ @@ -44,55 +43,7 @@ onLoad((option) => { getList(option.userId) } else { getList() -======= - onLoad(() => { - getLst() - }) - - // 重载视频列表 - function refreshVideoList() { - list.pageNum = 1 - list.total = 0 - getLst() } - - // 获取更多视频列表 - function getMoreVideoList() { - if (list.data.length >= list.total) return - list.pageNum++ - getLst() - } - - // 获取我的评论 - function getLst() { - api.mine.myComment({ - query: { - userId: userinfo.value.id, - pageNum: list.pageNum, - pageSize: list.pageSize, - } - }).then(rs => { - if (rs.code == 200) { - if (list.pageNum) list.data.length = 0 - // 追加视频列表 - list.data.push(...rs.rows.map(item => { - return item - })) - // 视频列表 - list.total = rs.total - console.log('list', list.data) - return - } - util.alert({ - content: rs.msg, - showCancel: false, - }) - }).finally(() => { - uni.stopPullDownRefresh() - }) ->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d - } - }) onReachBottom(() => { @@ -105,6 +56,51 @@ onPullDownRefresh(() => { refreshVideoList() }) +// 重载视频列表 +function refreshVideoList() { + list.pageNum = 1 + list.total = 0 + getLst() +} + +// 获取更多视频列表 +function getMoreVideoList() { + if (list.data.length >= list.total) return + list.pageNum++ + getLst() +} + +// 获取我的评论 +function getLst() { + api.mine.myComment({ + query: { + userId: userinfo.value.id, + pageNum: list.pageNum, + pageSize: list.pageSize, + } + }).then(rs => { + if (rs.code == 200) { + if (list.pageNum) list.data.length = 0 + // 追加视频列表 + list.data.push(...rs.rows.map(item => { + return item + })) + // 视频列表 + list.total = rs.total + console.log('list', list.data) + return + } + util.alert({ + content: rs.msg, + showCancel: false, + }) + }).finally(() => { + uni.stopPullDownRefresh() + }) +} + + + // 重载视频列表 function refreshVideoList() { list.pageNum = 1 diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js index 20378137..8489461d 100644 --- a/jiuyi2/vite.config.js +++ b/jiuyi2/vite.config.js @@ -3,13 +3,9 @@ import { } from 'vite'; import uni from '@dcloudio/vite-plugin-uni'; -<<<<<<< HEAD // let target = 'http://91f.xyz:8080' // let target = 'https://1a880cd5.r24.cpolar.top/' let target = 'http://aere2w.natappfree.cc' -======= -let target = 'http://91f.xyz:8080' ->>>>>>> 0a930aa1702a2566cc55bb62dad90293c20f3b0d export default defineConfig({ plugins: [uni()],