From 2a92567835b3853b0dadcde68593e80b201b59c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com> Date: Thu, 21 May 2026 15:38:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=BD=92=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/finance.js | 8 + manifest.json | 4 +- pages/mine/mine.vue | 5 +- pages/mine_package/mine_purse/mine_purse.vue | 335 ++++++++++++++++--- pages/rwa_package/shop/sort-shop.vue | 2 - static/common/amount-1.png | Bin 0 -> 1053 bytes static/common/password-1.png | Bin 0 -> 757 bytes static/common/phone-1.png | Bin 0 -> 396 bytes static/common/success-1.png | Bin 0 -> 1804 bytes utils/config.js | 8 +- 10 files changed, 299 insertions(+), 63 deletions(-) create mode 100644 static/common/amount-1.png create mode 100644 static/common/password-1.png create mode 100644 static/common/phone-1.png create mode 100644 static/common/success-1.png diff --git a/api/finance.js b/api/finance.js index 4e28f2a..f8d5706 100644 --- a/api/finance.js +++ b/api/finance.js @@ -256,3 +256,11 @@ export function getProfitSharingData(data) { data }); } +// 归集 +export function collectQuery(data) { + return request({ + url: "/finance/collectVcoin", + method: "post", + data, + }); +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index e0b3040..284d58f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "信任桥", "appid" : "__UNI__4910728", "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城;通过“有趣”“有利”“有希望”的卖货玩法,吸引消费者、推广者、商家、投资人参与生态,共同打造共创共享的全球产业生态。", - "versionName" : "1.0.2", - "versionCode" : 161, + "versionName" : "1.0.3", + "versionCode" : 162, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index d53d020..12f1f68 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -22,7 +22,7 @@ {{ currentUserData.nickname || "信任桥用户" }} - + - {{ currentUserData.gradeName }} + 星级用户 + + {{ btn.memo }} + @@ -51,32 +32,72 @@ {{ item.lockAmount || 0 }} - {{ item.categoty === "raffle" ? "不可用次数" : "不可用余额" }} - + {{ item.categoty === "raffle" ? "不可用次数" : "不可用余额" }} + + - 抽奖7天后释放到可用余额中 + 抽奖7天后释放到可用余额中 + + + + + 归集数字积分 + + + + + + + + + + + + + + + + + + 全部 + + 可用数量:{{ availableAmount }} + + + + + + + + + + 确定归集 + + + + + + + 归集成功 + {{ collectForm.amount }} + 好的 + + + @@ -218,6 +308,7 @@ export default { display: flex; flex-direction: row; align-items: center; + .button { border-radius: 12rpx; width: 120rpx; @@ -279,5 +370,143 @@ export default { margin-top: 5rpx; } } + + .popup_content { + background: #ffffff; + border-radius: 48rpx 48rpx 0 0; + padding: 30rpx 32rpx; + padding-bottom: calc(60rpx + env(safe-area-inset-bottom)); + + .popup_header { + display: flex; + justify-content: center; + align-items: center; + position: relative; + margin-bottom: 48rpx; + + .popup_title { + font-weight: 600; + font-size: 28rpx; + color: #71737C; + } + + .popup_close { + position: absolute; + right: 0; + width: 48rpx; + height: 48rpx; + display: flex; + align-items: center; + justify-content: center; + } + } + + .popup_form { + .form_item { + display: flex; + align-items: center; + background: #f7f7f7; + border-radius: 20rpx; + padding: 0 28rpx; + height: 100rpx; + margin-bottom: 28rpx; + + .form_icon { + width: 48rpx; + height: 48rpx; + display: flex; + align-items: center; + justify-content: center; + margin-right: 20rpx; + } + + .form_input { + flex: 1; + font-size: 30rpx; + color: #333333; + } + + .form_all { + font-size: 28rpx; + color: #7934f6; + margin-left: 20rpx; + font-weight: 500; + } + + .form_eye { + width: 48rpx; + height: 48rpx; + display: flex; + align-items: center; + justify-content: center; + margin-left: 20rpx; + } + } + + .form_tip { + font-size: 26rpx; + color: #999999; + text-align: right; + margin-bottom: 28rpx; + } + + .popup_confirm { + margin-top: 20rpx; + background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%); + border-radius: 20rpx; + height: 100rpx; + display: flex; + align-items: center; + justify-content: center; + font-weight: 500; + font-size: 32rpx; + color: #ffffff; + } + } + + .popup_success { + display: flex; + flex-direction: column; + align-items: center; + padding: 60rpx 0; + + .success_icon { + width: 160rpx; + height: 160rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + margin-bottom: 32rpx; + } + + .success_title { + font-weight: 600; + font-size: 36rpx; + color: #333333; + margin-bottom: 16rpx; + } + + .success_amount { + font-weight: bold; + font-size: 48rpx; + color: #333333; + margin-bottom: 48rpx; + } + + .popup_confirm { + width: 100%; + background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%); + border-radius: 20rpx; + height: 100rpx; + display: flex; + align-items: center; + justify-content: center; + font-weight: 500; + font-size: 32rpx; + color: #ffffff; + } + } + } } diff --git a/pages/rwa_package/shop/sort-shop.vue b/pages/rwa_package/shop/sort-shop.vue index c4c8dfb..c3cd36b 100644 --- a/pages/rwa_package/shop/sort-shop.vue +++ b/pages/rwa_package/shop/sort-shop.vue @@ -25,8 +25,6 @@ import { searchList } from '@/api/product.js'; import { getCascadeCategory } from '@/api/common.js'; import PingItem from "@/components/shop/ping-item.vue"; -import func from '@/utils/func.js'; - export default { components: { Header, TopSafe,MyBtn,PingItem }, data() { diff --git a/static/common/amount-1.png b/static/common/amount-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0a9820b2f00ef1ca724065200524458f8cc7cc8b GIT binary patch literal 1053 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 uC|Lab4*&rF|EgzR{r~^~21!IgR09CA@Q?wrn