From 0ee1576f8b096c407a8a54e8237e3a778d892cc2 Mon Sep 17 00:00:00 2001 From: sx <2427911852@qq.com> Date: Wed, 19 Feb 2025 16:54:49 +0800 Subject: [PATCH] =?UTF-8?q?2025=2002=2019=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20=E6=A6=B4=E8=8E=B2=E6=9E=9C?= =?UTF-8?q?=E6=A0=91=E5=85=91=E6=8D=A2=E5=92=8C=E6=A0=B7=E5=BC=8F=20?= =?UTF-8?q?=E5=8D=B7=E8=BD=B4=E5=85=91=E6=8D=A2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jiuyi2/api/durian.js | 1 + jiuyi2/api/intergral.js | 1 + jiuyi2/components/index/task.vue | 2 +- jiuyi2/pages.json | 2 +- jiuyi2/pages/index/durainActivation.vue | 57 ++- jiuyi2/pages/index/durian.vue | 555 ++++++++++++------------ jiuyi2/pages/index/integral.vue | 31 +- jiuyi2/pages/index/myTeam.vue | 16 +- jiuyi2/pages/index/orchard.vue | 7 +- jiuyi2/pages/index/trade.vue | 2 +- jiuyi2/pages/mine/homepage.vue | 2 + 11 files changed, 382 insertions(+), 294 deletions(-) diff --git a/jiuyi2/api/durian.js b/jiuyi2/api/durian.js index 5d3201ee..8084b0e9 100644 --- a/jiuyi2/api/durian.js +++ b/jiuyi2/api/durian.js @@ -34,6 +34,7 @@ export const durian = { url: `/coreplay/duriantreeinfo/boughtListByUser`, method: 'GET', query: param.query, + load: true, }) }, /** diff --git a/jiuyi2/api/intergral.js b/jiuyi2/api/intergral.js index 04c6bd34..5dd57f4a 100644 --- a/jiuyi2/api/intergral.js +++ b/jiuyi2/api/intergral.js @@ -99,6 +99,7 @@ const intergral = { method: 'POST', query: param.query, data: param.data, + load: true, }) }, diff --git a/jiuyi2/components/index/task.vue b/jiuyi2/components/index/task.vue index bef20ecb..31d6220d 100644 --- a/jiuyi2/components/index/task.vue +++ b/jiuyi2/components/index/task.vue @@ -47,7 +47,7 @@ 任务读秒 有效读秒 - {{task.viewingDuration}} + diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json index dcf30394..57d32a51 100644 --- a/jiuyi2/pages.json +++ b/jiuyi2/pages.json @@ -240,7 +240,7 @@ { "path": "pages/index/durainActivation", "style": { - "navigationBarTitleText": "已激活", + "navigationBarTitleText": "我的榴莲果树", "navigationBarBackgroundColor": "#fff" } }, diff --git a/jiuyi2/pages/index/durainActivation.vue b/jiuyi2/pages/index/durainActivation.vue index 3d72bc78..17f15797 100644 --- a/jiuyi2/pages/index/durainActivation.vue +++ b/jiuyi2/pages/index/durainActivation.vue @@ -34,7 +34,23 @@ function buyDurianList() { api.durian.buyDurianList({}).then(rs => { if (rs.code == 200) { + // 我的榴莲果树 treeData.value = rs.data.dataList.map(item => { + // orderType 0赠送 1兑换 + item.style = { + '0': { + 1: 'scroll1', + 2: 'scroll2', + 3: 'scroll3', + 4: 'scroll4', + } [item.durianConfigId], + '1': { + 1: 'buy1', + 2: 'buy2', + 3: 'buy3', + 4: 'buy4', + } [item.durianConfigId], + } [item.orderType] item.formatHash = formatStr(item.treeHash) return item }) @@ -83,20 +99,21 @@ - + - 每日可释放:{{item.release}} + 每日可释放:{{item.releasableDaily}} 剩余可释放:{{item.remainFruitCount}} 当前级别:{{item.treeName}} 哈希值: {{item.formatHash}} - + + 当前暂无榴莲果树~ @@ -107,20 +124,44 @@ \ No newline at end of file diff --git a/jiuyi2/pages/index/durian.vue b/jiuyi2/pages/index/durian.vue index 4d478493..0d9ed1ae 100644 --- a/jiuyi2/pages/index/durian.vue +++ b/jiuyi2/pages/index/durian.vue @@ -1,229 +1,237 @@ \ No newline at end of file diff --git a/jiuyi2/pages/index/integral.vue b/jiuyi2/pages/index/integral.vue index ff790295..e52eb9e1 100644 --- a/jiuyi2/pages/index/integral.vue +++ b/jiuyi2/pages/index/integral.vue @@ -58,6 +58,12 @@ // 卷轴列表 dataList.value = result.dataList.map(item => { item.formatHash = item.scrollHash.replace(/(\d{4})\d*(\d{4})/, "$1****$2") + // item.style = { + // '1级卷轴': 'scroll1', + // '2级卷轴': 'scroll2', + // '3级卷轴': 'scroll3', + // '4级卷轴': 'scroll4', + // } [item.scrollName] return item }) return @@ -117,7 +123,6 @@ * @param {Object} item 当前对象 */ function handleCopy(item) { - // scrollHash util.copyText(item.scrollHash) } @@ -129,8 +134,9 @@ {{total}} - - + + 卷轴可释放 @@ -183,6 +189,25 @@ background-color: #333; } + // 列表 + // .listBox { + // .scroll1 { + // background-color: #F4F4F4; + // } + + // .scroll2 { + // background-color: #E4FBFF; + // } + + // .scroll3 { + // background-color: #CACDFF; + // } + + // .scroll4 { + // background-color: #F4CAFF; + // } + // } + // .board { background-image: linear-gradient(121deg, #27EFE2 0%, #A45EFF 43%, #FF004F 99%); diff --git a/jiuyi2/pages/index/myTeam.vue b/jiuyi2/pages/index/myTeam.vue index 5c53b4b2..904c6c3b 100644 --- a/jiuyi2/pages/index/myTeam.vue +++ b/jiuyi2/pages/index/myTeam.vue @@ -157,7 +157,8 @@ - {{item.userNickname}} + + {{item.userNickname}}{{item.isShop}}