From 417c8c4716f8dab251c9877665f256c1be58acbb Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Fri, 11 Oct 2024 17:20:16 +0800
Subject: [PATCH] 11
---
.env.development | 4 ++--
/dev/null | 0
.env.preview | 4 ++--
.env | 4 ++--
9.27admin.rar | 0
src/views/position/components/financing-hold.vue | 20 ++++++++++----------
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/.env b/.env
index eacc263..99c8674 100644
--- a/.env
+++ b/.env
@@ -4,6 +4,6 @@
# VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
# VUE_APP_API_BASE_URL= https://api.dfddgj346.xyz/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
-# VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
- VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
+VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+# VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
# VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 2a1d01e..4a9b372 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
# VUE_APP_API_BASE_URL=https://api.marwadi.online/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
- # VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+ # VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
+VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
# VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
# VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file
diff --git a/.env.preview b/.env.preview
index d27e2a9..cd5b62f 100644
--- a/.env.preview
+++ b/.env.preview
@@ -2,6 +2,6 @@
VUE_APP_PREVIEW=true
- # VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
\ No newline at end of file
+ # VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
\ No newline at end of file
diff --git a/9.27admin.rar b/9.27admin.rar
index ddefcfe..34c913e 100644
--- a/9.27admin.rar
+++ b/9.27admin.rar
Binary files differ
diff --git a/dist.rar b/dist.rar
deleted file mode 100644
index 575c956..0000000
--- a/dist.rar
+++ /dev/null
Binary files differ
diff --git a/src/views/position/components/financing-hold.vue b/src/views/position/components/financing-hold.vue
index 74f7f99..5108cd7 100644
--- a/src/views/position/components/financing-hold.vue
+++ b/src/views/position/components/financing-hold.vue
@@ -3,7 +3,7 @@
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline">
- <a-row :gutter="48">
+ <!-- <a-row :gutter="48">
<a-col :md="12" :lg="6" :sm="24">
<a-form-item label="持仓类型">
<a-select v-model="queryParam.positionType" placeholder="请选择持仓类型">
@@ -12,7 +12,7 @@
<a-select-option :value="1">模拟持仓</a-select-option>
</a-select>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :md="12" :lg="6" :sm="24">
<a-form-item label="下级代理">
<a-select
@@ -92,7 +92,7 @@
</div>
</template>
</span>
- <span slot="positionType" slot-scope="text, record">
+ <!-- <span slot="positionType" slot-scope="text, record">
<template>
<div>
<a-tag :color="record.positionType == 1 ? 'blue' : 'green'">
@@ -100,7 +100,7 @@
</a-tag>
</div>
</template>
- </span>
+ </span> -->
<span slot="orderDirection" slot-scope="text, record">
<template>
<div>
@@ -197,12 +197,12 @@
width: 180,
scopedSlots: { customRender: 'stockName' },
},
- {
- title: '账户类型',
- dataIndex: 'positionType',
- align: 'center',
- scopedSlots: { customRender: 'positionType' },
- },
+ // {
+ // title: '账户类型',
+ // dataIndex: 'positionType',
+ // align: 'center',
+ // scopedSlots: { customRender: 'positionType' },
+ // },
{
title: '用户名称（ID）',
dataIndex: 'nickName',
--
Gitblit v1.9.3