From 27cfbbd201736a6c0b633ad7bad670d3fbad5226 Mon Sep 17 00:00:00 2001
From: wang_yp <wang_yp@wang-ypdeMacBook-Pro.local>
Date: Wed, 22 May 2024 14:04:13 +0800
Subject: [PATCH] wechat login

---
 src/components/form/select.tsx      | 41 +++++++++++++++--------------
 src/components/form/simple_form.tsx | 15 +++++++++--
 src/pages/active/index.tsx          | 35 +++++-------------------
 src/pages/card/card-list.tsx        |  2 +-
 4 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx
index 096a0cc..a2001b8 100644
--- a/src/components/form/select.tsx
+++ b/src/components/form/select.tsx
@@ -1,28 +1,29 @@
 import { Form, Select } from "antd";
 import { FormDatas } from "./interface";
-import { useEffect, useState } from "react";
-import baseHttp from "@/service/base";
-const { Option } = Select;
+import { useState } from "react";
 export const FormSelect = (v: FormDatas) => {
-  const [list, setList] = useState([]);
-  useEffect(() => {
-    baseHttp
-      .get(`${v.selectUrl}/?pageSize=100&pageNum=1` ?? "", "")
-      .then((res) => {
-        setList(res.data.list ?? []);
-      });
-  }, [v.selectUrl]);
+  const [list] = useState([
+    {
+      value: 1,
+      label: "卡片一",
+    },
+    {
+      value: 2,
+      label: "卡片二",
+    },
+    {
+      value: 3,
+      label: "卡片三",
+    },
+    {
+      value: 4,
+      label: "卡片四",
+    },
+  ]);
+
   return (
     <Form.Item key={v.label} label={v.label} name={v.name} rules={v.rules}>
-      <Select placeholder="">
-        {list?.map((v: any) => {
-          return (
-            <Option key={v.id} value={v.id}>
-              {v.productTypeName}
-            </Option>
-          );
-        })}
-      </Select>
+      <Select placeholder="" options={list} value={v.value} />
     </Form.Item>
   );
 };
diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx
index 40c8143..03c2b33 100644
--- a/src/components/form/simple_form.tsx
+++ b/src/components/form/simple_form.tsx
@@ -1,4 +1,4 @@
-import { Checkbox, DatePicker, Form, Input, Radio } from "antd";
+import { Checkbox, DatePicker, Form, Input, Radio, Switch } from "antd";
 import { useEffect } from "react";
 import { SimpleFormData } from "./interface";
 import { FormSelect } from "./select";
@@ -6,7 +6,6 @@ import AliUpload from "../aliUpload";
 const { TextArea } = Input;
 const SimpleForm = (props: SimpleFormData) => {
   const [form] = Form.useForm();
-  const { RangePicker } = DatePicker;
   const onFinish = (values: any) => {
     props.onFinish(values);
   };
@@ -117,6 +116,17 @@ const SimpleForm = (props: SimpleFormData) => {
                 </Radio.Group>
               </Form.Item>
             );
+          case "switch":
+            return (
+              <Form.Item
+                key={v.label}
+                label={v.label}
+                name={v.name}
+                rules={v.rules}
+              >
+                <Switch/>
+              </Form.Item>
+            );
           case "Date":
             return (
               <Form.Item
@@ -128,6 +138,7 @@ const SimpleForm = (props: SimpleFormData) => {
                 <DatePicker />
               </Form.Item>
             );
+
           default:
             return (
               <Form.Item
diff --git a/src/pages/active/index.tsx b/src/pages/active/index.tsx
index 22b37cb..756c471 100644
--- a/src/pages/active/index.tsx
+++ b/src/pages/active/index.tsx
@@ -22,30 +22,6 @@ const Active = (props: Store) => {
       title: "活动标题",
       dataIndex: "activeName",
     },
-    // {
-    //   title: "活动描述",
-    //   dataIndex: "desc",
-    // },
-    // {
-    //   title: "活动图片",
-    //   dataIndex: "activeIcon",
-    //   ellipsis: {
-    //     showTitle: false,
-    //   },
-    //   render: (address) => (
-    //     <Tooltip placement="topLeft" title={address}>
-    //       {address}
-    //     </Tooltip>
-    //   ),
-    // },
-    // {
-    //   title: "活动人数",
-    //   dataIndex: "peopleNum",
-    // },
-    // {
-    //   title: "活动地址",
-    //   dataIndex: "address",
-    // },
     {
       title: "折扣",
       dataIndex: "discount",
@@ -67,11 +43,6 @@ const Active = (props: Store) => {
         </div>
       ),
     },
-    // {
-    //   title: "发起人",
-    //   dataIndex: "userId",
-    // },
-
     {
       title: "操作",
       dataIndex: "id",
@@ -158,6 +129,12 @@ const Active = (props: Store) => {
       name: "endTime",
       value: "",
     },
+    {
+      type: "switch",
+      label: "是否开启",
+      name: "status",
+      value: false,
+    },
   ];
 
   useEffect(() => {
diff --git a/src/pages/card/card-list.tsx b/src/pages/card/card-list.tsx
index 068e2af..c68be86 100644
--- a/src/pages/card/card-list.tsx
+++ b/src/pages/card/card-list.tsx
@@ -112,7 +112,7 @@ const CardPageList = (props) => {
             type: "select",
             label: "请选择卡片类型",
             name: "cardType",
-            value: "",
+            value: ""
         },
     ]