From 89eb1953276808d19df0f7d4efdb1d45e08b0591 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Fri, 17 May 2024 14:18:54 +0800
Subject: [PATCH] 111
---
src/locales/taiyu.json | 8
src/locales/zh.json | 8
src/locales/india.json | 8
src/locales/tw.json | 8
src/page/user/recharge-sure.vue | 155 ++++++++-
src/page/user/recharge.vue | 44 +-
src/page/bankCard/index.vue | 571 +++++++++++++++++++------------------
/dev/null | 19 -
src/axios/index.js | 4
src/locales/en.json | 9
src/page/user/ransferIndex.vue | 2
src/locales/hanyu.json | 8
src/locales/riyu.json | 8
13 files changed, 499 insertions(+), 353 deletions(-)
diff --git a/config/index.js b/config/index.js
deleted file mode 100644
index e13df1c..0000000
--- a/config/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-"use strict";
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require("path");
-
-module.exports = {
- dev: {
- // Paths
- assetsSubDirectory: "static",
- assetsPublicPath: "/",
- proxyTable: {
- // '/api': {
- // target:'http://43.198.126.79:8091/',
- // secure: false,
- // changeOrigin: true,
- // pathRewrite: {
- // '^/api': '/'
- // }
- // },
- "/": {
- // target: 'https://pc.zsycyy.com',
- // target: 'http://www.shehua56.com',
- target: "http://121.43.237.202:8091/",
- // target:'https://api.guosen.org/',
- secure: false,
- changeOrigin: true,
- pathRewrite: {
- "^/": "/"
- }
- },
- "/dk": {
- target: "http://121.43.237.202:8091/",
- secure: false,
- changeOrigin: true,
- pathRewrite: {
- "^/dk": "/dk"
- }
- }
- },
-
- // Various Dev Server settings
- host: "0.0.0.0", // can be overwritten by process.env.HOST
- port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
- autoOpenBrowser: true,
- errorOverlay: true,
- notifyOnErrors: true,
- poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
- // Use Eslint Loader?
- // If true, your code will be linted during bundling and
- // linting errors and warnings will be shown in the console.
- useEslint: false,
- // If true, eslint errors and warnings will also be shown in the error overlay
- // in the browser.
- showEslintErrorsInOverlay: false,
-
- /**
- * Source Maps
- */
-
- // https://webpack.js.org/configuration/devtool/#development
- devtool: "cheap-module-eval-source-map",
-
- // If you have problems debugging vue-files in devtools,
- // set this to false - it *may* help
- // https://vue-loader.vuejs.org/en/options.html#cachebusting
- cacheBusting: true,
-
- cssSourceMap: true
- },
-
- build: {
- // Template for index.html
- index: path.resolve(__dirname, "../dist/index.html"),
-
- // Paths
- assetsRoot: path.resolve(__dirname, "../dist"),
- assetsSubDirectory: "static",
- assetsPublicPath: "./",
-
- /**
- * Source Maps
- */
-
- productionSourceMap: false,
- // https://webpack.js.org/configuration/devtool/#production
- devtool: "#source-map",
-
- // Gzip off by default as many popular static hosts such as
- // Surge or Netlify already gzip all static assets for you.
- // Before setting to `true`, make sure to:
- // npm install --save-dev compression-webpack-plugin
- productionGzip: false,
- productionGzipExtensions: ["js", "css"],
-
- // Run the build command with an extra argument to
- // View the bundle analyzer report after build finishes:
- // `npm run build --report`
- // Set to `true` or `false` to always turn it on or off
- bundleAnalyzerReport: process.env.npm_config_report
- }
-};
diff --git a/src/axios/api.url.js b/src/axios/api.url.js
deleted file mode 100644
index 1ed1891..0000000
--- a/src/axios/api.url.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// const ENV = process.env.NODE_ENV
-export default {
- DOMAIN: "https://brac.barcblays.com/",
- // baseURL: ENV == 'development'?'https://api.guosen.org/':'https://api.guosen.org/',
- // baseURL: 'http://localhost:8070',
- /* Util API */
- // baseURL: '/',
- // baseURL: 'http://www.jumptalk.net:8091',
- // 0311
- // baseURL: "http://192.168.0.111:8091/",
- // baseURL: "https://brac.barcblays.com/",
- // 本地
- baseURL: "http://192.168.0.105:8091/",
- util: {
- image: "/util/image.html" // 图片上传
- }
-};
-// https://api.guosen.org
-//
diff --git a/src/axios/index.js b/src/axios/index.js
index f7c1824..9c47f09 100644
--- a/src/axios/index.js
+++ b/src/axios/index.js
@@ -40,7 +40,9 @@
// ajax请求回调之前拦截 对请求返回的信息做统一处理 比如error为401无权限则跳转到登陆界面
axios.interceptors.response.use(
response => {
- if (response.data && response.data.status === 401) {
+ let {current} = router.history
+ console.log(current,'router')
+ if (response.data && response.data.status === 401 && current.path != '/register') {
store.commit("undataToken", null);
window.localStorage.setItem("USERTOKEN", null);
router.push("/login");
diff --git a/src/locales/en.json b/src/locales/en.json
index 67d6739..b6036d1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -291,6 +291,7 @@
"hj170": "Recharge amount",
"hj170a": "recharge method",
"hj171a": "Please select a recharge method",
+ "一鍵平倉": "Close a position with one click",
"hj171": "Please enter the recharge amount",
"hj172": "top up",
"hj173": "Operating procedures",
@@ -555,5 +556,11 @@
"请登录": "please sign in",
"请输入邮箱号": "Please enter your email number",
"获取验证码": "get verification code",
- "银行帐号" : "Bank account"
+ "银行帐号" : "Bank account",
+ "请将银行账户设置为": "Please set your bank account to",
+ "请设置银行名称": "Please set bank name",
+ "姓名": "Name",
+ "请将姓名设置为": "Please set name to",
+ "请设置ifsc": "Please set ifsc",
+ "提款帐户": "Withdrawal account"
}
diff --git a/src/locales/hanyu.json b/src/locales/hanyu.json
index e99881b..2c6d0ed 100644
--- a/src/locales/hanyu.json
+++ b/src/locales/hanyu.json
@@ -544,5 +544,11 @@
"请登录": "로그인 해주세요",
"请输入邮箱号": "이메일 번호를 입력해주세요",
"获取验证码": "인증 코드 받기",
- "银行帐号" : "은행 계좌"
+ "银行帐号" : "은행 계좌",
+ "请将银行账户设置为": "은행 계좌를 다음으로 설정하세요.",
+ "请设置银行名称": "은행명을 설정해주세요",
+ "姓名": "이름",
+ "请将姓名设置为": "이름을 다음으로 설정하세요.",
+ "请设置ifsc": "ifsc를 설정해주세요",
+ "提款帐户": "출금계좌"
}
diff --git a/src/locales/india.json b/src/locales/india.json
index ab28cf5..3ab5f72 100644
--- a/src/locales/india.json
+++ b/src/locales/india.json
@@ -555,5 +555,11 @@
"请登录": "साइन इन करें",
"请输入邮箱号": "कृपया अपना ईमेल नंबर दर्ज करें",
"获取验证码": "सत्यापन कोड प्राप्त करें",
- "银行帐号" : "बैंक खाता"
+ "银行帐号" : "बैंक खाता",
+ "请将银行账户设置为": "कृपया अपना बैंक खाता यहां सेट करें",
+ "请设置银行名称": "कृपया बैंक का नाम निर्धारित करें",
+ "姓名": "नाम",
+ "请将姓名设置为": "कृपया नाम सेट करें",
+ "请设置ifsc": "कृपया ifsc सेट करें",
+ "提款帐户": "वापसी के खाते"
}
diff --git a/src/locales/riyu.json b/src/locales/riyu.json
index cd5dd80..5976565 100644
--- a/src/locales/riyu.json
+++ b/src/locales/riyu.json
@@ -544,5 +544,11 @@
"请登录": "サインインしてください",
"请输入邮箱号": "メール番号を入力してください",
"获取验证码": "確認コードを取得する",
- "银行帐号" : "銀行口座"
+ "银行帐号" : "銀行口座",
+ "请将银行账户设置为": "銀行口座を次のように設定してください",
+ "请设置银行名称": "銀行名を設定してください",
+ "姓名": "名前",
+ "请将姓名设置为": "名前を次のように設定してください",
+ "请设置ifsc": "ifscを設定してください",
+ "提款帐户": "出金口座"
}
diff --git a/src/locales/taiyu.json b/src/locales/taiyu.json
index 42939df..f7017a4 100644
--- a/src/locales/taiyu.json
+++ b/src/locales/taiyu.json
@@ -544,5 +544,11 @@
"请登录": "กรุณาเข้าสู่ระบบ",
"请输入邮箱号": "กรุณากรอกหมายเลขอีเมล์ของคุณ",
"获取验证码": "รับรหัสยืนยัน",
- "银行帐号" : "บัญชีธนาคาร"
+ "银行帐号" : "บัญชีธนาคาร",
+ "请将银行账户设置为": "กรุณาตั้งค่าบัญชีธนาคารของคุณเป็น",
+ "请设置银行名称": "กรุณาตั้งชื่อธนาคาร",
+ "姓名": "ชื่อ",
+ "请将姓名设置为": "กรุณาตั้งชื่อเป็น",
+ "请设置ifsc": "โปรดตั้งค่า ifsc",
+ "提款帐户": "บัญชีถอนเงิน"
}
diff --git a/src/locales/tw.json b/src/locales/tw.json
index 9211fae..8c657ce 100644
--- a/src/locales/tw.json
+++ b/src/locales/tw.json
@@ -549,5 +549,11 @@
"请登录": "請登入",
"请输入邮箱号": "請輸入郵件號碼",
"获取验证码": "取得驗證碼",
- "银行帐号" : "銀行帳號"
+ "银行帐号" : "銀行帳號",
+ "请将银行账户设置为": "請將銀行帳戶設定為",
+ "请设置银行名称": "請設定銀行名稱",
+ "姓名": "姓名",
+ "请将姓名设置为": "請將姓名設定為",
+ "请设置ifsc": "請設定ifsc",
+ "提款帐户": "提款帳戶"
}
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 2d9c7e8..d6d1451 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -544,5 +544,11 @@
"请登录": "请登录",
"请输入邮箱号": "请输入邮箱号",
"获取验证码": "获取验证码",
- "银行帐号" : "获取验证码"
+ "银行帐号" : "银行帐号",
+ "请将银行账户设置为": "请将银行账户设置为",
+ "请设置银行名称": "请设置银行名称",
+ "姓名": "姓名",
+ "请将姓名设置为": "请将姓名设置为",
+ "请设置ifsc": "请设置ifsc",
+ "提款帐户": "提款帐户"
}
diff --git a/src/page/bankCard/index.vue b/src/page/bankCard/index.vue
index 8f75351..146320c 100644
--- a/src/page/bankCard/index.vue
+++ b/src/page/bankCard/index.vue
@@ -1,62 +1,75 @@
<template>
- <div class="bank_card_page">
- <div class="content">
- <div class="top_back">
- <div class="left_back_icon" @click="$router.go(-1)">
- <img src="../../assets/img/zuojiantou.png" alt />
- </div>
- </div>
- <div class="titles">
- <span>{{ addBank ? $t('hj211') : $t('hj212') }}</span>
- </div>
- <div class="bank_name" v-if="addBank==false&&actualName">
- <div class="lefts">
- <span>{{$t('hj195')}}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />
+ <div class="bank_card_page">
+ <div class="content">
+ <div class="top_back">
+ <div class="left_back_icon" @click="$router.go(-1)">
+ <img src="../../assets/img/zuojiantou.png" alt/>
</div>
</div>
- <div class="bank_name" v-if="addBank==false&&bankName">
- <div class="lefts">
- <span>{{ $t('hj213') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" />
- </div>
- </div>
- <div class="bank_name" v-if="addBank==false&&bankNo">
- <div class="lefts">
- <span>{{ $t('hj215') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank" />
- </div>
- </div>
- <div class="bank_name" v-if="addBank==false&&banif">
- <div class="lefts">
- <span>{{ $t('hj303') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank" />
- </div>
- </div>
- <!-- <div class="bank_name" v-if="addBank==false&&bankun">
- <div class="lefts">
- <span>{{ $t('hj304') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
- </div>
- </div> -->
- <div class="bank_name" v-if="addBank==true">
+ <div class="titles">
+ <span>{{ addBank ? $t('hj211') : $t('hj212') }}</span>
+ </div>
+ <!-- <div class="bank_name" v-if="addBank==false&&actualName">-->
+ <!-- <div class="lefts">-->
+ <!-- <span>{{$t('hj195')}}</span>-->
+ <!-- </div>-->
+ <!-- <div class="rights">-->
+ <!-- <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div class="bank_name" v-if="addBank==false&&bankName">
<div class="lefts">
- <span>{{ $t('hj195') }}</span>
+ <span>{{ $t('hj213') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank"/>
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==false&&bankNo">
+ <div class="lefts">
+ <span>{{ $t('hj215') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank"/>
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==false&&banif">
+ <div class="lefts">
+ <span>{{ $t('hj303') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank"/>
+ </div>
+ </div>
+ <!-- <div class="bank_name" v-if="addBank==false&&bankun">
+ <div class="lefts">
+ <span>{{ $t('hj304') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
+ </div>
+ </div> -->
+
+<!-- <div class="bank_name" v-if="addBank==true">-->
+<!-- <div class="lefts">-->
+<!-- <span>{{ $t('hj195') }}</span>-->
+<!-- </div>-->
+
+<!-- <div class="rights">-->
+<!-- <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank"/>-->
+<!-- </div>-->
+<!-- <!– <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> –>-->
+<!-- <!– <picker @change="bindPickerChange" :value="index" :range="array">-->
+<!-- <view >{{array[index].name}}</view>-->
+<!-- </picker> –>-->
+
+<!-- </div>-->
+ <div class="bank_name" @click.stop="gotodaka" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj213') }}</span>
</div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj207')" v-model="actualName" :disabled="!addBank" />
- </div>
+ <div class="rights" style="justify-content: none;">{{ name }}
<!-- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> -->
<!-- <picker @change="bindPickerChange" :value="index" :range="array">
<view >{{array[index].name}}</view>
@@ -64,257 +77,247 @@
</div>
</div>
-
- <div class="bank_name" @click.stop="gotodaka" v-if="addBank==true">
- <div class="lefts">
- <span>{{ $t('hj213') }}</span>
- </div>
-
- <div class="rights" style="justify-content: none;">{{name}}
- <!-- <input type="text" :placeholder="$t('hj306')" v-model="bankName" :disabled="!addBank" /> -->
- <!-- <picker @change="bindPickerChange" :value="index" :range="array">
- <view >{{array[index].name}}</view>
- </picker> -->
-
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj215') }}</span>
</div>
- </div>
- <div class="bank_name" v-if="addBank==true">
- <div class="lefts">
- <span>{{ $t('hj215') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank" />
- </div>
- </div>
- <div class="bank_name" v-if="addBank==true">
- <div class="lefts">
- <span>{{ $t('hj303') }}</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank" />
- </div>
- </div>
- <!-- <div class="bank_name" v-if="addBank==false">
- <div class="lefts">
- <span>{{ $t('hj304') }}123</span>
- </div>
- <div class="rights">
- <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
- </div>
- </div> -->
- <div class="bank_name bind" @click="toSure" v-if="addBank">
- <span>{{ $t('hj216') }}</span>
- </div>
- <div class="bank_hck"></div>
- <div class="bank_code"></div>
- <van-popup v-model="showPicker" round position="bottom">
- <van-picker :confirm-button-text="$t('hj161')" :cancel-button-text="$t('hj106')" value-key="name" :columns="array" @cancel="quxiao" @confirm="onConfirm" show-toolbar />
- </van-popup>
- </div>
- </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj307')" v-model="bankNo" :disabled="!addBank"/>
+ </div>
+ </div>
+ <div class="bank_name" v-if="addBank==true">
+ <div class="lefts">
+ <span>{{ $t('hj303') }}</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj308')" v-model="banif" :disabled="!addBank"/>
+ </div>
+ </div>
+ <!-- <div class="bank_name" v-if="addBank==false">
+ <div class="lefts">
+ <span>{{ $t('hj304') }}123</span>
+ </div>
+ <div class="rights">
+ <input type="text" :placeholder="$t('hj309')" v-model="bankun" :disabled="!addBank" />
+ </div>
+ </div> -->
+ <div class="bank_name bind" @click="toSure" v-if="addBank">
+ <span>{{ $t('hj216') }}</span>
+ </div>
+ <div class="bank_hck"></div>
+ <div class="bank_code"></div>
+ <van-popup v-model="showPicker" round position="bottom">
+ <van-picker :confirm-button-text="$t('hj161')" :cancel-button-text="$t('hj106')" value-key="name"
+ :columns="array"
+ @cancel="quxiao" @confirm="onConfirm" show-toolbar/>
+ </van-popup>
+ </div>
+ </div>
</template>
<script>
- import * as api from "@/axios/api";
- import {
- Toast
- } from "mint-ui";
- import {
- isNull,
- bankNoReg,
- isName
- } from '@/utils/utils'
+import * as api from "@/axios/api";
+import {
+ Toast
+} from "mint-ui";
+import {
+ isNull,
+ bankNoReg,
+ isName
+} from '@/utils/utils'
- export default {
- name: "bankCard",
- data() {
- return {
- showPicker: false,
- actualName: '', //真实姓名
- bankName: "", //银行名称,
- bankAddress: "", //需要精确到分行或者支行,
- bankNo: "", // 印象卡号
- banif: "",
- bankun: "",
- array: [],
- index:0,
- addBank: false,
- id:'',
- code:'',
- name:'',
- };
- },
- created() {
- this.getCardDetail();
- this.getbanklist()
- },
- methods: {
- quxiao(){
- this.showPicker = false
- },
- gotodaka(){
- this.showPicker = true
- },
- onConfirm(item) {
- console.log(item)
- this.id = item.id
- this.code = item.code
- this.name = item.name
- this.showPicker = !this.showPicker
- // this.lever = item.value
- },
- async getbanklist() {
- // 获取银行名称
- let data = await api.getbank()
- if (data.status === 0) {
- console.log(data);
- this.array = data.data
- console.log(this.array);
- } else {}
- },
- async toSure() {
- // 添加银行卡
- if (isNull(this.bankNo)) {
- Toast(this.$t("hj217"));
- } else if (isNull(this.name)) {
- Toast(this.$t("hj218"));
- }else if (isNull(this.banif)) {
- Toast(this.$t("hj218a"));
- }else if(isNull(this.actualName)){
- Toast(this.$t("hj207"));
+export default {
+ name: "bankCard",
+ data() {
+ return {
+ showPicker: false,
+ actualName: '', //真实姓名
+ bankName: "", //银行名称,
+ bankAddress: "", //需要精确到分行或者支行,
+ bankNo: "", // 印象卡号
+ banif: "",
+ bankun: "",
+ array: [],
+ index: 0,
+ addBank: false,
+ id: '',
+ code: '',
+ name: '',
+ };
+ },
+ created() {
+ this.getCardDetail();
+ this.getbanklist()
+ },
+ methods: {
+ quxiao() {
+ this.showPicker = false
+ },
+ gotodaka() {
+ this.showPicker = true
+ },
+ onConfirm(item) {
+ console.log(item)
+ this.id = item.id
+ this.code = item.code
+ this.name = item.name
+ this.showPicker = !this.showPicker
+ // this.lever = item.value
+ },
+ async getbanklist() {
+ // 获取银行名称
+ let data = await api.getbank()
+ if (data.status === 0) {
+ console.log(data);
+ this.array = data.data
+ console.log(this.array);
+ } else {
+ }
+ },
+ async toSure() {
+ // 添加银行卡
+ if (isNull(this.bankNo)) {
+ Toast(this.$t("hj217"));
+ } else if (isNull(this.name)) {
+ Toast(this.$t("hj218"));
+ } else if (isNull(this.banif)) {
+ Toast(this.$t("hj218a"));
+ }
+ // else if (isNull(this.actualName)) {
+ // Toast(this.$t("hj207"));
+ // }
+ // else if (isNull(this.bankAddress) ) {
+ // Toast(this.$t("hj219"));
+ // }
+ else {
+ let opts = {
+ bankName: this.name,
+ // actualName: this.actualName,
+ bankNo: this.bankNo,
+ bankAddress: this.banif,
+ bankImg: this.code,
+
+ };
+ let data = await api.addBankCard(opts);
+ if (data.status === 0) {
+ Toast(this.$t("hj220"));
+ this.$router.push("/newUser");
+ } else {
+ Toast(data.msg);
}
- // else if (isNull(this.bankAddress) ) {
- // Toast(this.$t("hj219"));
- // }
- else {
- let opts = {
- bankName: this.name,
- actualName: this.actualName,
- bankNo: this.bankNo,
- bankAddress: this.banif,
- bankImg: this.code,
-
- };
- let data = await api.addBankCard(opts);
- if (data.status === 0) {
- Toast(this.$t("hj220"));
- this.$router.push("/newUser");
- } else {
- Toast(data.msg);
- }
- }
- },
- async getCardDetail() {
- // 获取银行卡信息
- let data = await api.getBankCard()
- if (data.status === 0) {
- const {
- bankAddress,
- bankName,
- actualName,
- bankNo,
- bankImg
- } = data.data;
- this.banif = bankAddress;
- this.bankName = bankName;
- this.actualName = actualName;
- this.bankun = bankImg;
- this.bankNo = bankNo;
- this.addBank = false;
- } else {
- this.addBank = true;
- }
- },
- }
- };
+ }
+ },
+ async getCardDetail() {
+ // 获取银行卡信息
+ let data = await api.getBankCard()
+ if (data.status === 0) {
+ const {
+ bankAddress,
+ bankName,
+ // actualName,
+ bankNo,
+ bankImg
+ } = data.data;
+ this.banif = bankAddress;
+ this.bankName = bankName;
+ // this.actualName = actualName;
+ this.bankun = bankImg;
+ this.bankNo = bankNo;
+ this.addBank = false;
+ } else {
+ this.addBank = true;
+ }
+ },
+ }
+};
</script>
<style scoped lang="less">
- .bank_card_page {
- width: 100%;
- height: 100%;
- background: #fff;
+.bank_card_page {
+ width: 100%;
+ height: 100%;
+ background: #fff;
- .content {
- width: 100%;
- height: 100%;
- padding: 0 0.6rem;
+ .content {
+ width: 100%;
+ height: 100%;
+ padding: 0 0.6rem;
- .top_back {
- width: 100%;
- height: 2rem;
+ .top_back {
+ width: 100%;
+ height: 2rem;
- >div {
- width: 10%;
- height: 100%;
- display: flex;
- align-items: center;
- }
+ > div {
+ width: 10%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ }
- img {
- width: 0.6rem;
- height: 0.6rem;
- }
- }
+ img {
+ width: 0.6rem;
+ height: 0.6rem;
+ }
+ }
- .titles {
- width: 100%;
- height: 1.5rem;
- font-size: 0.641rem;
- margin-top: 1rem;
+ .titles {
+ width: 100%;
+ height: 1.5rem;
+ font-size: 0.641rem;
+ margin-top: 1rem;
- span {
- font-weight: 600;
- }
- }
- }
+ span {
+ font-weight: 600;
+ }
+ }
+ }
- .bank_name {
- width: 100%;
- height: 1.5rem;
- display: flex;
- padding: 0 0.2rem;
- background: rgb(247, 247, 247);
- border-radius: 0.2rem;
- margin-top: 0.3rem;
+ .bank_name {
+ width: 100%;
+ height: 1.5rem;
+ display: flex;
+ padding: 0 0.2rem;
+ background: rgb(247, 247, 247);
+ border-radius: 0.2rem;
+ margin-top: 0.3rem;
- .lefts {
- width: 38%;
- height: 100%;
- display: flex;
- align-items: center;
- font-size: 0.3846rem;
+ .lefts {
+ width: 38%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ font-size: 0.3846rem;
- span {
- font-weight: 600;
- }
- }
+ span {
+ font-weight: 600;
+ }
+ }
- .rights {
- width: 75%;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
+ .rights {
+ width: 75%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
- input {
- width: 100%;
- height: 100%;
- }
- }
- }
- }
+ input {
+ width: 100%;
+ height: 100%;
+ }
+ }
+ }
+}
- .bank_name.bind {
- display: flex;
- align-items: center;
- justify-content: center;
- background: #1B79F5;
- font-size: 0.4103rem;
- color: #fff;
+.bank_name.bind {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #1B79F5;
+ font-size: 0.4103rem;
+ color: #fff;
- span {
- font-weight: 600;
- }
- }
+ span {
+ font-weight: 600;
+ }
+}
</style>
diff --git a/src/page/user/ransferIndex.vue b/src/page/user/ransferIndex.vue
index 73bc278..47019bd 100644
--- a/src/page/user/ransferIndex.vue
+++ b/src/page/user/ransferIndex.vue
@@ -251,7 +251,7 @@
if (res.status === 0) {
this.rate = res.data;
if (this.from.accectType == 'US'&&this.to.accectType=='IN'){
- this.rate = 7.35
+ this.rate = 83.5
}
}
}
diff --git a/src/page/user/recharge-sure.vue b/src/page/user/recharge-sure.vue
index 97dcace..0ce62db 100644
--- a/src/page/user/recharge-sure.vue
+++ b/src/page/user/recharge-sure.vue
@@ -16,7 +16,8 @@
</template>
</van-nav-bar>
<main>
- <div class="main-title">{{ $t("請選擇提款账户") }}</div>
+
+ <div class="main-title">{{ $t("提款帐户") }}</div>
<van-cell
is-link
:title="rechargeAccountData.name || $t('請選擇')"
@@ -29,24 +30,81 @@
close-on-click-action
@select="rechargeAccountSelect"
/>
-
- <div class="main-title">{{ $t("支持得提款渠道") }}</div>
- <van-cell
- is-link
- :title="rechargeSelect.name || $t('請選擇')"
- @click="show = true"
- />
- <van-action-sheet
- v-model="show"
- :actions="actions"
- :cancel-text="$t('hj106')"
- close-on-click-action
- @select="select"
- />
- <div v-if="rechargeSelect.key !== undefined">
- <div class="main-title">{{ $t("請選擇銀行卡") }}</div>
- <van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />
+ <div class="main-title">IFSC</div>
+ <div class="white-input">
+ <input type="text" :disabled="true" :placeholder="$t('请设置ifsc')" :value="bankCard.bankAddress" @input="ifscInputValue" />
+ <!-- <van-icon class="myr" name="arrow" />-->
+ <i
+ class="iconfont icon-fuzhi fuzhi"
+ @click="(e) => copyText(e, bankCard.bankAddress)"
+ ></i>
</div>
+ <!-- <van-cell-->
+ <!-- is-link-->
+ <!-- :title="paymentSelectData.channelAccount || $t('请设置ifsc')"-->
+ <!-- @click="paymentShow = true"-->
+ <!-- />-->
+ <!-- <van-action-sheet-->
+ <!-- v-model="paymentShow"-->
+ <!-- :actions="paymentActions"-->
+ <!-- :cancel-text="$t('qx')"-->
+ <!-- close-on-click-action-->
+ <!-- @select="paymentSelect"-->
+ <!-- />-->
+ <div class="main-title">{{ $t("银行帐号") }}</div>
+ <div class="white-input">
+ <input type="number" :disabled="true" :placeholder="$t('请将银行账户设置为')" :value="bankCard.bankNo" @input="bankNoInputValue" />
+<!-- <van-icon class="myr" name="arrow" />-->
+ <i
+ class="iconfont icon-fuzhi fuzhi"
+ @click="(e) => copyText(e, bankCard.bankNo)"
+ ></i>
+ </div>
+<!-- <van-cell-->
+<!-- is-link-->
+<!-- :title="rechargeAccountData.name || $t('请将银行账户设置为')"-->
+<!-- @click="rechargeAccountShow = true"-->
+<!-- />-->
+<!-- <van-action-sheet-->
+<!-- v-model="rechargeAccountShow"-->
+<!-- :actions="rechargeAccountActions"-->
+<!-- :cancel-text="$t('hj106')"-->
+<!-- close-on-click-action-->
+<!-- @select="rechargeAccountSelect"-->
+<!-- />-->
+ <div class="main-title">{{ $t("hj213") }}</div>
+ <div class="white-input">
+ <input type="text" :disabled="true" :placeholder="$t('请设置银行名称')" :value="bankCard.bankName" @input="bankNameInputValue" />
+<!-- <van-icon class="myr" name="arrow" />-->
+ <i
+ class="iconfont icon-fuzhi fuzhi"
+ @click="(e) => copyText(e, bankCard.bankName)"
+ ></i>
+ </div>
+<!-- <van-cell is-link :title="bankCard.bankName || $t('请设置银行名称')" />-->
+ <div class="main-title">{{ $t("姓名") }}</div>
+ <div class="white-input">
+ <input type="text" :disabled="true" :placeholder="$t('请将姓名设置为')" :value="actualName" @input="actualNameInputValue" />
+<!-- <van-icon class="myr" name="arrow" />-->
+ </div>
+<!-- <van-cell is-link :title="paymentSelectData.channelName || $t('请将姓名设置为')" />-->
+<!-- <div class="main-title">{{ $t("支持得提款渠道") }}</div>-->
+<!-- <van-cell-->
+<!-- is-link-->
+<!-- :title="rechargeSelect.name || $t('請選擇')"-->
+<!-- @click="show = true"-->
+<!-- />-->
+<!-- <van-action-sheet-->
+<!-- v-model="show"-->
+<!-- :actions="actions"-->
+<!-- :cancel-text="$t('hj106')"-->
+<!-- close-on-click-action-->
+<!-- @select="select"-->
+<!-- />-->
+<!-- <div v-if="rechargeSelect.key !== undefined">-->
+<!-- <div class="main-title">{{ $t("請選擇銀行卡") }}</div>-->
+<!-- <van-cell is-link :title="bankCard.bankNo || $t('請選擇')" />-->
+<!-- </div>-->
<div class="main-title">{{ $t("請選擇充值金額") }}</div>
<div class="white-input">
<input type="number" :value="value" @input="inputValue" />
@@ -63,8 +121,16 @@
</div>
</div>
</div>
-<!-- <van-cell-group>-->
-<!-- <van-cell :title="$t('最低取款金额')" value="内容" />-->
+ <div>
+ <div class="dz-title" v-if="rechargeAccountData.key !== undefined">
+ <div>{{ $t("最低取款金额") }}</div>
+ <div class="balance-text">
+ {{ withMinAmt }} {{ symbolCode }}
+ </div>
+ </div>
+ </div>
+<!-- <van-cell-group v-if="rechargeAccountData.key !== undefined">-->
+<!-- <van-cell :title="$t('最低取款金额')" :value="withMinAmt + symbolCode" />-->
<!-- </van-cell-group>-->
<van-button
class="but"
@@ -80,7 +146,7 @@
<script>
import { ActionSheet, Notify,Cell, CellGroup } from "vant";
import ClipboardJS from "clipboard";
-import { getBankCard, getMoney, outMoney } from "../../axios/api";
+import {getBankCard, getMoney, getSetting, outMoney, siteGetPayInfo} from "../../axios/api";
export default {
components: {
@@ -92,9 +158,9 @@
data() {
return {
value: 0,
-
+ paymentActions: [],
paymentSelectData: "US",
-
+ actualName: this.$store.state.userInfo.realName,
show: false,
// 提款聚到
@@ -129,13 +195,33 @@
getMoneyList: [],
assetsType: "",
symbolCode: "",
+ withMinAmt:''
};
},
mounted() {
this.getykh();
this.getMoneys();
+ this.getPayInfos();
+ this.setSetting()
},
methods: {
+ async setSetting(){
+ const res = await getSetting();
+ if (res.status === 0) {
+ this.withMinAmt = res.data.withMinAmt
+ }
+ },
+ async getPayInfos() {
+ const res = await siteGetPayInfo();
+ if (res.status === 0) {
+ res.data.map((item) => {
+ item.name = item.channelType;
+ });
+ this.paymentActions = res.data;
+ console.log(this.paymentActions)
+ }
+ console.log(res);
+ },
async setOutMoney() {
const res = await outMoney({
amt: this.value,
@@ -153,6 +239,18 @@
},
inputValue(e) {
this.value = e.target.value;
+ },
+ ifscInputValue(e){
+ this.bankCard.bankAddress = e.target.value;
+ },
+ bankNoInputValue(e){
+ this.bankCard.bankNo = e.target.value;
+ },
+ bankNameInputValue(e){
+ this.bankCard.bankName = e.target.value;
+ },
+ actualNameInputValue(e){
+ this.actualName = e.target.value;
},
async getykh() {
const res = await getBankCard();
@@ -197,6 +295,7 @@
console.log(e);
},
rechargeAccountSelect(e) {
+ console.log(e)
this.rechargeAccountData = e;
(this.getMoneyList || []).map((item) => {
if (item.accectType === this.rechargeAccountData.key) {
@@ -207,8 +306,16 @@
});
},
paymentSelect(e) {
- this.paymentSelectData = e.name;
+ this.paymentSelectData = e;
+ this.accectType = e.assetsType;
console.log(e);
+ this.rechargeAccountActions.map((item) => {
+ if (item.key === e.assetsType) {
+ console.log(item)
+ this.rechargeAccountData = item;
+ this.rechargeAccountSelect(item)
+ }
+ });
},
},
};
diff --git a/src/page/user/recharge.vue b/src/page/user/recharge.vue
index 7e94bff..425c8ab 100644
--- a/src/page/user/recharge.vue
+++ b/src/page/user/recharge.vue
@@ -17,6 +17,30 @@
</van-nav-bar>
<main>
<div>
+ <div class="main-title" v-if="paymentSelectData.channelAccount">IFSC</div>
+ <div class="main-title" v-else>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"
+ :actions="paymentActions"
+ :cancel-text="$t('qx')"
+ close-on-click-action
+ @select="paymentSelect"
+ />
<template v-if="paymentSelectData.channelAccount !== undefined">
<div class="main-title">{{ $t("請選擇充值賬戶") }}</div>
<van-cell
@@ -29,20 +53,6 @@
:cancel-text="$t('qx')"
/>
</template>
- <div class="main-title">IFSC</div>
- <van-cell
- is-link
- :title="paymentSelectData.channelAccount || $t('請選擇')"
- @click="paymentShow = true"
- />
- <!-- paymentSelectData.channelMinLimit -->
- <van-action-sheet
- v-model="paymentShow"
- :actions="paymentActions"
- :cancel-text="$t('qx')"
- close-on-click-action
- @select="paymentSelect"
- />
<template v-if="paymentSelectData.channelAccount !== undefined">
<div class="main-title">{{ $t("银行帐号") }}</div>
@@ -53,14 +63,14 @@
@click="(e) => copyText(e, paymentSelectData.bankNumber)"
></i>
</div>
- <div class="main-title">{{ $t("收款卡號") }}</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, paymentSelectData.channelAccount)"
></i>
- </div>
+ </div>-->
<div class="main-title">{{ $t("收款銀行") }}</div>
<div class="white-input">
<span>{{ paymentSelectData.channelDesc }}</span>
@@ -206,7 +216,7 @@
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)
--
Gitblit v1.9.3