F

.env

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

.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;
-      onChange(url);
+      onChange(info.file.response.res);
     }
   };
 
   const previewUrl = getRealPath ? getRealPath(value) : value;
-console.log(value)
-console.log(previewUrl)
+// console.log(value)
+// console.log(previewUrl)
+console.log("propsprops",props)
   return (
     <Upload
       listType="picture-card"
@@ -55,7 +56,7 @@ console.log(previewUrl)
       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/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/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/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) {