From b8f6f514b675fa6a006dfafbc99303b3c5c8ba85 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Fri, 17 May 2024 10:52:12 +0800
Subject: [PATCH] 一鍵平倉增加英文多语言，IFSC改成Select recharge account
---
src/page/user/recharge.vue | 144 ++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/src/page/user/recharge.vue b/src/page/user/recharge.vue
index 24a0ad6..0d26405 100644
--- a/src/page/user/recharge.vue
+++ b/src/page/user/recharge.vue
@@ -3,18 +3,36 @@
<van-nav-bar
:placeholder="true"
:safe-area-inset-top="true"
- title="充值中心"
+ :title="$t('充值中心')"
left-arrow
@click-left="onClickLeft"
- />
+ >
+ <template #right>
+ <van-icon
+ @click="$router.push('/rechargelist')"
+ name="orders-o"
+ size="20"
+ />
+ </template>
+ </van-nav-bar>
<main>
<div>
- <div class="main-title">{{ $t("支持得支付渠道") }}</div>
- <van-cell
- is-link
- :title="paymentSelectData.channelAccount || $t('請選擇')"
- @click="paymentShow = true"
- />
+ <!-- <div class="main-title">IFSC</div>-->
+ <div class="main-title">Select recharge account</div>
+ <div class="white-input" @click="paymentShow = true">
+ <span>{{ paymentSelectData.channelAccount || $t('請選擇') }}</span>
+ <i
+ v-if="paymentSelectData.channelAccount"
+ class="iconfont icon-fuzhi fuzhi"
+ @click.stop="(e) => copyText(e, paymentSelectData.channelAccount)"
+ ></i>
+ <van-icon v-else class="myr" name="arrow" />
+ </div>
+ <!-- <van-cell-->
+ <!-- is-link-->
+ <!-- :title="paymentSelectData.channelAccount || $t('請選擇')"-->
+ <!-- @click="paymentShow = true"-->
+ <!-- />-->
<!-- paymentSelectData.channelMinLimit -->
<van-action-sheet
v-model="paymentShow"
@@ -23,16 +41,36 @@
close-on-click-action
@select="paymentSelect"
/>
+ <template v-if="paymentSelectData.channelAccount !== undefined">
+ <div class="main-title">{{ $t("請選擇充值賬戶") }}</div>
+ <van-cell
+ is-link
+ :title="$t(rechargeAccountData.key) || $t('請選擇')"
+ />
+ <van-action-sheet
+ v-model="rechargeAccountShow"
+ :actions="rechargeAccountActions"
+ :cancel-text="$t('qx')"
+ />
+ </template>
<template v-if="paymentSelectData.channelAccount !== undefined">
- <div class="main-title">{{ $t("收款卡號") }}</div>
+ <div class="main-title">{{ $t("银行帐号") }}</div>
+ <div class="white-input">
+ <span>{{ paymentSelectData.bankNumber }}</span>
+ <i
+ class="iconfont icon-fuzhi fuzhi"
+ @click="(e) => copyText(e, paymentSelectData.bankNumber)"
+ ></i>
+ </div>
+<!-- <div class="main-title">{{ $t("收款卡號") }}</div>
<div class="white-input">
<span>{{ paymentSelectData.channelAccount }}</span>
<i
class="iconfont icon-fuzhi fuzhi"
- @click="(e) => copyText(e, channelAccount)"
+ @click="(e) => copyText(e, paymentSelectData.channelAccount)"
></i>
- </div>
+ </div>-->
<div class="main-title">{{ $t("收款銀行") }}</div>
<div class="white-input">
<span>{{ paymentSelectData.channelDesc }}</span>
@@ -43,22 +81,12 @@
</div>
<div class="main-title">{{ $t("收款人名字") }}</div>
<div class="white-input">
- <span>{{ paymentSelectData.channelImg }}</span>
+ <span>{{ paymentSelectData.channelName }}</span>
<i
class="iconfont icon-fuzhi fuzhi"
- @click="(e) => copyText(e, channelImg)"
+ @click="(e) => copyText(e, paymentSelectData.channelName)"
></i>
</div>
- <div class="main-title">{{ $t("請選擇充值賬戶") }}</div>
- <van-cell is-link :title="rechargeAccountData.name || $t('請選擇')" />
- <!-- @click="rechargeAccountShow = true" -->
- <van-action-sheet
- v-model="rechargeAccountShow"
- :actions="rechargeAccountActions"
- :cancel-text="$t('qx')"
- />
- <!-- close-on-click-action -->
- <!-- @select="rechargeAccountSelect" -->
<div class="main-title">{{ $t("請選擇充值金額") }}</div>
<div class="white-input">
<input type="number" :value="value" @input="inputValue" />
@@ -66,13 +94,6 @@
</div>
<div class="bottom-text">
- <!---->
- <!-- <div class="balance">
- <div>需要支付</div>
- <div class="balance-text" style="margin-bottom: 0px">
- 0.0000 {{ rechargeAccountData.symbolCode }}
- </div>
- </div> -->
<div class="balance" style="margin-top: 10px">
<div>{{ $t("最小充值金額") }}</div>
<div class="balance-text" style="margin-bottom: 0px">
@@ -86,6 +107,7 @@
{{ $t("上傳憑證：") }}
</div>
<el-upload
+ v-loading="loading"
:with-credentials="true"
class="avatar-uploader"
:action="admin + '/user/upload.do'"
@@ -107,8 +129,8 @@
</el-upload>
</div>
</div>
+ <!-- :disabled="butFlg" -->
<van-button
- :disabled="butFlg"
class="but"
type="primary"
style="margin-top: 1.04rem; margin-bottom: 1.04rem"
@@ -127,6 +149,7 @@
import apiUrl from "@/axios/api.url.js";
import { siteGetPayInfo, selCzFn } from "../../axios/api";
import { Notify } from "vant";
+import { rechargeAccountActions } from "@/utils/rechargeActions";
// baseURL
export default {
components: { ActionSheet, [Notify.Component.name]: Notify.Component },
@@ -136,6 +159,7 @@
// getPayInfo
data() {
return {
+ loading: false,
butFlg: true,
admin: apiUrl.baseURL,
value: 0,
@@ -143,38 +167,11 @@
paymentSelectData: {},
rechargeAccountData: {},
show: false,
- actions: [{ name: "銀行卡充值", key: "YHK" }],
+ actions: [{ name: this.$t("銀行卡充值"), key: "YHK" }],
paymentShow: false,
paymentActions: [],
rechargeAccountShow: false,
- rechargeAccountActions: [
- {
- title: this.$t("美股資產"),
- title1: this.$t("美股可用"),
- title2: this.$t("美股冻结"),
- name: this.$t("US"),
- key: "US",
- symbol: "$",
- symbolCode: "USD",
- },
- // {
- // title: this.$t("印股資產"),
- // title1: this.$t("印股可用"),
- // title2: this.$t("印股冻结"),
- // key: "IN",
- // symbol: "RM",
- // symbolCode: "MYR",
- // },
- {
- name: this.$t("MAS"),
- title: this.$t("馬股資產"),
- title1: this.$t("馬股可用"),
- title2: this.$t("馬股冻结"),
- key: "MAS",
- symbol: "RM",
- symbolCode: "MYR",
- },
- ],
+ rechargeAccountActions: rechargeAccountActions,
showBtn: true,
imgStatus: false,
form: {
@@ -196,7 +193,6 @@
this.judgeValue();
},
async selCzFns() {
- // payTypeId payAmt img
if (!this.value) {
return Notify(this.$t("hj171"));
}
@@ -209,9 +205,9 @@
img: this.form.img1key,
});
if (res.status === 0) {
- Notify({ type: "success", message: "充值成功" });
+ Notify({ type: "success", message: this.$t("hj182") });
setTimeout(() => {
- this.onClickLeft();
+ this.$router.push("/rechargelist");
}, 500);
}
// Notify("请上传文件");
@@ -220,32 +216,35 @@
const res = await siteGetPayInfo();
if (res.status === 0) {
res.data.map((item) => {
- item.name = item.channelAccount;
+ item.name = item.channelType;
});
this.paymentActions = res.data;
+ console.log(this.paymentActions)
}
console.log(res);
},
handleAvatarSuccess(res, file) {
this.imgStatus = false;
this.form.img1key = res.data.url;
+ this.loading = false;
this.judgeValue();
},
beforeAvatarUpload(file) {
+ this.loading = true;
this.judgeValue();
this.imgStatus = true;
},
handleError() {
+ this.loading = false;
this.imgStatus = false;
},
// upload
async afterRead(file) {
- console.log(file);
let formData = new FormData();
formData.append("file", file.file || file.raw);
- console.log(formData);
+ // console.log(formData);
const res = await upload({ file: formData });
- console.log(res);
+ // console.log(res);
},
copyText(e, data) {
var clipboard = new ClipboardJS(".copy-button", {
@@ -253,7 +252,6 @@
});
clipboard.on("success", () => {
- // alert("已复制到剪贴板");
clipboard.destroy();
});
@@ -270,14 +268,12 @@
},
paymentSelect(e) {
this.paymentSelectData = e;
- console.log(e);
+ console.log(this.rechargeAccountActions,e)
this.rechargeAccountActions.map((item) => {
- console.log(item, e);
if (item.key === e.assetsType) {
this.rechargeAccountData = item;
}
});
- console.log(this.rechargeAccountData, " this.rechargeAccountData");
},
},
};
@@ -408,4 +404,8 @@
/deep/ .el-upload__input {
display: none !important;
}
-</style>
\ No newline at end of file
+/deep/ .avatar-uploader {
+ width: 2.740741rem;
+ height: 2.740741rem;
+}
+</style>
--
Gitblit v1.9.3