From 437667a249672df71f6c609290b344f4d43caad9 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Thu, 24 Apr 2025 18:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://124.156.157.155:8060/r/gp/cakuns_st_app
---
src/page/newUser/transfer.vue | 13 +++
src/page/user/transfer.vue | 159 +++++++++++++++++++++++++++------------
src/page/newUser/index.vue | 16 ++++
src/page/trading/buy.vue | 2
4 files changed, 138 insertions(+), 52 deletions(-)
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 67ec563..88cf14e 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -192,6 +192,19 @@
<img src="../../assets/img/youjiantou.png" alt />
</div>
</div>
+ <div class="jy" @click="goTransfer()">
+ <div class="left_gn">
+ <div class="l_icon">
+ <img src="../../assets/img/huazhuan2.png" alt />
+ </div>
+ <div class="r_title">
+ <span>划转</span>
+ </div>
+ </div>
+ <div class="right_gos">
+ <img src="../../assets/img/youjiantou.png" alt />
+ </div>
+ </div>
<div class="jy" @click="goToSettings()">
<div class="left_gn">
<div class="l_icon">
@@ -394,6 +407,9 @@
// }
this.$router.push("/recharge");
},
+ goTransfer() {
+ this.$router.push("/transfer");
+ },
handleZh() {
this.selectUserFlag = !this.selectUserFlag;
diff --git a/src/page/newUser/transfer.vue b/src/page/newUser/transfer.vue
new file mode 100644
index 0000000..438e1f3
--- /dev/null
+++ b/src/page/newUser/transfer.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>
+ 111
+ </div>
+</template>
+
+<script>
+export default {
+ data: () => ({})
+};
+</script>
+
+<style scoped></style>
diff --git a/src/page/trading/buy.vue b/src/page/trading/buy.vue
index c7d2955..7337d3d 100644
--- a/src/page/trading/buy.vue
+++ b/src/page/trading/buy.vue
@@ -26,7 +26,7 @@
<span>{{ $t("hj98") }}</span>
</div>
</div>
- <div class="rights">
+ <div class="rights" v-if="KLine.type == 'HJ'">
<div class="ese">
<div
class="mc"
diff --git a/src/page/user/transfer.vue b/src/page/user/transfer.vue
index 6efca9f..545b6d3 100644
--- a/src/page/user/transfer.vue
+++ b/src/page/user/transfer.vue
@@ -3,24 +3,36 @@
<div class="header">
<mt-header title="账户资金互转">
<router-link to="/user" slot="left">
- <mt-button icon="back">我的</mt-button>
+ <!-- <mt-button icon="back">我的</mt-button> -->
</router-link>
</mt-header>
</div>
<mt-navbar v-model="selected">
- <mt-tab-item v-if="this.$store.state.settingForm.indexDisplay" id="1">融资转指数</mt-tab-item>
- <mt-tab-item v-if="this.$store.state.settingForm.indexDisplay" id="2">指数转融资</mt-tab-item>
- <mt-tab-item v-if="this.$store.state.settingForm.futuresDisplay" id="3">融资转期货</mt-tab-item>
- <mt-tab-item v-if="this.$store.state.settingForm.futuresDisplay" id="4">期货转融资</mt-tab-item>
+ <mt-tab-item id="1">沙特账户转石油黄金账户</mt-tab-item>
+ <mt-tab-item id="2">石油黄金账户转沙特账户</mt-tab-item>
+ <!-- <mt-tab-item v-if="this.$store.state.settingForm.futuresDisplay" id="3">融资转期货</mt-tab-item> -->
+ <!-- <mt-tab-item v-if="this.$store.state.settingForm.futuresDisplay" id="4">期货转融资</mt-tab-item> -->
</mt-navbar>
<mt-tab-container class="order-list" v-model="selected">
<mt-tab-container-item id="1">
<div class="form-block">
- <mt-field label="可转金额" placeholder="可转金额" type="text" disabled v-model="this.$store.state.userInfo.enableAmt">
+ <mt-field
+ label="可转金额"
+ placeholder="可转金额"
+ type="text"
+ disabled
+ v-model="myMoney[0].availableBalance"
+ >
</mt-field>
</div>
<div class="form-block">
- <mt-field label="转账金额" name="amt" v-model="form.account1" placeholder="请输入转账金额" type="text">
+ <mt-field
+ label="转账金额"
+ name="amt"
+ v-model="form.account1"
+ placeholder="请输入转账金额"
+ type="text"
+ >
<span @click="selectAll1">全部</span>
</mt-field>
</div>
@@ -29,24 +41,38 @@
</div>
<p class="prompt">资金密码默认为登录密码</p> -->
<div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit">确认转入指数账户</span>
+ <span class="text-center btnok loginout" @click="tosubmit"
+ >确认转入石油黄金账户</span
+ >
</div>
</mt-tab-container-item>
<mt-tab-container-item id="2">
<div class="form-block">
- <mt-field label="可转金额" placeholder="可转金额" type="text" disabled
- v-model="this.$store.state.userInfo.enableIndexAmt"></mt-field>
+ <mt-field
+ label="可转金额"
+ placeholder="可转金额"
+ type="text"
+ disabled
+ v-model="myMoney[1].availableBalance"
+ ></mt-field>
</div>
<div class="form-block">
- <mt-field label="转账金额" v-model="form.account2" placeholder="请输入转账金额" type="text">
+ <mt-field
+ label="转账金额"
+ v-model="form.account2"
+ placeholder="请输入转账金额"
+ type="text"
+ >
<span @click="selectAll2">全部</span>
</mt-field>
</div>
<div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit">确认转入融资账户</span>
+ <span class="text-center btnok loginout" @click="tosubmit"
+ >确认转入沙特账户</span
+ >
</div>
</mt-tab-container-item>
- <mt-tab-container-item id="3">
+ <!-- <mt-tab-container-item id="3">
<div class="form-block">
<mt-field label="可转金额" placeholder="可转金额" type="text" disabled v-model="this.$store.state.userInfo.enableAmt">
</mt-field>
@@ -57,10 +83,11 @@
</mt-field>
</div>
<div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit">确认转入期货账户</span>
+ <span class="text-center btnok loginout" @click="tosubmit">确认转入石油黄金账户</span>
</div>
</mt-tab-container-item>
- <mt-tab-container-item id="4">
+ -->
+ <!-- <mt-tab-container-item id="4">
<div class="form-block">
<mt-field label="可转金额" placeholder="可转金额" type="text" disabled
v-model="this.$store.state.userInfo.enableFuturesAmt"></mt-field>
@@ -71,100 +98,121 @@
</mt-field>
</div>
<div class="btnbox">
- <span class="text-center btnok loginout" @click="tosubmit">确认转入融资账户</span>
+ <span class="text-center btnok loginout" @click="tosubmit">确认转入沙特账户</span>
</div>
</mt-tab-container-item>
+ -->
</mt-tab-container>
</div>
</template>
<script>
// import '@/assets/style/common.less'
-import * as api from '@/axios/api'
-import { Toast } from 'mint-ui'
+import * as api from "@/axios/api";
+import { Toast } from "mint-ui";
export default {
- components: {
- },
+ components: {},
data() {
return {
- selected: '1', // 选中
+ selected: "1", // 选中
+
form: {
- account1: '',
- account2: '',
- account3: '',
- account4: '',
- password: ''
+ account1: "",
+ account2: "",
+ account3: "",
+ account4: "",
+ password: ""
},
userInfo: {
- realName: ''
- }
- }
+ realName: ""
+ },
+ myMoney: ""
+ };
},
watch: {},
computed: {},
created() {
- this.getProductSetting()
+ this.getProductSetting();
+ this.getMoney();
},
mounted() {
if (this.$route.query.type) {
- this.selected = this.$route.query.type + ''
+ this.selected = this.$route.query.type + "";
}
- this.getUserInfo()
+ this.getUserInfo();
},
methods: {
async getProductSetting() {
- let data = await api.getProductSetting()
+ let data = await api.getProductSetting();
if (data.status === 0) {
- this.$store.state.settingForm = data.data
+ this.$store.state.settingForm = data.data;
if (!this.$store.state.settingForm.indexDisplay) {
- this.selected = '3'
+ this.selected = "3";
}
} else {
- this.$message.error(data.msg)
+ this.$message.error(data.msg);
}
},
selectAll1() {
// 选择全部
- this.form.account1 = this.$store.state.userInfo.enableAmt
+ this.form.account1 = this.myMoney[0].availableBalance;
},
selectAll2() {
// 选择全部
- this.form.account2 = this.$store.state.userInfo.enableIndexAmt
+ this.form.account2 = this.myMoney[1].availableBalance;
},
selectAll3() {
// 选择全部
- this.form.account3 = this.$store.state.userInfo.enableAmt
+ this.form.account3 = this.$store.state.userInfo.enableAmt;
},
selectAll4() {
// 选择全部
- this.form.account4 = this.$store.state.userInfo.enableFuturesAmt
+ this.form.account4 = this.$store.state.userInfo.enableFuturesAmt;
},
async tosubmit() {
// 融资转指数
let opt = {
- amt: this.selected === '1' ? this.form.account1 : this.selected === '2' ? this.form.account2 : this.selected === '3' ? this.form.account3 : this.form.account4,
- type: this.selected // 1 融资转指数 2 指数转融资
- }
- let data = await api.AmtChange(opt)
+ amt:
+ this.selected === "1"
+ ? this.form.account1
+ : this.selected === "2"
+ ? this.form.account2
+ : this.selected === "3"
+ ? this.form.account3
+ : this.form.account4,
+ // type: this.selected, // 1 融资转指数 2 指数转融资
+ userId: this.$store.state.userInfo.id, // 用户id
+ disbursementAccount: this.selected === "1" ? "ST" : "USDT", // 划出账户
+ depositAccount: this.selected === "2" ? "ST" : "USDT" // 划入账户
+ };
+ let data = await api.transfer(opt);
if (data.status === 0) {
- Toast(data.msg)
- this.$router.push('/user')
+ Toast(data.msg);
+ this.$router.push("/user");
} else {
- Toast(data.msg)
+ Toast(data.msg);
}
},
async getUserInfo() {
// 获取用户信息
- let data = await api.getUserInfo()
+ let data = await api.getUserInfo();
if (data.status === 0) {
- this.$store.state.userInfo = data.data
+ this.$store.state.userInfo = data.data;
} else {
- Toast(data.msg)
+ Toast(data.msg);
+ }
+ },
+ async getMoney() {
+ let data = await api.getMoney();
+ if (data.status === 0) {
+ this.myMoney = data.data;
+ } else {
+ Toast(data.msg);
}
}
}
-}
+};
</script>
<style lang="less" scoped>
.is-selected .mint-tab-item-label:hover {
@@ -182,6 +230,15 @@
margin-bottom: 0;
}
+.order-list {
+ /deep/ .mint-cell {
+ background: initial !important;
+ }
+ /deep/ .mint-cell .mint-cell-text {
+ color: #000 !important;
+ }
+}
+
.prompt {
padding: 0.3rem 0 0.2rem 0.7rem;
}
--
Gitblit v1.9.3