Browse Source

Merge branch 'agile' of github.com:iapt-platform/mint into agile

Jeremy Zheng 2 years ago
parent
commit
33c01e1fb7

BIN
dashboard/src/assets/general/images/logo_mps.png


+ 22 - 8
dashboard/src/components/general/BeiAn.tsx

@@ -1,18 +1,32 @@
+import { Space } from "antd";
 import { useIntl } from "react-intl";
+import logo_mps from "../../assets/general/images/logo_mps.png";
 
 const BeiAnWidget = () => {
   const intl = useIntl();
   return (
     <>
       {process.env.REACT_APP_ICP_CODE ? (
-        <span>
-          {intl.formatMessage({
-            id: `labels.icp`,
-          })}
-          <a href="https://beian.miit.gov.cn/" target="_blank" rel="noreferrer">
-            {process.env.REACT_APP_ICP_CODE}
-          </a>
-        </span>
+        <Space>
+          <span>
+            {intl.formatMessage({
+              id: `labels.icp`,
+            })}
+            <a
+              href="https://beian.miit.gov.cn/"
+              target="_blank"
+              rel="noreferrer"
+            >
+              {process.env.REACT_APP_ICP_CODE}
+            </a>
+          </span>
+          <Space>
+            <img alt="code" src={logo_mps} style={{ width: 20, height: 20 }} />
+            {process.env.REACT_APP_MPS_CODE
+              ? process.env.REACT_APP_MPS_CODE
+              : "滇公网安备[审批中]号"}
+          </Space>
+        </Space>
       ) : undefined}
     </>
   );

+ 8 - 0
dashboard/src/components/library/HeadBar.tsx

@@ -18,6 +18,14 @@ const onClick: MenuProps["onClick"] = (e) => {
   console.log("click ", e);
 };
 export const mainMenuItems: MenuProps["items"] = [
+  {
+    label: (
+      <a href="/" rel="noreferrer">
+        首页
+      </a>
+    ),
+    key: "home",
+  },
   {
     label: (
       <Link to="/community/list">

+ 3 - 1
dashboard/src/components/template/ParaShell.tsx

@@ -44,7 +44,9 @@ const ParaShellCtl = ({
   return (
     <div
       style={{
-        border: isFocus ? "2px solid #e35f00bd " : "1px solid #006bffc7",
+        border: isFocus
+          ? "2px solid #e35f00bd "
+          : "2px solid rgba(0, 107, 255, 0.4)",
         borderRadius: 6,
         marginTop: 20,
         paddingTop: 16,

+ 3 - 2
dashboard/src/components/template/SentEdit.tsx

@@ -129,9 +129,10 @@ export const SentEditInner = ({
     <Card
       bodyStyle={{ paddingBottom: 0, paddingLeft: 0, paddingRight: 0 }}
       style={{
-        border: "solid 2px #dfdfdf",
+        border: "2px solid rgb(128 128 128 / 30%)",
         marginTop: 4,
-        borderRadius: 5,
+        borderRadius: 6,
+        backgroundColor: "rgb(245 245 245)",
       }}
       size="small"
     >