From 36df835adfdf50658d7bb2728f6008692d97a21d Mon Sep 17 00:00:00 2001 From: sx <2427911852@qq.com> Date: Thu, 6 Feb 2025 23:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jiuyi2/androidPrivacy.json | 4 +- jiuyi2/api/video.js | 13 ++++ jiuyi2/common/js/config.js | 5 +- jiuyi2/common/js/util.js | 2 - .../shop/productList/productList.vue | 10 ++- jiuyi2/pages/index/index.nvue | 1 - jiuyi2/pages/index/videoDetail.nvue | 16 ++--- jiuyi2/pages/index/videoDetail.vue | 27 ++++--- jiuyi2/pages/mine/homepage.vue | 31 ++++++-- jiuyi2/pages/release/commodity.vue | 66 ++++++++++++++++-- jiuyi2/pages/release/video.vue | 61 +++++++++------- jiuyi2/pages/shop/shop.vue | 6 +- jiuyi2/static/settedBoard.png | Bin 9015 -> 0 bytes jiuyi2/static/settedCartoon.png | Bin 6153 -> 0 bytes jiuyi2/static/settedCartoon1.png | Bin 5591 -> 0 bytes jiuyi2/vite.config.js | 1 - 16 files changed, 174 insertions(+), 69 deletions(-) delete mode 100644 jiuyi2/static/settedBoard.png delete mode 100644 jiuyi2/static/settedCartoon.png delete mode 100644 jiuyi2/static/settedCartoon1.png diff --git a/jiuyi2/androidPrivacy.json b/jiuyi2/androidPrivacy.json index 505b6c74..dec5a812 100644 --- a/jiuyi2/androidPrivacy.json +++ b/jiuyi2/androidPrivacy.json @@ -2,14 +2,14 @@ "version" : "1", "prompt" : "template", "title" : "隐私政策", - "message" : "　　请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《用户协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "message" : "　　请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《用户协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", "hrefLoader" : "system|default", "backToExit" : "false", "second" : { "title" : "确认提示", - "message" : "　　进入应用前，你需先同意《隐私政策》和《隐私政策》", + "message" : "　　进入应用前，你需先同意《用户协议》和《隐私政策》", "buttonAccept" : "同意并继续", "buttonRefuse" : "拒绝" }, diff --git a/jiuyi2/api/video.js b/jiuyi2/api/video.js index a21aa1a4..43aef5e2 100644 --- a/jiuyi2/api/video.js +++ b/jiuyi2/api/video.js @@ -24,6 +24,19 @@ const video = { url: `/video/video/add`, data: param.data, method: 'POST', + load: true, + }) + }, + + /** + * 删除视频 + * @param {Object} param + */ + removeVideo(param) { + return util.request({ + url: `/video/video/deleteVideo`, + data: param.data, + method: 'POST', }) }, diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index 36f1528f..92c59f9f 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -6,10 +6,9 @@ const config = { // host: 'h5api', // #endif // #ifndef H5 - host: 'http://91f.xyz:8080', + // host: 'http://91f.xyz:8080', // host: 'http://192.168.0.110:8080', - // host: 'http://192.168.0.100:8080', - // host: 'http://192.168.0.114:8080', + host: 'http://192.168.0.100:8080', // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js index 1ad97988..9e431736 100644 --- a/jiuyi2/common/js/util.js +++ b/jiuyi2/common/js/util.js @@ -5,8 +5,6 @@ import config from '@/common/js/config.js' // 接口 import api from '@/api/index.js' -const msgType = {} - // 工具库 const util = { // 配置参数 diff --git a/jiuyi2/components/shop/productList/productList.vue b/jiuyi2/components/shop/productList/productList.vue index f34b130e..46768968 100644 --- a/jiuyi2/components/shop/productList/productList.vue +++ b/jiuyi2/components/shop/productList/productList.vue @@ -50,12 +50,19 @@ // 重载列表 function refreshList() { - console.log('listPrototype', listPrototype) listPrototype.pageNum = 1 listPrototype.total = 0 getList() } + // 加载更多列表 + function getMoreList() { + console.log('getMoreList', listPrototype) + if (listPrototype.total <= listPrototype.data.length) return + listPrototype.pageNum++ + getList() + } + // 获取商品 function getList() { api.shop.getProduct({ @@ -90,6 +97,7 @@ getList, listPrototype, refreshList, + getMoreList, }) diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue index cb7ed8e5..b0ae8db0 100644 --- a/jiuyi2/pages/index/index.nvue +++ b/jiuyi2/pages/index/index.nvue @@ -211,7 +211,6 @@ }) onHide(() => { - console.log('onHide', current[tabIndex.value], currentVideoRef) // 暂停视频 if (proxy.$refs[`videoRef${tabIndex.value}`]) { proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].pause() diff --git a/jiuyi2/pages/index/videoDetail.nvue b/jiuyi2/pages/index/videoDetail.nvue index 6ac3ff0d..93942d9b 100644 --- a/jiuyi2/pages/index/videoDetail.nvue +++ b/jiuyi2/pages/index/videoDetail.nvue @@ -159,10 +159,10 @@ // 菜单 let menu = [{ name: '编辑', - fn: function() { + fn: () => { uni.navigateTo({ url: util.setUrl('/pages/release/video', { - videoId: detail.videoId, + videoId: detail.id, }) }) } @@ -174,10 +174,9 @@ content: '删除后不可恢复。确认删除？', }).then(rs => { // 删除视频 - if (rs.confirm) api.video.updateVideo({ + if (rs.confirm) api.video.deleteVideo({ data: { - videoId: detail.videoId, - isDeleted: 1, + id: detail.id, } }).then(rs => { if (rs.code == 200) { @@ -214,9 +213,10 @@