diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue
index c4f6c08..dd32b50 100644
--- a/components/KeyValueRow/KeyValueRow.vue
+++ b/components/KeyValueRow/KeyValueRow.vue
@@ -9,6 +9,7 @@
keyName
}}
{{
value
}}
@@ -73,6 +74,12 @@ export default {
return false
}
},
+ isRemarks: {
+ type: Boolean,
+ default() {
+ return false
+ }
+ },
},
data() {
return {
@@ -92,10 +99,18 @@ export default {
diff --git a/pages/recharge/outPage.vue b/pages/recharge/outPage.vue
new file mode 100644
index 0000000..7e20a3b
--- /dev/null
+++ b/pages/recharge/outPage.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index dfda2ec..677cd0d 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -169,7 +169,10 @@
plus.runtime.openURL(res.msg);
// #endif
// #ifdef H5
- window.open(res.msg, '_blank');
+ // window.open(res.msg, '_blank');
+ uni.navigateTo({
+ url:'/pages/recharge/outPage?url='+res.msg
+ })
// #endif
}
if (res.code == 1) {
@@ -220,13 +223,12 @@
this.qr = QR.createQrCodeImg(e)
},
getRechargeInfo(e) {
-
api.rechargeConfig({
type: this.pageState
}).then(res => {
this.reInfo = res
if (this.pageState == 'crypto') {
- if (this.reInfo.coins[0].address) {
+ // if (this.reInfo.coins[0].address) {
// this.coinAddress = this.reInfo.coins[0].address
// let img = this.reInfo.coins[0].address
// this.coin = this.$i18n.PleaseChooseCoin
@@ -237,19 +239,19 @@
this.qr = QR.createQrCodeImg(this.i18n.PleaseChooseCoin)
this.message = this.i18n.message.replace('{rechargeMinAmount}', '').replaceAll(
'{enname}', '')
- } else {
-
- let coinInfo = {
- coinCode: this.reInfo.coins[0].code
- }
- // 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
- api.rechargeAddress(coinInfo).then(res => {
- this.coinAddress = res.address
- this.qr = this.getQr(this.coinAddress)
- this.rechargeMinAmount = res.rechargeMinAmount
- this.enname = res.enname
- })
- }
+ // } else {
+
+ // let coinInfo = {
+ // coinCode: this.reInfo.coins[0].code
+ // }
+ // // 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
+ // api.rechargeAddress(coinInfo).then(res => {
+ // this.coinAddress = res.address
+ // this.qr = this.getQr(this.coinAddress)
+ // this.rechargeMinAmount = res.rechargeMinAmount
+ // this.enname = res.enname
+ // })
+ // }
} else {
this.reInfo.fastAmount = this.reInfo.fastAmount.split(',')
this.onlineInfo.tranAmt = this.reInfo.fastAmount[0]
diff --git a/pages/withdrawal/addOrEditBankCard.vue b/pages/withdrawal/addOrEditBankCard.vue
index 700ed4d..8634f76 100644
--- a/pages/withdrawal/addOrEditBankCard.vue
+++ b/pages/withdrawal/addOrEditBankCard.vue
@@ -28,7 +28,7 @@
- {{ i18n.IDcard }}
+
+
@@ -130,7 +128,7 @@
return this.$t("withdrawal");
},
btnIsCanClick() {
- if (this.bankInfo.bankCode && this.bankInfo.bankName && this.bankInfo.acctName && this.bankInfo.acctId && this.bankInfo.certImg) {
+ if (this.bankInfo.bankCode && this.bankInfo.bankName && this.bankInfo.acctName && this.bankInfo.acctId) {
return false
} else {
return true
diff --git a/pages/withdrawal/chooseAddress.vue b/pages/withdrawal/chooseAddress.vue
index fc676ce..68ef666 100644
--- a/pages/withdrawal/chooseAddress.vue
+++ b/pages/withdrawal/chooseAddress.vue
@@ -186,10 +186,13 @@
this.editCoinAddressIndex = addressIndex.id;
}
} else {
+ // console.log(addressIndex)
// 选择地址情况下 点击地址返回传参有问题 可能要通用vuex解决
uni.$emit('coinAddressChang', {
coinid: addressIndex.id,
coinAddress: addressIndex.address,
+ coinCode:addressIndex.coinCode,
+ coinEnname:addressIndex.coinEnname
});
uni.navigateBack()
diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue
index f03461b..941a2a5 100644
--- a/pages/withdrawal/withdrawal.vue
+++ b/pages/withdrawal/withdrawal.vue
@@ -255,10 +255,13 @@
this.baseURL = constant.BASE_URL
// 监听事件
uni.$on('coinAddressChang', (data) => {
+ console.log(data)
this.coinAddress = data.coinAddress
this.coinInfo.addressId = data.coinid
+ this.coinInfo.coinCode = data.coinEnname
+ this.coinInfo.coinCode2 = data.coinCode
})
- this.getWithConfig();
+ this.getWithConfig(true);
},
onUnload() {
// 移除监听事件
@@ -309,7 +312,7 @@
this.coinAddress='';
},
// 获取提现配置
- getWithConfig() {
+ getWithConfig(type) {
// 提现配置信息
// 重置信息 避免报错
this.withdrawInfo={
@@ -324,9 +327,12 @@
if (this.pageState == 'crypto') {
// 进来默认选中第一个币
this.withdrawInfo = res
- this.coinInfo.coinCode = this.withdrawInfo.coins[0].enname
- this.selectCoinInfo = this.withdrawInfo.coins[0]
- this.coinInfo.coinCode2 = this.withdrawInfo.coins[0].code
+ if(type){
+ this.coinInfo.coinCode = this.withdrawInfo.coins[0].enname
+ this.selectCoinInfo = this.withdrawInfo.coins[0]
+ this.coinInfo.coinCode2 = this.withdrawInfo.coins[0].code
+ }
+
} else {
// 法币
this.withdrawInfo = res
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index b149119..93b40d0 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -24,14 +24,15 @@
+ item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#F4506A'">
+
@@ -53,14 +54,15 @@
-->
+ item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#F4506A'">
+
diff --git a/utils/api.js b/utils/api.js
index 2628cad..de5dbfd 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -98,8 +98,9 @@ const api = {
billList: (params) => Vue.prototype.$axios.post('/api/user/billList',params),//账单记录
userInfo: (params) => Vue.prototype.$axios.post('/api/user/userInfo',params),//会员基本信息
updatePayPassword: (params) => Vue.prototype.$axios.post('/api/user/updatePayPassword',params),//修改提现密码
-
-
+
+ certification: (params) => Vue.prototype.$axios.post('/api/user/certification',params),//保存实名认证信息
+ certificationInfo: (params) => Vue.prototype.$axios.post('/api/user/certificationInfo',params),//获取实名认证信息
}
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 2a9fe3d..6891bd8 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -254,6 +254,15 @@ export default {
// withdrawal
withdrawal: {
+ enterIdCard:'Upload the front of the ID photo',
+ conFirmInfo:'Real name authentication',
+ apply:'apply',
+ agree:'agree',
+ reject:'reject',
+ infoStatus:'Audit status',
+ idNumber:'ID Number',
+ Reasonforrejection:'Reason for rejection',
+ remarks:'Reason',
IDcard:'Upload photo ID front',
shang:'Uploading',
// 漏掉的国际化
@@ -326,6 +335,9 @@ export default {
enterName: 'Please enter your name',
Account: 'Account',
enterAccount: 'Please enter your Account',
+
+ enterIdNumber: 'Please enter your ID Number',
+
BankName: 'Bank Name',
enterBankName: 'Please enter bank name',
BankCode: 'Bank Code',
@@ -388,7 +400,7 @@ export default {
//me
me: {
-
+ conFirmInfo:'Real name authentication',
// 漏掉的
Balanceaccount:'Balance account',
Contractaccount:'Contract account',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 95331de..41a6a63 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -251,6 +251,15 @@ export default {
// withdrawal
withdrawal: {
+ Reasonforrejection:'Lý do từ chối',
+ enterIdCard:'Tải lên mặt trước ảnh nhận diện',
+ conFirmInfo:'Xác thực tên thật',
+ apply:'Để xem lại',
+ agree:'Duyệt',
+ reject:'Chấp nhận',
+ infoStatus:'Kiểm tra',
+ idNumber:'Số chứng nhận',
+ remarks:'Lý',
IDcard:'Tải ảnh nhận diện',
shang:'Gửi',
// 漏掉的国际化
@@ -322,6 +331,7 @@ export default {
enterName: 'Vui lòng nhập tên thật của bạn',
Account: 'tài khoản',
enterAccount: 'Vui lòng nhập tài khoản của bạn',
+ enterIdNumber: 'Hãy nhập số nhận diện',
BankName: 'tên ngân hàng',
enterBankName: 'Vui lòng nhập tên ngân hàng',
BankCode: 'Mã ngân hàng',
@@ -381,7 +391,7 @@ export default {
//me
me: {
-
+ conFirmInfo:'Xác thực tên thật',
Balanceaccount: 'Tài khoản tùy chọn',
Contractaccount: 'Hợp đồng',
Postscript: 'hậu',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index d746696..c361cdf 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -257,6 +257,15 @@ export default {
// withdrawal
withdrawal: {
+ Reasonforrejection:'駁回原因',
+ enterIdCard:'請上傳證件照正面',
+ conFirmInfo:'實名認證',
+ apply:'待稽核',
+ agree:'稽核通過',
+ reject:'稽核駁回',
+ infoStatus:'稽核狀態',
+ idNumber:'證件號',
+ remarks:'原因',
IDcard:'上傳證件照正面',
shang:'上傳中',
// 漏掉的国际化
@@ -330,6 +339,7 @@ export default {
enterName: '請輸入你的真實姓名',
Account: '帳戶',
enterAccount: '請輸入您的賬戶',
+ enterIdNumber: '請輸入您的身份證號碼',
BankName: '銀行名稱',
enterBankName: '請輸入銀行名稱',
BankCode: '銀行代碼',
@@ -382,14 +392,14 @@ export default {
Video: '視頻',
WhiteBook: '白皮書',
FullNameOfToken: '幣名全稱:',
- TotalCirculation: '申購價格:',
+ TotalCirculation: '申購數量:',
ICOPrice: '申購價格:',
// ICOTime: '申購時間:',
},
//me
me: {
-
+ conFirmInfo:'實名認證',
Balanceaccount:'交易賬戶',
Contractaccount:'合約帳戶',
Postscript:'備注',