F

src/pages/member/components/MemberCardInfo.jsx

@@ -1,37 +1,43 @@
 import React from "react";
 import { Button, Card, Switch } from "antd";
+import moment from "moment";
 export default (props) => {
   const { taMemberCardList } = props;
 
-
   return (taMemberCardList || []).map((it) => (
-      <Card
-        key={it?.cardId}
-        style={{ width: "100%", marginTop: 16 }}
-        title={it?.cardType ? it?.cardType : "会员卡"}
-        loading={!it}
-      >
-        <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>
+    <Card
+      key={it?.cardId}
+      style={{ width: "100%", marginTop: 16 }}
+      title={it?.cardType ? it?.cardType : "会员卡"}
+      loading={!it}
+    >
+      <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={moment(it?.bizDate).format("YYYY-MM-DD HH:mm:ss")}
+        />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta title="总时长" description={it?.totalTime} />
+      </Card.Grid>
+      <Card.Grid>
+        <Card.Meta
+          title="截止日期"
+          description={it?.expireTime?moment(it?.expireTime).format("YYYY-MM-DD HH:mm:ss"):""}
+        />
+      </Card.Grid>
+    </Card>
   ));
 };

src/pages/member/components/MemberInfo.jsx

@@ -1,4 +1,5 @@
 import { Card } from "antd";
+import moment from "moment";
 import React from "react";
 export default (props) => {
   const { memberList } = props;
@@ -25,7 +26,7 @@ export default (props) => {
         />
       </Card.Grid>
       <Card.Grid>
-        <Card.Meta title="注册日期" description={memberList?.bizDate} />
+        <Card.Meta title="注册日期" description={moment(memberList?.bizDate).format("YYYY-MM-DD HH:mm:ss")} />
       </Card.Grid>
     </Card>
   );

src/pages/member/components/ModalNewCard.jsx

@@ -53,6 +53,7 @@ export default (props) => {
           required
           name="phone"
           label="手机号"
+          disabled={modalTitle == "核销卡"}
           rules={[{ required: true, message: "请输入手机号" }]}
         />
         <ProFormSelect

src/pages/member/index.jsx

@@ -89,7 +89,7 @@ export default (props) => {
           }, 0);
           return [
             <Button
-              key="A3"
+              key="A2"
               style={{ padding: 0 }}
               type="link"
               onClick={() => navigate(`/member/edit?id=${record.memberId}`)}
@@ -97,7 +97,7 @@ export default (props) => {
               详情
             </Button>,
             <Button
-              key="A2"
+              key="A3"
               style={{ padding: 0 }}
               type="link"
               disabled={!dataNum}