diff --git a/components/ActivateAgentPopup.vue b/components/ActivateAgentPopup.vue new file mode 100644 index 0000000..ca8919a --- /dev/null +++ b/components/ActivateAgentPopup.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/components/DynamicIsland.vue b/components/DynamicIsland.vue index a932df8..ddcac3e 100644 --- a/components/DynamicIsland.vue +++ b/components/DynamicIsland.vue @@ -78,45 +78,39 @@ @@ -622,6 +616,7 @@ export default { .bottom-section { display: flex; align-items: center; + justify-content: space-between; flex: 1; color: #000000; } diff --git a/pages/index/iSoul.vue b/pages/index/iSoul.vue index e25b46c..52dfea6 100644 --- a/pages/index/iSoul.vue +++ b/pages/index/iSoul.vue @@ -70,69 +70,33 @@ - - - - - 待激活的Agent - - - - - - - - - - + + + + - - - - - - - - - - 数字资产权益 - - + + + 数字资产权益 + + - {{ asset.actionText }} + {{ + asset.actionText + }} → @@ -186,7 +152,7 @@ - + 待使用 @@ -212,10 +178,7 @@ class="digital-img" > - + 购物车 @@ -315,6 +278,9 @@ + + + @@ -337,15 +303,17 @@ 确认兑换 - - - 如何查找兑换码 - - - 前往「君到苏州」平台>> - 【我的】→【权益订单】>>复制权益码 - - + + 如何查找兑换码 + + 前往「君到苏州」平台>> + 【我的】→【权益订单】>>复制权益码 + + @@ -356,10 +324,12 @@ import moment from "moment"; import CustomTabBar from "@/components/CustomTabBar.vue"; import MusicControl from "@/components/MusicControl.vue"; +import ActivateAgentPopup from "@/components/ActivateAgentPopup.vue"; export default { components: { CustomTabBar, MusicControl, + ActivateAgentPopup, }, data() { return { @@ -417,9 +387,7 @@ export default { ], exchangeCode: "", // 兑换码 memorialItems: [], - assetList: [ - - ], + assetList: [], }; }, onLoad() { @@ -467,8 +435,18 @@ export default { "/uploads/20250729/42598a2dcf4c9a6f8c6e122e54b65c4f.png", badge: "待使用", name: item.goodsTitle || "数字资产权益", - desc: item.type==1?'IP数字资产':item.type==2?'IP周边': item.skuName, - actionText:item.type==1?'去查看':item.type==2?'去预约': "去核销", + desc: + item.type == 1 + ? "IP数字资产" + : item.type == 2 + ? "IP周边" + : item.skuName, + actionText: + item.type == 1 + ? "去查看" + : item.type == 2 + ? "去预约" + : "去核销", status: "待使用", ...item, // 保留原始数据 })); @@ -574,23 +552,22 @@ export default { }); } }, - handleAction(item){ - if(item.type==1){ - uni.navigateTo({ - url: "/subPackages/memorialAlbum/detail?id=" + item.childId, - }); - }else if(item.type==2){ - uni.navigateTo({ - url: `/subPackages/orderQy/confrim?goodsId=${item.goodsId}&orderChildId=${item.childId}`, - }); - }else{ - uni.showToast({ - title: "使用门票", - icon: "none", - }); - } - - }, + handleAction(item) { + if (item.type == 1) { + uni.navigateTo({ + url: "/subPackages/memorialAlbum/detail?id=" + item.childId, + }); + } else if (item.type == 2) { + uni.navigateTo({ + url: `/subPackages/orderQy/confrim?goodsId=${item.goodsId}&orderChildId=${item.childId}`, + }); + } else { + uni.showToast({ + title: "使用门票", + icon: "none", + }); + } + }, // 数字资产权益点击 handleAssetAction(action, asset = null) { @@ -632,14 +609,14 @@ export default { break; } }, - showImgJdsz(img) { - if (!img) return; - if (img.indexOf("https://") != -1 || img.indexOf("http://") != -1) { - return img; - } else { - return this.JDSU_IMG_URL + img; - } - }, + showImgJdsz(img) { + if (!img) return; + if (img.indexOf("https://") != -1 || img.indexOf("http://") != -1) { + return img; + } else { + return this.JDSU_IMG_URL + img; + } + }, // 有感商品点击 handleGoodsAction(action) { switch (action) { @@ -720,6 +697,11 @@ export default { } }); }, + + // 显示激活AGENT弹窗 + showActivateAgentPopup() { + this.$refs.activateAgentPopup.openPopup(); + }, }, }; @@ -1116,7 +1098,7 @@ view { display: flex; align-items: center; justify-content: space-between; - background: linear-gradient(135deg, #fffdb7e6 0%, #97fffab5 100%); + background: linear-gradient(135deg, #fffdb7e6 0%, #97fffab5 100%); border-radius: 20rpx; padding: 10rpx 16rpx; backdrop-filter: blur(10rpx); @@ -1142,13 +1124,13 @@ view { flex-shrink: 0; margin-left: 8rpx; } -.action-arrow-order{ - font-size: 26rpx; - font-weight: bold; - color: black; - transition: transform 0.3s ease; - flex-shrink: 0; - margin-left: 8rpx; +.action-arrow-order { + font-size: 26rpx; + font-weight: bold; + color: black; + transition: transform 0.3s ease; + flex-shrink: 0; + margin-left: 8rpx; } .asset-card:active .action-arrow { @@ -1170,10 +1152,6 @@ view { font-size: 25rpx; } - - - - .action-icon { width: 36rpx; height: 36rpx; @@ -1319,7 +1297,7 @@ view { } .single-badge { - background: linear-gradient(135deg, #77F3F9 0%, #764ba2 100%); + background: linear-gradient(135deg, #77f3f9 0%, #764ba2 100%); color: white; font-size: 22rpx; padding: 8rpx 16rpx; @@ -1533,7 +1511,7 @@ view { box-sizing: border-box; &:focus { - border-color: #77F3F9; + border-color: #77f3f9; } } @@ -1562,11 +1540,11 @@ view { .cancel-btn { background: #f5f5f5; - color: #77F3F9; + color: #77f3f9; } .confirm-btn { - background: #77F3F9; + background: #77f3f9; color: #000000; } .column-divider { @@ -1576,18 +1554,18 @@ view { margin: 35rpx 16rpx; flex-shrink: 0; } -.action-box{ - display: flex; - align-items: center; - justify-content: space-around; - padding: 20rpx 40rpx 0; -} - -.popup-actions-bottom{ - color: #989898; - font-weight: bold; - font-size: 28rpx; - margin-top: 30rpx; - margin-bottom: 30rpx; +.action-box { + display: flex; + align-items: center; + justify-content: space-around; + padding: 20rpx 40rpx 0; +} + +.popup-actions-bottom { + color: #989898; + font-weight: bold; + font-size: 28rpx; + margin-top: 30rpx; + margin-bottom: 30rpx; } diff --git a/pages/index/timeShopBank.vue b/pages/index/timeShopBank.vue index 9bebf11..eacd9b8 100644 --- a/pages/index/timeShopBank.vue +++ b/pages/index/timeShopBank.vue @@ -71,9 +71,8 @@ export default { }, data() { return { - currentTab: 1, // 默认选中"笔记" + currentTab: 0, // 默认选中"笔记" tabs: [ - { name: "划线", id: "underline" }, { name: "笔记", id: "notes" }, { name: "关注", id: "follow" }, { name: "推荐", id: "recommend" }, @@ -313,6 +312,7 @@ page { background: #ffffff; padding: 0 32rpx; margin-top: 40rpx; + margin-bottom: 20rpx; } .tab-wrapper {