f

src/pages/member/Edit.jsx

@@ -64,6 +64,21 @@ export default (props) => {
   };
 
   const columns = [
+    {
+      title: '套餐名称',
+      dataIndex: "taPackageName"
+    },
+    {
+      title: '套餐类型',
+      dataIndex: "taPackageLimitUnit",
+      valueType: 'select',
+      valueEnum: {
+        'year': '年卡',
+        'month': '月卡',
+        'day': '日卡',
+        'order': '次卡'
+      }
+    },
     {
       title: '会员名称',
       dataIndex: "memberName",
@@ -73,7 +88,7 @@ export default (props) => {
       dataIndex: "billType",
       render: (it) =>
         it == BILL_CONSUME
-          ? "消费"
+          ? "消费-核销"
           : it == BILL_REFUND
             ? "退款"
             : it == BILL_RECHARGE

src/pages/member/components/MemberCardInfo.jsx

@@ -6,7 +6,6 @@ import { getTaPackage } from "@/services/taPackage";
 import { getTaOrder } from "@/services/taOrder";
 import { queryTable, queryDict } from "@/utils/request";
 import moment from "moment";
-import MemberOrderModal from "./MemberOrderModal";
 
 const PackageNameList = queryDict(getTaPackage, { labelKey: "packageName", valueKey: "packageId" });
 
@@ -26,6 +25,17 @@ export default (props) => {
       request: PackageNameList,
       ellipsis: true,
     },
+    {
+      title: "套餐类型",
+      dataIndex: "timeUnit",
+      valueType: 'select',
+      valueEnum: {
+        'year': '年卡',
+        'month': '月卡',
+        'day': '日卡',
+        'order': '次卡'
+      }
+    },
     {
       title: "开卡人姓名",
       dataIndex: "memberName",

src/pages/member/components/MemberOrderModal.jsx

@@ -1,72 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { Button } from "antd";
-import { ModalForm, ProTable } from "@ant-design/pro-components";
-import moment from "moment";
-import { getTaOrder } from "@/services/taOrder";
-import { queryTable } from "@/utils/request";
-
-import {
-  BILL_CONSUME,
-  BILL_REFUND,
-  BILL_RECHARGE,
-  BILL_WITHDRAW,
-} from "@/utils/biz";
-export default (props) => {
-  const { open, onCancel, id } = props;
-
-  const actionRef = React.useRef();
-  const TaTaOrderList = queryTable(() => getTaOrder({ memberCardId: id }));
-
-  const columns = [
-    {
-      title: "消费类型",
-      dataIndex: "billType",
-      render: (it) =>
-        it == BILL_CONSUME
-          ? "消费"
-          : it == BILL_REFUND
-          ? "退款"
-          : it == BILL_RECHARGE
-          ? "充值-开卡"
-          : it == BILL_WITHDRAW
-          ? "提现"
-          : "未知",
-    },
-    {
-      title: "消费时间",
-      dataIndex: "createdAt",
-      render: (it) => moment(it).format("YYYY-MM-DD HH:mm:ss"),
-    },
-  ];
-
-  return (
-    <ModalForm
-      title="消费记录"
-      open={open}
-      modalProps={{
-        destroyOnClose: true,
-        onCancel: onCancel,
-      }}
-      submitter={{
-        // 完全自定义整个区域
-        render: (props, doms) => {
-          return [
-            <Button onClick={onCancel}>取消</Button>,
-            <Button type="primary" onClick={onCancel}>
-              确定
-            </Button>,
-          ];
-        },
-      }}
-    >
-      <ProTable
-        actionRef={actionRef}
-        rowKey="cardId"
-        columns={columns}
-        options={false}
-        search={false}
-        request={TaTaOrderList}
-      />
-    </ModalForm>
-  );
-};

src/pages/package/components/Package.jsx

@@ -55,9 +55,7 @@ export default (props) => {
             <Col offset={1}>
               <Button onClick={() => navigate(-1)}>返回</Button>
             </Col>
-          </Row>,
-          // doms.find((dom) => dom.props?.children === "提交"),
-          // <Button onClick={() => navigate(-1)}>返回</Button>,
+          </Row>
         ],
       }}
     >
@@ -67,11 +65,9 @@ export default (props) => {
         <UploadImage />
       </ProForm.Item>
       <ProFormMoney name="charge" label="套餐价格" />
-      {/* <ProFormText name="limitType" label="是否限制型消费" /> */}
-      <ProFormText name="limitNum" label="限制数目" />
       <ProFormSelect
         name="limitUnit"
-        label="限制单位"
+        label="套餐单位"
         options={[
           { value: "year", label: "年" },
           { value: "month", label: "月" },
@@ -79,28 +75,15 @@ export default (props) => {
           { value: "order", label: "次" },
         ]}
       />
+      <ProFormText name="limitNum" label="套餐数目" placeholder="请输入年、月、日卡时长或次卡次数" />
       <ProFormText name="desc" label="套餐说明" />
-      <ProFormRadio.Group
+      {/* <ProFormRadio.Group
         name="limitType"
         label="是否限制型消费"
         options={[
           { label: "是", value: 1 },
           { label: "否", value: 0 },
         ]}
-      />
-      {/* <ProFormSelect
-        name="status"
-        label="状态"
-        options={[
-          {
-            label: "下架",
-            value: 0,
-          },
-          {
-            label: "上架",
-            value: 1,
-          },
-        ]}
       /> */}
       <ProFormRadio.Group
         name="status"

src/pages/query/index.jsx

@@ -27,15 +27,27 @@ export default (props) => {
     },
     {
       title: '套餐名称',
-      dataIndex: "packageName",
-      search: false
+      dataIndex: "taPackageName",
+      search: false,
+    },
+    {
+      title: '套餐类型',
+      dataIndex: "taPackageLimitUnit",
+      valueType: 'select',
+      search: false,
+      valueEnum: {
+        'year': '年卡',
+        'month': '月卡',
+        'day': '日卡',
+        'order': '次卡'
+      }
     },
     {
       title: "消费类型",
       dataIndex: "billType",
       valueType: "select",
       valueEnum: {
-        'consume': '消费',
+        'consume': '消费-核销',
         'refund': '退款',
         'recharge': '充值-开卡',
         'withdraw': '提现',

src/utils/request.js

@@ -137,8 +137,6 @@ export function queryDict (
     })
       .then((res) => {
         return res?.records?.map((x) => (
-          console.log('xiaofang-->x', x),
-          // console.log('xiaofang-->', x[labelKey]),
           {
             label: x[labelKey],
             value: getValueOfType(x[valueKey], valueType),