diff --git a/pages.json b/pages.json
index 022bc18..6abe309 100644
--- a/pages.json
+++ b/pages.json
@@ -326,6 +326,27 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "account/shu",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "account/shuAdd",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "account/shuSuccess",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "account/bind",
"style": {
diff --git a/pages/rwa_package/account/components/select-lian.vue b/pages/rwa_package/account/components/select-lian.vue
new file mode 100644
index 0000000..e7d6d99
--- /dev/null
+++ b/pages/rwa_package/account/components/select-lian.vue
@@ -0,0 +1,190 @@
+
+
+
+
+
+ 选择地址
+
+
+
+
+ BNB Smart Chain(BEP20)
+ {{item.addressOne}}
+
+
+
+
+ {{`请先添加一个区块链地址`}}
+
+
+
+
+
+ 添加地址
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/rwa_package/account/components/shu-tips.vue b/pages/rwa_package/account/components/shu-tips.vue
new file mode 100644
index 0000000..7338ac4
--- /dev/null
+++ b/pages/rwa_package/account/components/shu-tips.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+ 兑换方式
+
+
+
+
+
+ 区块链数字积分
+ 通过区块链兑换
+
+
+
+
+
+
+ alpha数字积分
+ 通过邮箱兑换
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/rwa_package/account/index.vue b/pages/rwa_package/account/index.vue
index 2212d66..123ccdf 100644
--- a/pages/rwa_package/account/index.vue
+++ b/pages/rwa_package/account/index.vue
@@ -1,27 +1,21 @@
-
+
-
-
- {{item}}
-
-
-
-
-
-
+
+ 提现成功 ¥{{money || 0}}
+ 由于第三方结算原因,提现成功后可能存在一定延迟请关注提现账户变动情况~
-
+
+
+
diff --git a/pages/rwa_package/account/shuAdd.vue b/pages/rwa_package/account/shuAdd.vue
new file mode 100644
index 0000000..b211cfd
--- /dev/null
+++ b/pages/rwa_package/account/shuAdd.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+ 地址
+
+
+
+ 主网络
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/account/shuSuccess.vue b/pages/rwa_package/account/shuSuccess.vue
new file mode 100644
index 0000000..4a6d2df
--- /dev/null
+++ b/pages/rwa_package/account/shuSuccess.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+ 兑换成功 {{money || 0}}TBC
+ 由于第三方结算原因,兑换成功后可能存在一定延迟请关注兑换账户变动情况~
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/rwa/rwa.vue b/pages/rwa_package/rwa/rwa.vue
index 41e9112..554025d 100644
--- a/pages/rwa_package/rwa/rwa.vue
+++ b/pages/rwa_package/rwa/rwa.vue
@@ -57,6 +57,7 @@
+
@@ -65,12 +66,15 @@
import { getExchUsers } from '@/api/finance.js';
import { formatDate } from '@/utils/index.js';
import { getAcctBalance } from '@/api/finance.js';
+import ShuTips from '@/pages/rwa_package/account/components/shu-tips.vue';
+
export default {
data() {
return {
balanceObj: {},
amountList: [],
+ tipsShow:false,
form: {
page: 1,
pageSize: 10,
@@ -78,21 +82,36 @@ export default {
loading: false,
}
},
+ components:{ShuTips},
onShow() {
this.getAcctBalance();
this.loadData();
},
methods: {
formatDate,
+ onClose(){
+ this.tipsShow = false;
+ },
+ onOk(index){
+ if(index == 0){
+ uni.navigateTo({
+ url: '/pages/rwa_package/account/shu?money=' + this.balanceObj.curAmount,
+ })
+ }else if(index == 1){
+ uni.navigateTo({
+ url: '/pages/rwa_package/rwa_binding/rwa_binding',
+ })
+ }
+ this.onClose();
+ },
leftJump() {
uni.switchTab({
url: '/pages/mine/mine',
});
},
addRwa() {
- uni.navigateTo({
- url: '/pages/rwa_package/rwa_binding/rwa_binding',
- })
+ this.tipsShow = true;
+
},
addWithdrawal() {
uni.navigateTo({
@@ -137,6 +156,7 @@ export default {
},
// 模拟获取数据的方法,实际应用中应该替换为你的数据获取逻辑,例如从服务器获取数据
async fetchData(page, pageSize) {
+
const params = {
page,
pageSize,
diff --git a/static/new/eye_0.png b/static/new/eye_0.png
new file mode 100644
index 0000000..80c8b41
Binary files /dev/null and b/static/new/eye_0.png differ
diff --git a/static/new/eye_1.png b/static/new/eye_1.png
new file mode 100644
index 0000000..87842fd
Binary files /dev/null and b/static/new/eye_1.png differ
diff --git a/static/new/icon.png b/static/new/icon.png
new file mode 100644
index 0000000..4107460
Binary files /dev/null and b/static/new/icon.png differ
diff --git a/static/new/right_icon.png b/static/new/right_icon.png
new file mode 100644
index 0000000..e270286
Binary files /dev/null and b/static/new/right_icon.png differ
diff --git a/static/new/shu_0.png b/static/new/shu_0.png
new file mode 100644
index 0000000..f6611f9
Binary files /dev/null and b/static/new/shu_0.png differ
diff --git a/static/new/shu_1.png b/static/new/shu_1.png
new file mode 100644
index 0000000..dd1cfb6
Binary files /dev/null and b/static/new/shu_1.png differ
diff --git a/utils/config.js b/utils/config.js
index baf941f..e329e05 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,9 +2,9 @@
// export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
-export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
// export const BASE_URL ='http://api.hm.a-d.work:6880' // 测试
-// export const BASE_URL ='https://api.o.tbmall.xin' // 本地测试
+export const BASE_URL ='https://api.o.tbmall.xin' // 本地测试
diff --git a/utils/func.js b/utils/func.js
index 094cbcb..3b35c52 100644
--- a/utils/func.js
+++ b/utils/func.js
@@ -58,6 +58,20 @@ export default {
}, wait)
}
},
+ checkInputNum(value,max = null,num = null){
+ if(max === 0){
+ return '';
+ }
+ // value = value.replace(/^0*/g, ''); // 第一个数不能为0 ,若为0替换为空
+ value = value.replace(/[^\d]/g,''); // 是否是数字,若是除数字之外的则替换为空
+ if(num && value.length > num){
+ value = value.substr(0, num);
+ }
+ if(max && (Number(value) >= Number(max))){
+ value = max;
+ }
+ return value;
+ },
checkInputPrice(value,max = null) {
if(max === 0){
return '';
@@ -72,7 +86,16 @@ export default {
value = max;
}
return value;
- }
+ },
+ addressTurn(val,num = 9) {
+ if (val.length < 10) {
+ return val
+ } else {
+ let str = val.slice(num, val.length - num)
+ val = val.replace(str, '...')
+ return val
+ }
+ },
}