Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

src/components/Upload/UploadImage.jsx

@@ -40,12 +40,13 @@ export default (props) => {
     if (info.file.status === 'done') {
       setLoading(false);
       const { url, fileType } = info.file.response;
+      console.log(url)
       onChange(url);
     }
   };
 
   const previewUrl = getRealPath ? getRealPath(value) : value;
-
+console.log(value)
   return (
     <Upload
       listType="picture-card"
@@ -54,7 +55,7 @@ export default (props) => {
       beforeUpload={beforeUpload}
       onChange={handleChange}
     >
-      {value ? <img src={previewUrl} alt="avatar" style={{ width: '100%', height: '100%' }} /> : <UploadButton loading={loading} />}
+      {value ? <img src={value} alt="avatar" style={{ width: '100%', height: '100%' }} /> : <UploadButton loading={loading} />}
     </Upload>
   );
 }

src/components/Upload/request.js

@@ -4,8 +4,7 @@ const upload = (file, fileType = 'image') => {
   const formData = new FormData();
   formData.append("file", file);
   formData.append("fileType", fileType);
-
-  return request('/api/admin/file', {
+  return request('/upload', {
     method: 'post',
     data: formData,
     headers: {

src/pages/member/Edit.jsx

@@ -0,0 +1,54 @@
+import { getTaMemberId } from "@/services/taMember";
+import { Card } from "antd";
+import React, { useEffect, useState } from "react";
+import { useSearchParams } from "react-router-dom";
+import Page from "@/components/Page";
+import MemberInfo from "./components/MemberInfo";
+import MemberCardInfo from "./components/MemberCardInfo";
+import "./index.less";
+export default (props) => {
+  const [params] = useSearchParams();
+  const [activeTabKey, setActiveTabKey] = useState("tab1");
+  const [memberList, setMemberList] = useState();
+  const id = params.get("id");
+
+  useEffect(() => {
+  if(id){
+    getTaMemberId(id).then((res) => {
+        setMemberList(res || {});
+      });
+  }
+  }, []);
+
+  const tabList = [
+    {
+      key: "tab1",
+      tab: "会员信息",
+    },
+    {
+      key: "tab2",
+      tab: "会员卡信息",
+    },
+  ];
+  const contentList = {
+    // 会员基本信息
+    tab1: <MemberInfo memberList={memberList} />,
+    // 会员卡信息
+    tab2: <MemberCardInfo taMemberCardList={memberList?.taMemberCardList} />,
+  };
+  return (
+    <Page>
+      <Card
+        className="scorll"
+        style={{ width: "100%", overflowY: "scroll", maxHeight: "700px" }}
+        // title="会员卡"
+        //   extra={<a href="#">More</a>}
+        tabList={tabList}
+        activeTabKey={activeTabKey}
+        onTabChange={(key) => setActiveTabKey(key)}
+      >
+        {contentList[activeTabKey]}
+      </Card>
+    </Page>
+  );
+};

src/pages/member/components/MemberCardInfo.jsx

@@ -0,0 +1,41 @@
+import React from "react";
+import { Card } from "antd";
+export default (props) => {
+  const { taMemberCardList } = props;
+
+  const CardAll = () => {
+    return (taMemberCardList || []).map((it) => {
+      return (
+        <Card
+          id={it?.cardId}
+          style={{ width: "100%" }}
+          title={it?.cardType ? it?.cardType : "会员卡"}
+        >
+          <Card.Grid>
+            <Card.Meta title="开卡人姓名" description={it?.memberName} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="手机号" description={it?.memberPhone} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="总次数" description={it?.totalAmount} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="剩余次数" description={it?.leftAmount} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="开卡日期" description={it?.bizDate} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="总时长" description={it?.totalTime} />
+          </Card.Grid>
+          <Card.Grid>
+            <Card.Meta title="截止日期" description={it?.expireTime} />
+          </Card.Grid>
+        </Card>
+      );
+    });
+  };
+
+  return <CardAll />;
+};

src/pages/member/components/MemberInfo.jsx

@@ -0,0 +1,28 @@
+import { Card } from "antd";
+import React from "react";
+export default (props) => {
+  const { memberList } = props;
+  return (
+    <Card
+      style={{ width: "100%" }}
+      title="会员信息"
+    >
+      <Card.Grid>
+        <Card.Meta title="会员名称" description={memberList?.memberName} />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta title="手机号" description={memberList?.phone} />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta title="性别" description={memberList?.sex} />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta title="状态" description={memberList?.status} />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta title="注册日期" description={memberList?.bizDate} />
+      </Card.Grid>
+
+    </Card>
+  );
+};

src/pages/member/index.jsx

@@ -0,0 +1,82 @@
+import React from "react";
+import { getTaMember } from "@/services/taMember";
+import List from "@/components/Page/List";
+import moment from "moment";
+import { useNavigate } from "react-router-dom";
+export default (props) => {
+  const navigate = useNavigate();
+
+  const columns = [
+    {
+      title: "注册日期",
+      dataIndex: "bizDate1",
+      valueType: "dateRange",
+      search: {
+        transform: (value) => {
+          return {
+            startTime: value[0],
+            endTime: value[1],
+          };
+        },
+      },
+      hideInTable: true,
+    },
+    {
+      title: "会员名称",
+      dataIndex: "memberName",
+    },
+    {
+      title: "生日",
+      dataIndex: "birthDay",
+      render: (_, r) => {
+        return r.birthDay ? moment(r.birthDay).format("YYYY-MM-DD") : "";
+      },
+      search: false,
+    },
+    {
+      title: "手机号",
+      dataIndex: "phone",
+    },
+
+    {
+      title: "性别",
+      dataIndex: "sex",
+      search: false,
+    },
+
+    {
+      title: "注册日期",
+      dataIndex: "bizDate",
+      render: (_, r) => {
+        return moment(r.bizDate).format("YYYY-MM-DD");
+      },
+      search: false,
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+
+    },
+  ];
+  return (
+    <List
+      // actionRef={actionRef}
+      rowKey="memberId"
+      onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
+      // onDelete={(record) => handleDelete(record.memberId)}
+      // toolBarRender={() => [
+      //   <Button
+      //     key="1"
+      //     type="primary"
+      //     onClick={() => {
+      //       navigate("/member/edit");
+      //     }}
+      //   >
+      //     新增
+      //   </Button>,
+      // ]}
+      request={getTaMember}
+      columns={columns}
+    />
+  );
+};

src/pages/member/index.less

@@ -0,0 +1,6 @@
+// .scroll {
+// //    .ant-card-body{
+//     overflow-y: scroll !important;
+//     max-height: 700px;
+// //    }
+// }

src/pages/package/Edit.jsx

@@ -0,0 +1,53 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useSearchParams } from "react-router-dom";
+
+import { getTaPackageId } from "@/services/taPackage";
+
+import Page from "@/components/Page";
+import { Button, Card } from "antd";
+import Package from "./components/Package";
+import PackageItem from "./components/PackageItem";
+export default (props) => {
+  const [params] = useSearchParams();
+  const id = params.get("id");
+  const [activeTabKey, setActiveTabKey] = useState("tab1");
+  const [packageList, setPackageList] = useState();
+
+  useEffect(() => {
+    if (id) {
+      getTaPackageId(id).then((res) => {
+        setPackageList(res||{});
+      });
+    }
+  }, [id]);
+
+  const tabList = [
+    {
+      key: "tab1",
+      tab: "套餐项目",
+    },
+    {
+      key: "tab2",
+      tab: "套餐内容",
+    },
+  ];
+  const contentList = {
+    // 套餐项目
+    tab1: <Package id={id} packageList={packageList} />,
+    // 套餐内容
+    tab2: <PackageItem id={id}   />,
+  };
+
+  return (
+    <Page>
+      <Card
+        style={{ width: "100%" }}
+        tabList={tabList}
+        activeTabKey={activeTabKey}
+        onTabChange={(key) => setActiveTabKey(key)}
+      >
+        {contentList[activeTabKey]}
+      </Card>
+    </Page>
+  );
+};

src/pages/package/components/ModalPackageItem.jsx

@@ -0,0 +1,92 @@
+import React, {
+  forwardRef,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from "react";
+import {
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { Modal } from "antd";
+import { postTaPackageItem, putTaPackageItem } from "@/services/taPackageItem";
+import { getTaPackage } from "@/services/taPackage";
+export default forwardRef((props, ref) => {
+  const { curd, open, setOpen } = props;
+  const formRef = useRef();
+  const [packageList, setPackageList] = useState();
+  console.log(ref);
+  const onFinish = (values) => {
+    console.log(ref);
+    if (curd != "new") {
+      // 修改
+      putTaPackageItem(curd?.packageItemId, values)
+        .then(() => {
+          setOpen(false);
+          ref?.current?.reload();
+        })
+        .catch((e) => ref?.current?.reload());
+    } else {
+      // 新增
+      postTaPackageItem(values)
+        .then(() => {
+          setOpen(false);
+          ref?.current?.reload();
+        })
+        .catch((e) => ref?.current?.reload());
+    }
+  };
+
+  useEffect(() => {
+    formRef.current?.resetFields();
+
+    if (curd != "new" && curd) {
+      formRef.current?.setFieldsValue(curd);
+    }
+  }, [curd]);
+
+  useEffect(() => {
+    getTaPackage({ pageSize: 9999 })
+      .then((res) => {
+        const data = (res.records || []).map((it) => {
+          return {
+            label: it.packageName,
+            value: it.packageId,
+          };
+        });
+        setPackageList(data);
+      })
+      .catch((err) => {});
+  }, []);
+
+  return (
+    <Modal
+      title="套餐内容维护"
+      open={open}
+      footer={null}
+      maskClosable={false}
+      onCancel={() => setOpen(false)}
+    >
+      <ProForm
+        layout="horizontal"
+        formRef={formRef}
+        onFinish={onFinish}
+        submitter={{
+          render: (_, doms) => [
+            doms.find((dom) => dom.props?.children === "提交"),
+          ],
+        }}
+      >
+        <ProFormText name="itemName" label="项目名称" />
+        <ProFormText name="charge" label="金额" />
+        <ProFormSelect
+          name="packageId"
+          label="套餐项目"
+          options={packageList}
+        />
+      </ProForm>
+    </Modal>
+  );
+});

src/pages/package/components/Package.jsx

@@ -0,0 +1,73 @@
+import React, { useEffect, useRef } from "react";
+import { postTaPackage, putTaPackage } from "@/services/taPackage";
+import {
+  ProForm,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { Button } from "antd";
+import { useNavigate } from "react-router-dom";
+import { UploadImage } from "@/components/Upload";
+export default (props) => {
+  const { id, packageList } = props;
+  const formRef = useRef();
+
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (packageList) {
+      formRef.current?.setFieldsValue(packageList);
+    }
+  }, [packageList]);
+  const onFinish = (values) => {
+    console.log(values);
+    if (!id) {
+      postTaPackage(values).then(() => {
+        navigate(-1);
+      });
+    } else {
+      putTaPackage(id, values).then(() => {
+        navigate(-1);
+      });
+    }
+  };
+
+  const onChange=(file)=>{
+    console.log(file)
+  }
+  return (
+    <ProForm
+      formRef={formRef}
+      onFinish={onFinish}
+      layout="horizontal"
+      submitter={{
+        render: (_, doms) => [
+          doms.find((dom) => dom.props?.children === "提交"),
+          <Button onClick={() => navigate(-1)}>返回</Button>,
+        ],
+      }}
+    >
+      <ProFormText name="packageName" label="套餐名称" />
+      <ProFormText name="packageType" label="套餐类型" />
+      <ProForm.Item name="thumb" label="图片">
+        <UploadImage onChange={onChange}/>
+      </ProForm.Item>
+      <ProFormMoney name="charge" label="价格" />
+      <ProFormText name="limitType" label="是否限制型消费" />
+      <ProFormText name="limitNum" label="限制数目" />
+      <ProFormSelect
+        name="limitUnit"
+        label="限制单位"
+        options={[
+          { key: "year", label: "year" },
+          { key: "month", label: "month" },
+          { key: "day", label: "day" },
+          { key: "order", label: "order" },
+        ]}
+      />
+      <ProFormText name="desc" label="说明" />
+      <ProFormSelect name="status" label="状态" />
+    </ProForm>
+  );
+};

src/pages/package/components/PackageItem.jsx

@@ -0,0 +1,86 @@
+import React, {
+  forwardRef,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from "react";
+import {
+  getTaPackageItem,
+  getTaPackageId,
+  deleteTaPackageItem,
+} from "@/services/taPackageItem";
+import List from "@/components/Page/List";
+import moment from "moment";
+import { useNavigate } from "react-router-dom";
+import ModalPackageItem from "./ModalPackageItem";
+import { Button } from "antd";
+export default (props) => {
+  const { id } = props;
+  const [open, setOpen] = useState(false);
+  const [curd, setCurd] = useState();
+
+  const actionRef = useRef();
+  const columns = [
+    {
+      title: "项目名称",
+      dataIndex: "itemName",
+    },
+    {
+      title: "金额",
+      dataIndex: "charge",
+      search: false,
+    },
+  ];
+
+  const handleDelete = (id) => {
+    deleteTaPackageItem(id).then((res) => actionRef.current.reload());
+  };
+  const handOpen = () => {
+    setCurd("new");
+    setOpen(true);
+  };
+  const onEdit = (record) => {
+    setCurd(record);
+    setOpen(true);
+  };
+  useImperativeHandle(
+    actionRef,
+    () => ({
+      reload: () => actionRef?.current?.reload(),
+    }),
+    []
+  );
+
+//   const beforeSearchSubmit = (params) => {
+//     setParams(params);
+//   };
+//   const [params, setParams] = useState();
+  return (
+    <>
+      <List
+        actionRef={actionRef}
+        rowKey="packageItemId"
+        onEdit={(record) => onEdit(record)}
+        onDelete={(record) => handleDelete(record.packageItemId)}
+        toolBarRender={() => {
+          return [
+            <Button key="1" type="primary" onClick={handOpen}>
+              新增
+            </Button>,
+          ];
+        }}
+        params={{packageId:id}}
+        request={getTaPackageId}
+        columns={columns}
+        // beforeSearchSubmit={setParams}
+      />
+
+      <ModalPackageItem
+        curd={curd}
+        open={open}
+        setOpen={setOpen}
+        ref={actionRef}
+      />
+    </>
+  );
+};

src/pages/package/index.jsx

@@ -1,7 +1,10 @@
 import List from "@/components/Page/List";
 import React from "react";
 import { getTaPackage, deleteTaPackage } from "@/services/taPackage";
+import { useNavigate } from "react-router-dom";
+import { Button, Image } from "antd";
 export default (props) => {
+    const navigate = useNavigate();
   const columns = [
     {
       title: "套餐名称",
@@ -13,10 +16,19 @@ export default (props) => {
       dataIndex: "packageType",
     },
 
+
     {
       title: "图片",
       dataIndex: "thumb",
       search: false,
+      render: (t) => (
+        <Image
+          src={t}
+          height={60}
+          style={{ borderRadius: "15px" }}
+          // fallback="/image/default_1.png"
+        />
+      ),
     },
     {
       title: "价格",
@@ -51,14 +63,28 @@ export default (props) => {
       search: false,
     },
   ];
-
+  const handleDelete = (id) => {
+    deleteTaPackage(id).then(() => {});
+  };
   return (
     <List
+      // actionRef={actionRef}
       rowKey="packageId"
       request={getTaPackage}
+      onEdit={(record) => navigate(`/package/edit?id=${record.packageId}`)}
+      onDelete={(record) => handleDelete(record.packageId)}
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/package/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
       columns={columns}
-      onEdit={(item) => {}}
-      onDelete={(item) => {}}
     />
   );
 };

src/pages/project/Edit.jsx

@@ -0,0 +1,83 @@
+import React, { useEffect, useRef } from "react";
+import {
+  postTaProject,
+  putTaProject,
+  getTaProjectId,
+} from "@/services/taProject";
+import Page from "@/components/Page";
+import { Button, Card } from "antd";
+import {
+  ProForm,
+  ProFormDateTimeRangePicker,
+  ProFormMoney,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import moment from "moment";
+export default (props) => {
+  const formRef = useRef();
+  const navigate = useNavigate();
+
+  const [params] = useSearchParams();
+  const id = params.get("id");
+
+  useEffect(() => {
+    if (id) {
+      getTaProjectId(id).then((res) => {
+
+        formRef.current?.setFieldsValue({
+            ...res,
+            time:[moment(res.startTime),moment(res.endTime)] 
+        });
+      });
+    }
+  }, []);
+  const onFinish = (values) => {
+    const data = {
+      ...values,
+      startTime: values.time[0],
+      endTime: values.time[1],
+    };
+    console.log(data);
+    if (!id) {
+      postTaProject(data).then((res) => {
+        navigate(-1);
+      });
+    } else if (id) {
+      putTaProject(id, data).then((res) => {
+        navigate(-1);
+      });
+    }
+  };
+  return (
+    <Page>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          onFinish={onFinish}
+          layout="horizontal"
+          submitter={{
+            render: (_, doms) => [
+              doms.find((dom) => dom.props?.children === "提交"),
+              <Button onClick={() => navigate(-1)}>返回</Button>,
+            ],
+          }}
+        >
+          <ProFormText name="partyA" label="甲方联系人" />
+          <ProFormText name="partyAName" label="甲方名称" />
+          <ProFormText name="partyB" label="乙方联系人" />
+          <ProFormText name="partyBName" label="乙方名称" />
+          <ProFormText name="projectName" label="项目名称" />
+          <ProFormText name="introduction" label="项目简介" />
+          <ProFormDateTimeRangePicker name="time" label="工作周期" />
+          <ProFormMoney name="quotation" label="合同报价" />
+          <ProFormMoney name="receivedMoney" label="已收款" />
+          <ProFormMoney name="invoicedMoney" label="已开票额" />
+          <ProFormText name="stageName" label="阶段名称" />
+          <ProFormSelect name="status" label="状态" />
+        </ProForm>
+      </Card>
+    </Page>
+  );
+};

src/pages/project/index.jsx

@@ -0,0 +1,116 @@
+import List from "@/components/Page/List";
+import React, { useRef } from "react";
+import { getTaProject, deleteTaProject } from "@/services/taProject";
+import { Button } from "antd";
+import { useNavigate } from "react-router-dom";
+import moment from "moment";
+export default (props) => {
+  const navigate = useNavigate();
+
+  const columns = [
+    {
+      title: "项目日期",
+      dataIndex: "startTime1",
+      search: {
+        transform: (value) => {
+          return {
+            startTime: value[0],
+            endTime: value[1],
+          };
+        },
+      },
+
+      hideInTable: true,
+    },
+
+    {
+      title: "甲方",
+      dataIndex: "partyA",
+      search: false,
+    },
+    {
+      title: "甲方名称",
+      dataIndex: "partyAName",
+    },
+    {
+      title: "已方",
+      dataIndex: "partyB",
+      search: false,
+    },
+    {
+      title: "已方名称",
+      dataIndex: "partyBName",
+    },
+
+    {
+      title: "项目名称",
+      dataIndex: "projectName",
+    },
+    {
+      title: "项目简介",
+      dataIndex: "introduction",
+      search: false,
+    },
+
+    {
+      title: "开始日期",
+      dataIndex: "startTime",
+      render: (t) => moment(t).format("YYYY-MM-DD"),
+      search: false,
+    },
+    {
+      title: "结束日期",
+      dataIndex: "endTime",
+      render: (t) => moment(t).format("YYYY-MM-DD"),
+      search: false,
+    },
+    {
+      title: "合同报价",
+      dataIndex: "quotation",
+      search: false,
+    },
+    {
+      title: "已收款",
+      dataIndex: "receivedMoney",
+      search: false,
+    },
+    {
+      title: "已开票额",
+      dataIndex: "invoicedMoney",
+      search: false,
+    },
+    {
+      title: "阶段名称",
+      dataIndex: "stageName",
+      search: false,
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+    },
+  ];
+  const actionRef = useRef();
+  return (
+    <List
+      actionRef={actionRef}
+      rowKey="projectId"
+      onEdit={(record) => navigate(`/project/edit?id=${record.projectId}`)}
+      onDelete={(record) =>
+        deleteTaProject(record.projectId).then(() => actionRef.current.reload())
+      }
+      toolBarRender={() => [
+        <Button
+          key="1"
+          type="primary"
+          onClick={() => {
+            navigate("/project/edit");
+          }}
+        >
+          新增
+        </Button>,
+      ]}
+      request={getTaProject}
+      columns={columns}
+    />
+  );
+};

src/routes/routes.jsx

@@ -11,14 +11,17 @@ import Login from "@/pages/login";
 import Page404 from "@/pages/404";
 import AdUser from "@/pages/adUser";
 import CustomEdit from "@/pages/adUser/Edit";
-// import Project from "@/pages/project";
-// import ProjectEdit from "@/pages/project/Edit";
+import Project from "@/pages/project";
+import ProjectEdit from "@/pages/project/Edit";
 import User from "@/pages/user";
 import UserEdit from "@/pages/user/Edit";
 import Menu from "@/pages/menu";
 import Role from "@/pages/role";
 import Dept from "@/pages/dept";
 import Package from "@/pages/package";
+import PackageEdit from "@/pages/package/Edit";
+import Member from "@/pages/member";
+import MemberEdit from "@/pages/member/Edit";
 // import RoleEdit from "@/pages/role/Edit";
 /**
  * meta 用来扩展自定义数据数据
@@ -54,38 +57,22 @@ export const authRoutes = [
       hideInMenu: true,
     },
   },
-  // {
-  //   path: "project",
-  //   element: <Project />,
-  //   meta: {
-  //     title: "项目管理",
-  //     icon: <FileTextOutlined />,
-  //   },
-  // },
-  // {
-  //   path: "project/edit",
-  //   element: <ProjectEdit />,
-  //   meta: {
-  //     title: "项目维护",
-  //     hideInMenu: true,
-  //   },
-  // },
-  // {
-  //   path: "user",
-  //   element: <User />,
-  //   meta: {
-  //     title: "人员管理",
-  //     icon: <UserOutlined />,
-  //   },
-  // },
-  // {
-  //   path: "user/edit",
-  //   element: <UserEdit />,
-  //   meta: {
-  //     title: "人员维护",
-  //     hideInMenu: true,
-  //   },
-  // },
+  {
+    path: "project",
+    element: <Project />,
+    meta: {
+      title: "项目管理",
+      icon: <FileTextOutlined />,
+    },
+  },
+  {
+    path: "project/edit",
+    element: <ProjectEdit />,
+    meta: {
+      title: "项目维护",
+      hideInMenu: true,
+    },
+  },
   {
     path: "dept",
     element: <Dept />,
@@ -94,14 +81,7 @@ export const authRoutes = [
       icon: <HeartOutlined />,
     },
   },
-  // {
-  //   path: "menu",
-  //   element: <Menu />,
-  //   meta: {
-  //     title: "菜单管理",
-  //     icon: <UserOutlined />,
-  //   },
-  // },
+
   {
     path: "role",
     element: <Role />,
@@ -114,11 +94,34 @@ export const authRoutes = [
     path: "package",
     element: <Package />,
     meta: {
-      title: "收费套餐管理",
+      title: "套餐管理",
       icon: <HourglassTwoTone />,
     },
   },
-
+  {
+    path: "package/edit",
+    element: <PackageEdit />,
+    meta: {
+      title: "套餐维护",
+      hideInMenu: true,
+    },
+  },
+  {
+    path: "member",
+    element: <Member />,
+    meta: {
+      title: "会员管理",
+      icon: <HourglassTwoTone />,
+    },
+  },
+  {
+    path: "member/edit",
+    element: <MemberEdit />,
+    meta: {
+      title: "会员管理",
+      hideInMenu: true,
+    },
+  },
   // {
   //   path: "role/edit",
   //   element: <RoleEdit />,

src/services/taMember.js

@@ -0,0 +1,11 @@
+import request from "@/utils/request";
+
+/**
+ * 会员查询
+ */
+export const getTaMember = (params) => request("/taMember", { params });
+
+/**
+ * 会员ID查询
+ */
+export const getTaMemberId = (id) => request(`/taMember/${id}`);

src/services/taMemberCard.js

@@ -1,7 +0,0 @@
-import request from "@/utils/request";
-
-
-/**
- * 会员查询
- */
-export const getTaMemberCard = (params) => request("/taMemberCard", { params });

src/services/taPackageItem.js

@@ -0,0 +1,34 @@
+import request from "@/utils/request";
+
+/*
+ * 分页查询
+ */
+export const getTaPackageItem = (params) => request(`/taPackageItem`, { params });
+
+/*
+ * 新增数据
+ */
+export const postTaPackageItem = (data) => request('/taPackageItem', { data, method: 'post' });
+
+/*
+ * 更新数据
+ */
+export const putTaPackageItem = (id, data) => request(`/taPackageItem/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaPackageItem = (id) => request(`/taPackageItem/${id}`, { method: 'delete' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaPackageItemId = (id) => request(`/taPackageItem/${id}`);
+
+
+
+
+/*
+ * 通过packageId查询所有
+ */
+export const getTaPackageId = (params) => request(`/taPackageIdItem`,{params});

src/services/taProject.js

@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+
+/*
+ * 分页查询
+ */
+export const getTaProject = (params) => request(`/taProject`, { params });
+
+/*
+ * 新增数据
+ */
+export const postTaProject = (data) => request('/taProject', { data, method: 'post' });
+
+/*
+ * 更新数据
+ */
+export const putTaProject = (id, data) => request(`/taProject/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaProject = (id) => request(`/taProject/${id}`, { method: 'delete' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaProjectId = (id) => request(`/taProject/${id}`);

src/utils/request.js

@@ -36,7 +36,7 @@ instance.interceptors.request.use(
         ...headers,
         Authorization: token || "",
         "x-client-type":"pc.admin",
-        "Content-Type": "application/json;charset=utf-8"
+        // "Content-Type": "application/json;charset=utf-8"
       },
       responseType: download ? "blob" : responseType,
     };