diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index 9993b3b..ac8aacb 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -209,8 +209,11 @@
},
},
watch: {
+ deep:true,
symbol: {
- handler: function() {}
+ handler: function() {
+ this.getContractOrderList()
+ }
},
},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index ce32c04..1a67081 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -29,7 +29,6 @@
-
diff --git a/pages/mine/mineDetails.vue b/pages/mine/mineDetails.vue
index 22dda47..2f023ef 100644
--- a/pages/mine/mineDetails.vue
+++ b/pages/mine/mineDetails.vue
@@ -8,11 +8,10 @@
-
+
- {{ detail.mineDetails.name }}
- {{ detail.userCapital }} {{detail.mineDetails.baseCoin}}
+ {{ i18n.YourBTC }}{{" "}}{{ detail.mineDetails.baseCoin }}
+ {{ detail.userCapital }}
@@ -55,6 +54,7 @@
name: "mineDetails",
data() {
return {
+ baseURL:'',
id:null,
info: {
productId: null,
@@ -87,6 +87,7 @@
onLoad(res) {
this.id=res.id
this.getMineDetail(this.id)
+ this.baseURL = constant.BASE_URL
this.imgAddress = res.imgAddress
},
onShow() {},
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index ef36f0c..bcdba11 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -228,7 +228,7 @@
// this.getQr(img)
this.coinAddress = this.i18n.PleaseChooseCoin;
this.coin = this.i18n.PleaseChooseCoin
- this.qr = this.getQr(this.i18n.PleaseChooseCoin)
+ this.qr = QR.createQrCodeImg(this.i18n.PleaseChooseCoin)
this.message = this.i18n.message.replace('{rechargeMinAmount}', '').replaceAll(
'{enname}', '')
} else {
@@ -238,7 +238,6 @@
}
// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
api.rechargeAddress(coinInfo).then(res => {
-
this.coinAddress = res.address
this.qr = this.getQr(this.coinAddress)
this.rechargeMinAmount = res.rechargeMinAmount
diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue
index 69b7b80..5dfd1b8 100644
--- a/pages/withdrawal/withdrawal.vue
+++ b/pages/withdrawal/withdrawal.vue
@@ -46,9 +46,9 @@
-
+
@@ -58,13 +58,13 @@
{{ i18n.ALL }}
-
+
+ :value="selectCoinInfo.withdrawMinAmount" rightColor="#A1A0A8">
-
+
+ :value="withdrawFeeAmount" rightColor="#A1A0A8">
{{ i18n.PaymentPassword }}
@@ -538,7 +538,7 @@
border-radius: 16px;
color: #00E8A2;
font-size: 28rpx;
- padding: 8rpx 20rpx 8rpx 68rpx;
+ padding: 8rpx 20rpx 5rpx 68rpx;
// 超出字符省略成...
overflow: hidden;
text-overflow: ellipsis;
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index d5e7330..b430c23 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -38,8 +38,8 @@
-
-
+
+
@@ -189,6 +189,10 @@