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

.env

@@ -0,0 +1 @@
+VITE_SERVER_BASE=/api

.env.production

@@ -0,0 +1 @@
+VITE_SERVER_BASE=http://api.crm2.njyunzhi.com/api/admin

src/components/Upload/UploadImage.jsx

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

src/components/Upload/request.js

@@ -1,17 +1,7 @@
-import request from '@/utils/request';
 
-const upload = (file, fileType = 'image') => {
-  const formData = new FormData();
-  formData.append("file", file);
-  formData.append("fileType", fileType);
-  return request('/upload', {
-    method: 'post',
-    data: formData,
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    }
-  });
-}
+import { uploadFile as upload } from "@/store/oss";
+
+
 
 /**
  * 上传文件
@@ -19,8 +9,10 @@ const upload = (file, fileType = 'image') => {
  */
 export function uploadFile(params) {
   const { file, onSuccess, onError } = params;
+  console.log(upload)
   upload(file).then((res) => {
-    onSuccess(res, file)
+    console.log("resresres",res)
+   onSuccess({res}, file);
   }).catch((e) => {
     onError(e)
   });

src/pages/member/components/MemberCardInfo.jsx

@@ -1,17 +1,18 @@
 import React, { useEffect, useState } from "react";
 import { Button, Card, Switch, Table } from "antd";
-import { ProTable } from '@ant-design/pro-components';
+import { ProTable } from "@ant-design/pro-components";
 import { getTaMemberCard } from "@/services/taMemberCard";
-import { queryTable } from '@/utils/request'
+import { queryTable } from "@/utils/request";
 import moment from "moment";
 import MemberOrderModal from "./MemberOrderModal";
 
-
 export default (props) => {
-  const { memberId } = props
+  const { memberId } = props;
   const actionRef = React.useRef();
 
-  const TaMemberCardList = queryTable(() => getTaMemberCard({ memberId: memberId }))
+  const TaMemberCardList = queryTable(() =>
+    getTaMemberCard({ memberId: memberId })
+  );
   const [id, setId] = useState();
   const [open, setOpen] = useState(false);
 
@@ -35,32 +36,37 @@ export default (props) => {
     {
       title: "开卡日期",
       dataIndex: "bizDate",
-      render: (it) => moment(it).format("YYYY-MM-DD HH:mm:ss")
+      render: (it) => (it ? moment(it).format("YYYY-MM-DD HH:mm:ss") : ""),
     },
     {
       title: "总时长",
-      dataIndex: "totalTime"
+      dataIndex: "totalTime",
     },
     {
       title: "截止日期",
       dataIndex: "expireTime",
-      render: (it) => moment(it).format("YYYY-MM-DD HH:mm:ss")
+      render: (it) => (it ? moment(it).format("YYYY-MM-DD HH:mm:ss") : ""),
     },
-    {
-      title: '操作',
-      valueType: 'option',
-      key: 'option',
+    { 
+      title: "操作",
+      valueType: "option",
+      key: "option",
       ellipsis: true,
       render: (_, record) => [
-        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => onClickOpen(record)}>
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={1}
+          onClick={() => onClickOpen(record)}
+        >
           消费记录
-        </Button>
-      ]
-    }
-  ]
+        </Button>,
+      ],
+    },
+  ];
 
   const onClickOpen = (val) => {
-    setId(val?.cardId)
+    setId(val?.cardId);
     setOpen(true);
   };
 

src/pages/member/components/MemberOrderModal.jsx

@@ -1,31 +1,43 @@
 import React, { useEffect, useState } from "react";
 import { Button } from "antd";
-import {
-  ModalForm,
-  ProTable
-} from '@ant-design/pro-components';
+import { ModalForm, ProTable } from "@ant-design/pro-components";
 import moment from "moment";
 import { getTaOrder } from "@/services/taOrder";
-import { queryTable } from '@/utils/request'
+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 TaTaOrderList = queryTable(() => getTaOrder({ memberCardId: id }));
 
   const columns = [
     {
       title: "消费类型",
       dataIndex: "billType",
-      render: (it) => it == 'consume' ? '消费' : it == 'refund' ? '退款' : it == 'recharge' ? '开卡' : it == 'withdraw' ? '提现' : '未知'
+      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")
+      render: (it) => moment(it).format("YYYY-MM-DD HH:mm:ss"),
     },
-  ]
+  ];
 
   return (
     <ModalForm
@@ -33,25 +45,18 @@ export default (props) => {
       open={open}
       modalProps={{
         destroyOnClose: true,
-        onCancel: onCancel
+        onCancel: onCancel,
       }}
       submitter={{
         // 完全自定义整个区域
         render: (props, doms) => {
           return [
-            <Button
-              onClick={onCancel}
-            >
-              取消
-            </Button>,
-            <Button
-              type="primary"
-              onClick={onCancel}
-            >
+            <Button onClick={onCancel}>取消</Button>,
+            <Button type="primary" onClick={onCancel}>
               确定
             </Button>,
           ];
-        }
+        },
       }}
     >
       <ProTable
@@ -63,5 +68,5 @@ export default (props) => {
         request={TaTaOrderList}
       />
     </ModalForm>
-  )
-}
+  );
+};

src/pages/member/index.jsx

@@ -11,7 +11,8 @@ export default (props) => {
   const [isModalOpen, setIsModalOpen] = React.useState(false);
   const [modalTitle, setModalTitle] = React.useState("");
   const [modalObj, setModalObj] = React.useState({});
-
+  const today = moment().format("YYYY-MM-DDTHH:mm:ss");
+  const newToday = moment(today);
   const columns = [
     {
       title: "注册日期",
@@ -76,11 +77,11 @@ export default (props) => {
   const onWrite = (id) => {
     // putTaMemberCardIdWrite().then((res) => {});
   };
-const actionRef=useRef()
+  const actionRef = useRef();
 
-const reload=()=>{
-  return actionRef?.current?.reload()
-}
+  const reload = () => {
+    return actionRef?.current?.reload();
+  };
 
   return (
     <>
@@ -90,14 +91,29 @@ const reload=()=>{
         // onEdit={(record) => navigate(`/member/edit?id=${record.memberId}`)}
         columnOptionRender={(_, record) => {
           const dataNum = record.taMemberCardList.reduce((total, item) => {
-            return (total += item.leftAmount);
+            if (!item.expireTime) {
+              return (total += item.leftAmount);
+            } else {
+              const endTime = moment(item.expireTime);
+              const expireNum = endTime.diff(newToday, "minutes");
+              console.log(expireNum)
+              if (expireNum >= 5) {
+                return true;
+              }else{
+                return false
+              }
+            }
           }, 0);
+          console.log(dataNum)
+          console.log(record)
           return [
             <Button
               key="A2"
               style={{ padding: 0 }}
               type="link"
-              onClick={() => navigate(`/custom/member/edit?id=${record.memberId}`)}
+              onClick={() =>
+                navigate(`/custom/member/edit?id=${record.memberId}`)
+              }
             >
               详情
             </Button>,
@@ -134,7 +150,7 @@ const reload=()=>{
         modalTitle={modalTitle}
         modalObj={modalObj}
         reload={reload}
-      /> 
+      />
     </>
   );
 };

src/pages/package/components/ModalPackageItem.jsx

@@ -31,6 +31,7 @@ export default forwardRef((props, ref) => {
         .then(() => {
           setOpen(false);
           ref?.current?.reload();
+          formRef.current?.resetFields();
         })
         .catch((e) => ref?.current?.reload());
     } else {
@@ -39,14 +40,13 @@ export default forwardRef((props, ref) => {
         .then(() => {
           setOpen(false);
           ref?.current?.reload();
+          formRef.current?.resetFields();
         })
         .catch((e) => ref?.current?.reload());
     }
   };
 
   useEffect(() => {
-    formRef.current?.resetFields();
-
     if (curd != "new" && curd) {
       formRef.current?.setFieldsValue(curd);
     }
@@ -65,14 +65,17 @@ export default forwardRef((props, ref) => {
       })
       .catch((err) => {});
   }, []);
-
+  const onCancel = () => {
+    setOpen(false);
+    formRef.current?.resetFields();
+  };
   return (
     <Modal
       title="套餐内容维护"
       open={open}
       footer={null}
       maskClosable={false}
-      onCancel={() => setOpen(false)}
+      onCancel={onCancel}
     >
       <ProForm
         {...formItemLayout}

src/pages/package/components/Package.jsx

@@ -34,9 +34,9 @@ export default (props) => {
     }
   };
 
-  const onChange = (file) => {
-    console.log('file', file);
-  };
+  // const onChange = (file) => {
+  //   console.log('file', file);
+  // };
   return (
     <ProForm
       formRef={formRef}
@@ -55,7 +55,7 @@ export default (props) => {
             <Col offset={1}>
               <Button onClick={() => navigate(-1)}>返回</Button>
             </Col>
-          </Row>
+          </Row>,
           // doms.find((dom) => dom.props?.children === "提交"),
           // <Button onClick={() => navigate(-1)}>返回</Button>,
         ],
@@ -64,7 +64,7 @@ export default (props) => {
       <ProFormText name="packageName" label="套餐名称" />
       <ProFormText name="packageType" label="套餐类型" />
       <ProForm.Item name="thumb" label="套餐图片">
-        <UploadImage onChange={onChange} />
+        <UploadImage />
       </ProForm.Item>
       <ProFormMoney name="charge" label="套餐价格" />
       {/* <ProFormText name="limitType" label="是否限制型消费" /> */}
@@ -84,8 +84,8 @@ export default (props) => {
         name="limitType"
         label="是否限制型消费"
         options={[
-          { label: '是', value: 1 },
-          { label: '否', value: 0 },
+          { label: "是", value: 1 },
+          { label: "否", value: 0 },
         ]}
       />
       {/* <ProFormSelect
@@ -106,8 +106,8 @@ export default (props) => {
         name="status"
         label="套餐状态"
         options={[
-          { label: '上架', value: 1 },
-          { label: '下架', value: 0 },
+          { label: "上架", value: 1 },
+          { label: "下架", value: 0 },
         ]}
       />
     </ProForm>

src/services/ossPolicy.js

@@ -0,0 +1,3 @@
+import request from "@/utils/request";
+
+export const getPolicy = () => request("/upload/policy");

src/store/oss.js

@@ -0,0 +1,58 @@
+import axios from "axios";
+import { getPolicy as getOssPolicy } from "@/services/ossPolicy";
+
+let oss;
+let expire = 0;
+
+const resetPolicy = () => {
+  return getOssPolicy().then((res) => {
+    oss = res;
+    expire = res.expire;
+
+    return oss;
+  });
+}
+
+const getOssAsync = () => {
+  const current = (new Date()).getTime() / 1000;
+  // 3s 缓冲
+  if (expire <= current + 3) {
+    // 说明快到期了
+    return resetPolicy();
+  } else {
+    return Promise.resolve(oss);
+  }
+}
+
+const request = axios.create();
+const uploadFile = file => {
+  return getOssAsync().then(oss => {
+    const formData = new FormData();
+    const fileName= (new Date).getTime() + '_' + file.name;
+
+    formData.append("OSSAccessKeyId", oss.accessId);
+    formData.append("signature", oss.signature);
+    formData.append("policy", oss.policy);
+    formData.append("key", oss.dir + fileName);
+    formData.append("success_action_status", 200);
+    formData.append("file", file);
+  
+    return request(oss.host, {
+      method: "post",
+      data: formData,
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+    }).then(res => {
+      console.log(res);
+
+      if (res.status == 200) {
+        return `${oss.customDomain}/${oss.dir}${fileName}`;
+      }
+    });
+  });
+}
+
+export {
+  uploadFile,
+}

src/utils/biz.js

@@ -0,0 +1,34 @@
+// 消费
+export const BILL_CONSUME = "consume";
+// 退款
+export const BILL_REFUND = "refund";
+// 充值-开卡
+export const BILL_RECHARGE = "recharge";
+// 提现
+export const BILL_WITHDRAW = "withdraw";
+
+export const BILL_TYPE = {
+  [BILL_CONSUME]: "消费",
+  [BILL_REFUND]: "退款",
+  [BILL_RECHARGE]: "开卡",
+  [BILL_WITHDRAW]: "提现",
+};
+
+export const BILL_TYPE_OPTIONS = [
+  {value: "",text: "全部"},
+  {value: BILL_CONSUME,text: "消费"},
+  { value: BILL_REFUND, text: "退款" },
+  { value: BILL_RECHARGE, text: "开卡" },
+  { value: BILL_WITHDRAW, text: "提现" },
+];
+
+// export const ORDER_STATUS_OPTIONS = [
+//   {value: BILL_CONSUME,text: "消费"},
+//   { value: BILL_REFUND, text: "退款" },
+//   { value: BILL_RECHARGE, text: "开卡" },
+//   { value: BILL_WITHDRAW, text: "提现" },
+// ];
+
+
+// 计次卡
+export const CARD_TYPE_OF_ORDER = "order";

src/utils/request.js

@@ -7,7 +7,7 @@ const instance = axios.create({
   baseURL: process.env.NODE_ENV == "development" ? "/api/admin" : SERVER_BASE,
   timeout: 10000,
 });
-
+console.log(process.env.NODE_ENV)
 // 添加请求拦截器
 instance.interceptors.request.use(
   function (config) {

vite.config.js

@@ -5,7 +5,7 @@ import vitePluginImp from "vite-plugin-imp";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: '',
+  base: '/admin/',
   server: {
     port: 3009,
     host: "0.0.0.0",