Merge branch 'yongxu-dev3' into yongpxu-dev

nkebao/src/pages/workspace/group-push/form/index.tsx

@@ -2,10 +2,9 @@ import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Button } from "antd-mobile";
 import { NavBar } from "antd-mobile";
-import { LeftOutline } from "antd-mobile-icons";
+import { ArrowLeftOutlined } from "@ant-design/icons";
 import { createGroupPushTask } from "@/pages/workspace/group-push/detail/groupPush";
 import Layout from "@/components/Layout/Layout";
-import MeauMobile from "@/components/MeauMobile/MeauMoible";
 import StepIndicator from "./components/StepIndicator";
 import BasicSettings from "./components/BasicSettings";
 import GroupSelector from "./components/GroupSelector";
@@ -35,6 +34,7 @@ const NewGroupPush: React.FC = () => {
     groups: [],
     contentLibraries: [],
   });
+  const [isEditMode, setIsEditMode] = useState(false);
 
   const handleBasicSettingsNext = (values: Partial<FormData>) => {
     setFormData((prev) => ({ ...prev, ...values }));
@@ -107,14 +107,22 @@ const NewGroupPush: React.FC = () => {
     <Layout
       header={
         <NavBar
-          onBack={() => navigate(-1)}
+          back={null}
           style={{ background: "#fff" }}
-          right={null}
+          left={
+            <div className="nav-title">
+              <ArrowLeftOutlined
+                twoToneColor="#1677ff"
+                onClick={() => navigate(-1)}
+              />
+            </div>
+          }
         >
-          <span style={{ fontWeight: 600, fontSize: 18 }}>群消息推送</span>
+          <span className="nav-title">
+            {isEditMode ? "编辑任务" : "新建任务"}
+          </span>
         </NavBar>
       }
-      footer={<MeauMobile />}
     >
       <div style={{ maxWidth: 600, margin: "0 auto", padding: 16 }}>
         <StepIndicator currentStep={currentStep} steps={steps} />

nkebao/src/pages/workspace/group-push/list/index.tsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { NavBar } from "antd-mobile";
-import { LeftOutline } from "antd-mobile-icons";
 import {
+  ArrowLeftOutlined,
   PlusOutlined,
   SearchOutlined,
   ReloadOutlined,
@@ -151,11 +151,11 @@ const GroupPush: React.FC = () => {
         <NavBar
           back={null}
           left={
-            <div className={styles["nav-title"]}>
+            <div className="nav-title">
-              <span style={{ verticalAlign: "middle" }}>
+              <ArrowLeftOutlined
-                <LeftOutline onClick={() => navigate(-1)} fontSize={24} />
+                twoToneColor="#1677ff"
-              </span>
+                onClick={() => navigate(-1)}
-              群消息推送
+              />
             </div>
           }
           style={{ background: "#fff" }}
@@ -168,9 +168,10 @@ const GroupPush: React.FC = () => {
               创建任务
             </Button>
           }
-        ></NavBar>
+        >
+          <span className="nav-title">群消息推送</span>
+        </NavBar>
       }
-      footer={<MeauMobile />}
     >
       <div className={styles.bg}>
         <div className={styles.searchBar}>