From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票
---
src/views/newshares/dazonglist.vue | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/src/views/newshares/dazonglist.vue b/src/views/newshares/dazonglist.vue
index 1da13cd..3a62e7a 100644
--- a/src/views/newshares/dazonglist.vue
+++ b/src/views/newshares/dazonglist.vue
@@ -104,18 +104,18 @@
<a-form-item label="交易密钥" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入交易密钥"
- v-decorator="['password', { rules: [{ required: true, message: '请输入交易密钥' }] }]"
+ v-decorator="['password']"
/>
</a-form-item>
</a-col>
- <a-col :md="12" :lg="12" :sm="12">
+ <!-- <a-col :md="12" :lg="12" :sm="12">
<a-form-item label="折扣" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入折扣（例：0.8）"
v-decorator="['discount', { rules: [{ required: true, message: '请输入折扣' }] }]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="48">
<a-col :md="12" :lg="12" :sm="12">
@@ -140,6 +140,37 @@
format="YYYY-MM-DD HH:mm:ss"
>
</a-date-picker>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="48">
+ <a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="周期(天)" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input
+ placeholder="请输入周期"
+ v-decorator="['period', { rules: [{ required: true, message: '请输入周期' }] }]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="审核开关" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select
+ placeholder="请选择审核开关"
+ v-decorator="['switchType', { rules: [{ required: true, message: '请选择审核开关' }] }]"
+ >
+ <a-select-option :value="1">开启</a-select-option>
+ <a-select-option :value="0">关闭</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :md="12" :lg="11" :sm="12">
+ <a-form-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input
+ placeholder="请输入价格"
+ v-decorator="['nowPrice', { rules: [{ required: true, message: '请输入价格' }] }]"
+ />
</a-form-item>
</a-col>
</a-row>
@@ -172,10 +203,15 @@
align: 'center',
},
{
- title: '折扣',
- dataIndex: 'discount',
+ title: '周期(天)',
+ dataIndex: 'period',
align: 'center',
},
+ // {
+ // title: '折扣',
+ // dataIndex: 'discount',
+ // align: 'center',
+ // },
{
title: '股票类型',
dataIndex: 'stockType',
@@ -198,6 +234,7 @@
return text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '- -'
},
},
+
{
title: '操作',
key: 'action',
@@ -236,7 +273,7 @@
addUserform: this.$form.createForm(this),
addUserdialog: false,
addUserDialogloading: false,
- fields: ['stockCode', 'stockNum', 'password', 'startTime', 'endTime', 'discount'],
+ fields: ['stockCode', 'stockNum', 'password', 'startTime', 'endTime', 'discount', 'period','switchType','nowPrice'],
currentdetail: '',
startTime: '',
endTime: '',
@@ -343,8 +380,9 @@
getlist() {
this.loading = true
getDzListByAdmin(this.queryParam).then((res) => {
+ console.log(res.data)
this.datalist = res.data
- this.pagination.total = res.data.total
+ // this.pagination.total = res.data.total
this.loading = false
})
},
--
Gitblit v1.9.3