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天后释放到可用余额中
+
+
+
+
@@ -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 0000000..0a9820b
Binary files /dev/null and b/static/common/amount-1.png differ
diff --git a/static/common/password-1.png b/static/common/password-1.png
new file mode 100644
index 0000000..2be4ac3
Binary files /dev/null and b/static/common/password-1.png differ
diff --git a/static/common/phone-1.png b/static/common/phone-1.png
new file mode 100644
index 0000000..cb6ada3
Binary files /dev/null and b/static/common/phone-1.png differ
diff --git a/static/common/success-1.png b/static/common/success-1.png
new file mode 100644
index 0000000..8f8ad84
Binary files /dev/null and b/static/common/success-1.png differ
diff --git a/utils/config.js b/utils/config.js
index ab0dd22..2ebca0e 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,11 +2,11 @@
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
-export const BASE_URL = "https://api.tbmall.xin"; //生产
-export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
//
-// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
-// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
+export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
+export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
export const SHARE_URL = 'https://h.tbmall.xin';