From 62612eeae7ed67dc538c2563467d0eacf609ad8a Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 09 Oct 2024 18:25:49 +0800
Subject: [PATCH] 1
---
.env.development | 7 ---
/dev/null | 0
.env.preview | 7 +--
admin.rar | 0
src/views/userlist/agentcomponents/addagentdialog.vue | 20 +--------
.env | 7 +--
src/views/position/components/financing-hold.vue | 20 +++++-----
7 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/.env b/.env
index 40ea000..74ae98e 100644
--- a/.env
+++ b/.env
@@ -4,11 +4,8 @@
# 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/
-<<<<<<< HEAD
-VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
+# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
# VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
-=======
- VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
+ VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
# VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file
diff --git a/.env.development b/.env.development
index ed8675a..89db9d1 100644
--- a/.env.development
+++ b/.env.development
@@ -5,12 +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/
-<<<<<<< HEAD
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
-# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
-=======
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
-VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
+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 e835a87..cfe67c3 100644
--- a/.env.preview
+++ b/.env.preview
@@ -2,12 +2,9 @@
VUE_APP_PREVIEW=true
-<<<<<<< HEAD
# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
-=======
-VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
+VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
+
diff --git a/dist.rar b/admin.rar
similarity index 68%
rename from dist.rar
rename to admin.rar
index 9eee74e..0b221b2 100644
--- a/dist.rar
+++ b/admin.rar
Binary files differ
diff --git a/admin.zip b/admin.zip
deleted file mode 100644
index bd81ae3..0000000
--- a/admin.zip
+++ /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',
diff --git a/src/views/userlist/agentcomponents/addagentdialog.vue b/src/views/userlist/agentcomponents/addagentdialog.vue
index 63e11ae..01fb7ff 100644
--- a/src/views/userlist/agentcomponents/addagentdialog.vue
+++ b/src/views/userlist/agentcomponents/addagentdialog.vue
@@ -14,7 +14,7 @@
placeholder="请选择上级代理"
v-decorator="['parentId', { rules: [{ required: true, message: '请选择上级代理' }] }]"
>
-
+
<a-select-option :value="item.id" v-for="(item, index) in parentIdList" :key="index">{{
item.agentName
}}</a-select-option>
@@ -53,14 +53,8 @@
<a-form-item label="代理编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入代理编码"
-<<<<<<< HEAD
v-decorator="['agentCode', { rules: [{ validator: checkSixDigitNumber, message: '请输入六位数字' }] }]"
-=======
- v-decorator="[
- 'agentCode',
- { rules: [{ required: true, validator: checkSixDigitNumber, message: '请输入六位数字' }] },
- ]"
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
+
/>
</a-form-item>
</a-form>
@@ -97,14 +91,7 @@
}
},
methods: {
-<<<<<<< HEAD
- checkSixDigitNumber(rule, value, callback) {
- const num = parseInt(value);
- if (isNaN(num) || value.length !== 6) {
- callback(new Error('请输入6位数字'));
- } else {
- callback();
-=======
+
initGetParensAgent() {
getParensAgent().then((res) => {
if (res.status == 0) {
@@ -123,7 +110,6 @@
callback(new Error('请输入6位数字'))
} else {
callback()
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
}
},
// 新增用户取消弹窗
--
Gitblit v1.9.3