🐛

src/pages/Home/index.module.scss

@@ -15,21 +15,23 @@
         justify-content: space-between;
 
         .titleL {
+
           display: flex;
           flex-direction: column;
           justify-content: space-between;
-          padding: 10px 20px 10px 0px;
-          width: 240px;
+          padding: 26px 10px 10px 0px;
+          width: 270px;
           border-right: 1px solid #999999;
 
           &>h3 {
-            font-size: 20px;
+            font-weight: 800;
+            font-size: 18px;
             color: var(--themeColor);
           }
         }
 
         .titleR {
-          width: calc(100% - 270px);
+          width: calc(100% - 300px);
           display: flex;
           justify-content: space-around;
           padding: 20px 0;

src/pages/Home/index.tsx

@@ -227,9 +227,8 @@ export default function Home() {
             <h3>
               欢迎 {userInfo.realName} 进入
               <br />
-              乐山大佛博物馆
               <br />
-              馆藏管理系统！
+              乐山大佛博物馆馆藏管理系统！
             </h3>
             <p>{nowTime}</p>
           </div>

src/pages/Login/index.tsx

@@ -29,7 +29,8 @@ export default function Login() {
   // 点击登录
   const loginClickFu = async () => {
     // 非空判断
-    if (userName === "" || passWord === "") return message.warning("不能为空!");
+    if (userName === "") return message.warning("请填写用户账号!");
+    else if (passWord === "") return message.warning("请填写登录密码!");
     const obj = {
       userName,
       passWord: encodeStr(Base64.encode(passWord)),

src/pages/ObjectSon/Object2/index.tsx

@@ -13,6 +13,7 @@ import dayjs from "dayjs";
 import ExportJsonExcel from "js-export-excel";
 import { getObject2List } from "@/store/action/object2";
 import http from "@/utils/http";
+import { Empty } from "antd";
 const { Option } = Select;
 export default function Object2() {
   const dispatch = useDispatch();
@@ -375,7 +376,9 @@ export default function Object2() {
               </div>
             ))
           ) : (
-            <div className="imgListNone">暂无数据</div>
+            <div className="imgListNone">
+              <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+            </div>
           )}
           {}
         </div>
@@ -392,7 +395,7 @@ export default function Object2() {
         </div>
 
         {/* 从表格里面拆出来的分页 */}
-        <div className="pageBox">
+        <div className="pageBox" hidden={!results.total}>
           <Pagination
             showQuickJumper
             showSizeChanger

src/pages/ObjectSon/Object4/LookObject4/index.tsx

@@ -4,7 +4,7 @@ import ImageLazy from "@/components/ImageLazy";
 import LookModal from "@/components/LookObjTable/LookModal";
 import { RootState } from "@/store";
 import { object4infoOutAPI, returnObject4API } from "@/store/action/object4";
-import { statusObjCK } from "@/utils/dataChange";
+import { statusObjCK2 } from "@/utils/dataChange";
 import history, { urlParameter } from "@/utils/history";
 import { Button, message, Popconfirm, Table } from "antd";
 import React, {
@@ -33,7 +33,7 @@ function LookObject4() {
     const res1 = await object4infoOutAPI(id);
     const info = res1.data.entity;
     const list = res1.data.child;
-    info.statusTxt = statusObjCK[info.status];
+    info.statusTxt = statusObjCK2[info.status];
     dispatch({ type: "object4/getLookInfo", payload: { info, list } });
   }, [dispatch]);
 

src/utils/dataChange.ts

@@ -52,8 +52,8 @@ export const logTypeObj = {
 export const logTypeOpenObj = {
   in: "#/object/3/look?k=1&d=null&id=", //入库管理的查看
   out: "#/object/4/look?k=1&d=null&id=", //出库管理的查看
-  move: "#/stores/3/look?k=1&d=null&id=",//藏品移库的查看
-  edit: "#/object/5/look?k=1&d=null&id=",//藏品修改的查看
+  move: "#/stores/3/look?k=1&d=null&id=", //藏品移库的查看
+  edit: "#/object/5/look?k=1&d=null&id=", //藏品修改的查看
 } as any;
 
 // 出库管理状态的筛选
@@ -64,3 +64,11 @@ export const statusObjCK = {
   3: "待归还", //审核通过
   4: "已归还", //审核通过
 } as any;
+
+export const statusObjCK2 = {
+  0: "待办理", //草稿中
+  1: "待审核", //待审核
+  2: "审核不通过", //审核不通过
+  3: "已完成（待归还）", //审核通过
+  4: "已完成（已归还）", //审核通过
+} as any;

src/utils/http.ts

@@ -63,7 +63,9 @@ http.interceptors.response.use(
       }, 200);
     } else if (response.data.code === 0) {
       // message.success(response.data.msg);
-    } else message.warning(response.data.msg);
+    } else if (response.data.code === 3014)
+      message.warning("用户名或密码不正确!");
+    else message.warning(response.data.msg);
     return response.data;
   },
   async function (err) {