diff --git a/Cunkebao/app/content/[id]/materials/edit/[materialId]/page.tsx b/Cunkebao/app/content/[id]/materials/edit/[materialId]/page.tsx
index f22c944f..50d6cf24 100644
--- a/Cunkebao/app/content/[id]/materials/edit/[materialId]/page.tsx
+++ b/Cunkebao/app/content/[id]/materials/edit/[materialId]/page.tsx
@@ -15,6 +15,7 @@ import { showToast } from "@/lib/toast"
 import Image from "next/image"
 import { Input } from "@/components/ui/input"
 import { cn } from "@/lib/utils"
+import { useRef } from "react"
 
 interface ApiResponse<T = any> {
   code: number
@@ -77,6 +78,7 @@ export default function EditMaterialPage({ params }: { params: Promise<{ id: str
   const [iconUrl, setIconUrl] = useState<string>("")
   const [videoUrl, setVideoUrl] = useState<string>("")
   const [comment, setComment] = useState("")
+  const fileInputRef = useRef<HTMLInputElement>(null)
 
   // 获取素材详情
   useEffect(() => {
@@ -153,22 +155,56 @@ export default function EditMaterialPage({ params }: { params: Promise<{ id: str
     fetchMaterialDetail()
   }, [resolvedParams.materialId, router])
 
-  // 模拟上传图片
+  // 替换handleUploadImage为：
   const handleUploadImage = () => {
-    // 这里应该是真实的图片上传逻辑
-    // 为了演示，这里模拟添加一些示例图片URL
-    const mockImageUrls = [
-      "https://picsum.photos/id/237/200/300",
-      "https://picsum.photos/id/238/200/300",
-      "https://picsum.photos/id/239/200/300"
-    ]
-    
-    const randomIndex = Math.floor(Math.random() * mockImageUrls.length)
-    const newImage = mockImageUrls[randomIndex]
-    
-    if (!images.includes(newImage)) {
-      setImages([...images, newImage])
-      setPreviewUrls([...previewUrls, newImage])
+    if (images.length >= 9) {
+      showToast("最多只能上传9张图片", "error")
+      return
+    }
+    fileInputRef.current?.click()
+  }
+
+  // 新增真实上传逻辑
+  const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    if (images.length >= 9) {
+      showToast("最多只能上传9张图片", "error")
+      return
+    }
+    const file = event.target.files?.[0]
+    if (!file) return
+
+    if (!file.type.startsWith('image/')) {
+      showToast("请选择图片文件", "error")
+      return
+    }
+
+    showToast("正在上传图片...", "loading")
+    const formData = new FormData()
+    formData.append("file", file)
+
+    try {
+      const token = localStorage.getItem('token');
+      const headers: HeadersInit = {}
+      if (token) headers['Authorization'] = `Bearer ${token}`
+
+      const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/v1/attachment/upload`, {
+        method: 'POST',
+        headers,
+        body: formData,
+      })
+
+      const result = await response.json()
+      if (result.code === 200 && result.data?.url) {
+        setImages((prev) => [...prev, result.data.url])
+        setPreviewUrls((prev) => [...prev, result.data.url])
+        showToast("图片上传成功", "success")
+      } else {
+        showToast(result.msg || "图片上传失败", "error")
+      }
+    } catch (error: any) {
+      showToast(error?.message || "图片上传失败", "error")
+    } finally {
+      if (fileInputRef.current) fileInputRef.current.value = ''
     }
   }
 
@@ -450,12 +486,20 @@ export default function EditMaterialPage({ params }: { params: Promise<{ id: str
                         variant="outline" 
                         onClick={handleUploadImage} 
                         className="w-full py-8 flex flex-col items-center justify-center rounded-2xl border-2 border-dashed border-blue-300 bg-white hover:bg-blue-50"
+                        disabled={images.length >= 9}
                       >
                         <UploadCloud className="h-8 w-8 mb-2 text-gray-400" />
                         <span>点击上传图片</span>
-                        <span className="text-xs text-gray-500 mt-1">支持 JPG、PNG 格式</span>
+                        <span className="text-xs text-gray-500 mt-1">{`已上传${images.length}张，最多可上传9张`}</span>
                       </Button>
                     </div>
+                    <input
+                      type="file"
+                      ref={fileInputRef}
+                      onChange={handleFileChange}
+                      className="hidden"
+                      accept="image/*"
+                    />
                     {previewUrls.length > 0 && (
                       <div className="mt-2">
                         <Label className="font-bold mb-2">已上传图片</Label>
diff --git a/Cunkebao/app/content/[id]/materials/new/page.tsx b/Cunkebao/app/content/[id]/materials/new/page.tsx
index 55eeb53c..e0d75751 100644
--- a/Cunkebao/app/content/[id]/materials/new/page.tsx
+++ b/Cunkebao/app/content/[id]/materials/new/page.tsx
@@ -2,59 +2,166 @@
 
 import type React from "react"
 
-import { useState } from "react"
+import { useState, useRef } from "react"
 import { useRouter } from "next/navigation"
-import { ChevronLeft, Plus, X } from "lucide-react"
+import { ChevronLeft, Plus, X, Image as ImageIcon, UploadCloud, Link, Video, FileText, Layers, CalendarDays, ChevronDown } from "lucide-react"
 import { Card } from "@/components/ui/card"
 import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
 import { Textarea } from "@/components/ui/textarea"
 import { Label } from "@/components/ui/label"
-import { Badge } from "@/components/ui/badge"
 import { toast } from "@/components/ui/use-toast"
+import Image from "next/image"
+import { Input } from "@/components/ui/input"
+import { cn } from "@/lib/utils"
+import { api } from "@/lib/api"
+import { showToast } from "@/lib/toast"
+
+interface ApiResponse<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+// 素材类型枚举
+const MATERIAL_TYPES = [
+  { id: 1, name: "图片", icon: ImageIcon },
+  { id: 2, name: "链接", icon: Link },
+  { id: 3, name: "视频", icon: Video },
+  { id: 4, name: "文本", icon: FileText },
+  { id: 5, name: "小程序", icon: Layers }
+]
 
 export default function NewMaterialPage({ params }: { params: { id: string } }) {
   const router = useRouter()
   const [content, setContent] = useState("")
-  const [newTag, setNewTag] = useState("")
-  const [tags, setTags] = useState<string[]>([])
+  const [images, setImages] = useState<string[]>([])
+  const [previewUrls, setPreviewUrls] = useState<string[]>([])
+  const [materialType, setMaterialType] = useState<number>(1)
+  const [url, setUrl] = useState<string>("")
+  const [desc, setDesc] = useState<string>("")
+  const [image, setImage] = useState<string>("")
+  const [videoUrl, setVideoUrl] = useState<string>("")
+  const [publishTime, setPublishTime] = useState("")
+  const [comment, setComment] = useState("")
+  const [loading, setLoading] = useState(false)
+  const fileInputRef = useRef<HTMLInputElement>(null)
 
-  const handleAddTag = () => {
-    if (newTag && !tags.includes(newTag)) {
-      setTags([...tags, newTag])
-      setNewTag("")
-    }
+  // 图片上传
+  const handleUploadImage = () => {
+    fileInputRef.current?.click()
   }
 
-  const handleRemoveTag = (tagToRemove: string) => {
-    setTags(tags.filter((tag) => tag !== tagToRemove))
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (!content) {
-      toast({
-        title: "错误",
-        description: "请输入素材内容",
-        variant: "destructive",
-      })
+  const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    if (images.length >= 9) {
+      showToast("最多只能上传9张图片", "error")
       return
     }
+    const file = event.target.files?.[0]
+    if (!file) return
+
+    if (!file.type.startsWith('image/')) {
+      showToast("请选择图片文件", "error")
+      return
+    }
+
+    const loadingToast = showToast("正在上传图片...", "loading", true)
+    setLoading(true)
+
+    const formData = new FormData()
+    formData.append("file", file)
+
     try {
-      // 模拟保存新素材
-      await new Promise((resolve) => setTimeout(resolve, 1000))
-      toast({
-        title: "成功",
-        description: "新素材已创建",
-      })
+      const token = localStorage.getItem('token');
+      const headers: HeadersInit = {
+        // 浏览器会自动为 FormData 设置 Content-Type 为 multipart/form-data，无需手动设置
+      };
+      if (token) {
+        headers['Authorization'] = `Bearer ${token}`;
+      }
+
+      const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/v1/attachment/upload`, {
+        method: 'POST',
+        headers: headers,
+        body: formData,
+      });
+
+      const result: ApiResponse = await response.json();
+
+      if (result.code === 200 && result.data?.url) {
+        setImages((prev) => [...prev, result.data.url]);
+        setPreviewUrls((prev) => [...prev, result.data.url]);
+        showToast("图片上传成功", "success");
+      } else {
+        showToast(result.msg || "图片上传失败", "error");
+      }
+    } catch (error: any) {
+      showToast(error?.message || "图片上传失败", "error")
+    } finally {
+      loadingToast.remove && loadingToast.remove()
+      setLoading(false)
+      // 清空文件输入框，以便再次上传同一文件
+      if (fileInputRef.current) {
+        fileInputRef.current.value = '';
+      }
+    }
+  }
+
+  const handleRemoveImage = (indexToRemove: number) => {
+    setImages(images.filter((_, index) => index !== indexToRemove))
+    setPreviewUrls(previewUrls.filter((_, index) => index !== indexToRemove))
+  }
+
+  // 创建素材
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+    // 校验
+    if (!content) {
+      showToast("请输入内容", "error")
+      return
+    }
+    // if (!comment) {
+    //   showToast("请输入评论内容", "error")
+    //   return
+    // }
+    if (materialType === 1 && images.length === 0) {
+      showToast("请上传图片", "error")
+      return
+    } else if (materialType === 2 && (!url || !desc)) {
+      showToast("请输入描述和链接地址", "error")
+      return
+    } else if (materialType === 3 && (!url && !videoUrl)) {
+      showToast("请填写视频链接或上传视频", "error")
+      return
+    }
+    setLoading(true)
+    const loadingToast = showToast("正在创建素材...", "loading", true)
+    try {
+      const payload: any = {
+        libraryId: params.id,
+        type: materialType,
+        content: content,
+        comment: comment,
+        sendTime: publishTime,
+      }
+      if (materialType === 1) {
+        payload.resUrls = images
+      } else if (materialType === 2) {
+        payload.urls = [{ desc, image, url }]
+      } else if (materialType === 3) {
+        payload.urls = videoUrl ? [videoUrl] : []
+      }
+      const response = await api.post<ApiResponse>('/v1/content/library/create-item', payload)
+      if (response.code === 200) {
+        showToast("创建成功", "success")
       router.push(`/content/${params.id}/materials`)
-    } catch (error) {
-      console.error("Failed to create new material:", error)
-      toast({
-        title: "错误",
-        description: "创建新素材失败",
-        variant: "destructive",
-      })
+      } else {
+        showToast(response.msg || "创建失败", "error")
+      }
+    } catch (error: any) {
+      showToast(error?.message || "创建素材失败", "error")
+    } finally {
+      loadingToast.remove && loadingToast.remove()
+      setLoading(false)
     }
   }
 
@@ -70,57 +177,273 @@ export default function NewMaterialPage({ params }: { params: { id: string } })
           </div>
         </div>
       </header>
-
       <div className="p-4">
-        <Card className="p-4">
-          <form onSubmit={handleSubmit} className="space-y-4">
+        <Card className="p-8 rounded-3xl shadow-xl bg-white max-w-lg mx-auto">
+          <form onSubmit={handleSubmit} className="space-y-8">
+            {/* 基础信息分组 */}
+            <div className="mb-6">
+              <div className="text-xs text-gray-400 mb-2 tracking-widest">基础信息</div>
+              <div className="mb-4">
+                <Label className="font-bold flex items-center mb-2">发布时间</Label>
+                <div className="relative">
+                  <Input
+                    id="publish-time"
+                    type="datetime-local"
+                    step="60"
+                    value={publishTime}
+                    onChange={(e) => setPublishTime(e.target.value)}
+                    className="w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base placeholder:text-gray-300"
+                    placeholder="请选择发布时间"
+                    style={{ width: 'auto' }}
+                  />
+                  <CalendarDays className="absolute right-4 top-1/2 -translate-y-1/2 h-5 w-5 text-gray-400 pointer-events-none" />
+                </div>
+              </div>
             <div>
-              <Label htmlFor="content">素材内容</Label>
+                <Label className="font-bold flex items-center mb-2">
+                  <span className="text-red-500 mr-1">*</span>类型
+                </Label>
+                <div className="relative">
+                  <select
+                    style={{ border: '1px solid #e0e0e0' }}
+                    className="appearance-none w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 pr-10 text-base bg-white placeholder:text-gray-300"
+                    value={materialType}
+                    onChange={e => setMaterialType(Number(e.target.value))}
+                  >
+                    {MATERIAL_TYPES.map(type => (
+                      <option key={type.id} value={type.id}>{type.name}</option>
+                    ))}
+                  </select>
+                  <ChevronDown className="absolute right-4 top-1/2 -translate-y-1/2 h-5 w-5 text-gray-400 pointer-events-none" />
+                </div>
+              </div>
+            </div>
+            <div className="border-b border-gray-100 my-4" />
+            {/* 内容信息分组（所有类型都展示内容和评论） */}
+            <div className="mb-6">
+              <div className="text-xs text-gray-400 mb-2 tracking-widest">内容信息</div>
+              <Label htmlFor="content" className="font-bold flex items-center mb-2">
+                <span className="text-red-500 mr-1">*</span>内容
+              </Label>
               <Textarea
                 id="content"
                 value={content}
                 onChange={(e) => setContent(e.target.value)}
-                placeholder="请输入素材内容"
-                className="mt-1"
-                rows={5}
+                placeholder="请输入内容"
+                className="w-full rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base min-h-[120px] bg-gray-50 placeholder:text-gray-300"
+                rows={10}
               />
-            </div>
-
-            <div>
-              <Label htmlFor="tags">标签</Label>
-              <div className="flex items-center mt-1">
-                <Input
-                  id="tags"
-                  value={newTag}
-                  onChange={(e) => setNewTag(e.target.value)}
-                  placeholder="输入标签"
-                  className="flex-1"
+              <div className="mt-4">
+                <Label htmlFor="comment" className="font-bold mb-2">评论</Label>
+                <Textarea
+                  id="comment"
+                  value={comment}
+                  onChange={(e) => setComment(e.target.value)}
+                  placeholder="请输入评论内容"
+                  className="w-full rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base min-h-[80px] bg-gray-50 placeholder:text-gray-300"
+                  rows={4}
                 />
-                <Button type="button" onClick={handleAddTag} className="ml-2">
-                  <Plus className="h-4 w-4" />
-                  添加
-                </Button>
               </div>
-              <div className="flex flex-wrap gap-2 mt-2">
-                {tags.map((tag, index) => (
-                  <Badge key={index} variant="secondary" className="flex items-center">
-                    {tag}
+            </div>
+            {(materialType === 2 || materialType === 3) && (
+              <div className="mb-6">
+                <div className="text-xs text-gray-400 mb-2 tracking-widest">内容信息</div>
+                {materialType === 2 && (
+                  <div className="mb-4">
+                    <Label htmlFor="desc" className="font-bold flex items-center mb-2">
+                      <span className="text-red-500 mr-1">*</span>描述
+                    </Label>
+                    <Input
+                      id="desc"
+                      value={desc}
+                      onChange={(e) => setDesc(e.target.value)}
+                      placeholder="请输入描述"
+                      className="w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base placeholder:text-gray-300"/>
+                    {/* 封面图上传 */}
+                    <div className="mt-4">
+                      <Label className="font-bold mb-2">封面图</Label>
+                      <div className="flex items-center gap-4">
+                        <Button
+                          type="button"
+                          variant="outline"
+                          className="rounded-2xl border-dashed border-2 border-blue-300 bg-white hover:bg-blue-50 h-28 w-28 flex flex-col items-center justify-center p-0"
+                          onClick={() => {
+                            const mock = [
+                              "https://cdn-icons-png.flaticon.com/512/732/732212.png",
+                              "https://cdn-icons-png.flaticon.com/512/5968/5968764.png",
+                              "https://cdn-icons-png.flaticon.com/512/5968/5968705.png"
+                            ];
+                            const random = mock[Math.floor(Math.random() * mock.length)];
+                            setImage(random);
+                          }}
+                        >
+                          {image ? (
+                            <Image src={image} alt="封面图" width={80} height={80} className="object-contain rounded-xl mx-auto my-auto" />
+                          ) : (
+                            <>
+                              <UploadCloud className="h-8 w-8 mb-2 text-gray-400 mx-auto" />
+                              <span className="text-sm text-gray-500">上传封面图</span>
+                            </>
+                          )}
+                        </Button>
+                        {image && (
+                          <Button type="button" variant="destructive" size="sm" className="h-8 px-2 rounded-lg" onClick={() => setImage("")}>删除</Button>
+                        )}
+                      </div>
+                      <div className="text-xs text-gray-400 mt-1">建议尺寸 80x80，支持 PNG/JPG</div>
+                    </div>
+                  </div>
+                )}
+                {materialType === 2 && (
+                  <>
+                    <Label htmlFor="url" className="font-bold flex items-center mb-2">
+                      <span className="text-red-500 mr-1">*</span>链接地址
+                    </Label>
+                <Input
+                      id="url"
+                      value={url}
+                      onChange={(e) => setUrl(e.target.value)}
+                      placeholder="请输入链接地址"
+                      className="w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base placeholder:text-gray-300"
+                    />
+                  </>
+                )}
+                {materialType === 3 && (
+                  <div className="mt-4">
+                    <Label className="font-bold mb-2">上传视频</Label>
+                    <div className="flex items-center gap-4">
+                      <Button
+                        type="button"
+                        variant="outline"
+                        className="rounded-2xl border-dashed border-2 border-blue-300 bg-white hover:bg-blue-50 h-28 w-44 flex flex-col items-center justify-center p-0"
+                        onClick={() => {
+                          const mock = [
+                            "https://www.w3schools.com/html/mov_bbb.mp4",
+                            "https://www.w3schools.com/html/movie.mp4"
+                          ];
+                          const random = mock[Math.floor(Math.random() * mock.length)];
+                          setVideoUrl(random);
+                        }}
+                      >
+                        {videoUrl ? (
+                          <video src={videoUrl} controls className="object-contain rounded-xl h-24 w-40 mx-auto my-auto" />
+                        ) : (
+                          <>
+                            <UploadCloud className="h-8 w-8 mb-2 text-gray-400 mx-auto" />
+                            <span className="text-sm text-gray-500">上传视频</span>
+                          </>
+                        )}
+                </Button>
+                      {videoUrl && (
+                        <Button type="button" variant="destructive" size="sm" className="h-8 px-2 rounded-lg" onClick={() => setVideoUrl("")}>删除</Button>
+                      )}
+                    </div>
+                    <div className="text-xs text-gray-400 mt-1">支持MP4，建议不超过20MB</div>
+                  </div>
+                )}
+              </div>
+            )}
+            {/* 素材上传分组（仅图片类型和小程序类型） */}
+            {(materialType === 1 || materialType === 5) && (
+              <div className="mb-6">
+                <div className="text-xs text-gray-400 mb-2 tracking-widest">素材上传</div>
+                {materialType === 1 && (
+                  <>
+                    <Label className="font-bold mb-2">素材</Label>
+                    <div className="border border-dashed border-gray-300 rounded-2xl p-4 text-center bg-gray-50">
+                      <Button 
+                        type="button" 
+                        variant="outline" 
+                        onClick={handleUploadImage} 
+                        className="w-full py-8 flex flex-col items-center justify-center rounded-2xl border-2 border-dashed border-blue-300 bg-white hover:bg-blue-50"
+                        disabled={loading || images.length >= 9}
+                      >
+                        <UploadCloud className="h-8 w-8 mb-2 text-gray-400" />
+                        <span>点击上传图片</span>
+                        <span className="text-xs text-gray-500 mt-1">{`已上传${images.length}张，最多可上传9张`}</span>
+                      </Button>
+                      <input
+                        type="file"
+                        ref={fileInputRef}
+                        onChange={handleFileChange}
+                        className="hidden"
+                        accept="image/*"
+                      />
+                    </div>
+                    {previewUrls.length > 0 && (
+                      <div className="mt-2">
+                        <Label className="font-bold mb-2">已上传图片</Label>
+                        <div className="grid grid-cols-2 md:grid-cols-3 gap-3 mt-2">
+                          {previewUrls.map((url, index) => (
+                            <div key={index} className="relative group">
+                              <div className="aspect-square relative rounded-2xl overflow-hidden border border-gray-200">
+                                <Image
+                                  src={url}
+                                  alt={`图片 ${index + 1}`}
+                                  fill
+                                  className="object-cover"
+                                />
+                              </div>
                     <Button
                       type="button"
-                      variant="ghost"
+                                variant="destructive"
                       size="sm"
-                      className="h-4 w-4 ml-1 p-0"
-                      onClick={() => handleRemoveTag(tag)}
+                                className="absolute top-1 right-1 opacity-0 group-hover:opacity-100 transition-opacity h-6 w-6 p-0 rounded-full"
+                                onClick={() => handleRemoveImage(index)}
                     >
                       <X className="h-3 w-3" />
                     </Button>
-                  </Badge>
+                            </div>
                 ))}
               </div>
             </div>
-
-            <Button type="submit" className="w-full">
-              保存素材
+                    )}
+                  </>
+                )}
+                {materialType === 5 && (
+                  <div className="space-y-6">
+                    <div>
+                      <Label htmlFor="appTitle" className="font-bold mb-2">小程序名称</Label>
+                      <Input
+                        id="appTitle"
+                        placeholder="请输入小程序名称"
+                        className="w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base placeholder:text-gray-300"
+                      />
+                    </div>
+                    <div>
+                      <Label htmlFor="appId" className="font-bold mb-2">AppID</Label>
+                      <Input
+                        id="appId"
+                        placeholder="请输入AppID"
+                        className="w-full h-12 rounded-2xl border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-100 px-4 text-base placeholder:text-gray-300"
+                      />
+                    </div>
+                    <div>
+                      <Label className="font-bold mb-2">小程序封面图</Label>
+                      <div className="border border-dashed border-gray-300 rounded-2xl p-4 text-center bg-gray-50">
+                        <Button 
+                          type="button" 
+                          variant="outline" 
+                          onClick={() => {
+                            const input = document.createElement('input');
+                            input.type = 'file';
+                            input.accept = 'image/*';
+                            input.onchange = handleUploadImage;
+                            input.click();
+                          }}
+                          className="w-full py-4 flex flex-col items-center justify-center rounded-2xl border-2 border-dashed border-blue-300 bg-white hover:bg-blue-50"
+                        >
+                          <UploadCloud className="h-6 w-6 mb-2 text-gray-400" />
+                          <span>上传小程序封面图</span>
+                        </Button>
+                      </div>
+                    </div>
+                  </div>
+                )}
+              </div>
+            )}
+            <Button type="submit" className="w-full h-12 rounded-2xl bg-blue-600 hover:bg-blue-700 text-base font-bold mt-12 shadow" disabled={loading}>
+              {loading ? "创建中..." : "保存素材"}
             </Button>
           </form>
         </Card>
@@ -128,3 +451,4 @@ export default function NewMaterialPage({ params }: { params: { id: string } })
     </div>
   )
 }
+
diff --git a/Cunkebao/app/content/[id]/materials/page.tsx b/Cunkebao/app/content/[id]/materials/page.tsx
index f0e00bdd..f96c97a1 100644
--- a/Cunkebao/app/content/[id]/materials/page.tsx
+++ b/Cunkebao/app/content/[id]/materials/page.tsx
@@ -1,7 +1,7 @@
 "use client"
 
-import { useState, useEffect } from "react"
-import { ChevronLeft, Download, Plus, Search, Tag, Trash2, BarChart } from "lucide-react"
+import { useState, useEffect, useCallback, use } from "react"
+import { ChevronLeft, Download, Plus, Search, Tag, Trash2, BarChart, RefreshCw, Image as ImageIcon, Edit } from "lucide-react"
 import { Card } from "@/components/ui/card"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -9,101 +9,334 @@ import { Badge } from "@/components/ui/badge"
 import { useRouter } from "next/navigation"
 import { toast } from "@/components/ui/use-toast"
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"
+import { api } from "@/lib/api"
+import { showToast } from "@/lib/toast"
+import { Avatar } from "@/components/ui/avatar"
+import { Separator } from "@/components/ui/separator"
+import { format } from "date-fns"
+import Image from "next/image"
+import { cn } from "@/lib/utils"
 
-interface Material {
-  id: string
-  content: string
-  tags: string[]
-  aiAnalysis?: string
+interface ApiResponse<T = any> {
+  code: number
+  msg: string
+  data: T
 }
 
-export default function MaterialsPage({ params }: { params: { id: string } }) {
+interface MaterialListResponse {
+  list: Material[]
+  total: number
+}
+
+interface Material {
+  id: number
+  type: string
+  title: string
+  content: string
+  coverImage: string | null
+  resUrls: string[]
+  urls: string[]
+  createTime: string
+  createMomentTime: number
+  time: string
+  wechatId: string
+  friendId: string | null
+  wechatChatroomId: number
+  senderNickname: string
+  senderAvatar: string  // 发布朋友圈用户的头像
+  location: string | null
+  lat: string
+  lng: string
+}
+
+const isImageUrl = (url: string) => {
+  return /\.(jpg|jpeg|png|gif|webp)$/i.test(url) || url.includes('oss-cn-shenzhen.aliyuncs.com')
+}
+
+export default function MaterialsPage({ params }: { params: Promise<{ id: string }> }) {
+  const resolvedParams = use(params)
   const router = useRouter()
   const [materials, setMaterials] = useState<Material[]>([])
   const [searchQuery, setSearchQuery] = useState("")
   const [isLoading, setIsLoading] = useState(true)
   const [selectedMaterial, setSelectedMaterial] = useState<Material | null>(null)
+  const [page, setPage] = useState(1)
+  const [total, setTotal] = useState(0)
+  const limit = 20
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState<number | null>(null)
 
-  useEffect(() => {
-    const fetchMaterials = async () => {
+  const fetchMaterials = useCallback(async () => {
       setIsLoading(true)
       try {
-        // 模拟从API获取素材数据
-        await new Promise((resolve) => setTimeout(resolve, 500))
-        const mockMaterials: Material[] = [
-          {
-            id: "1",
-            content: "今天的阳光真好，适合出去走走",
-            tags: ["日常", "心情"],
-          },
-          {
-            id: "2",
-            content: "新品上市，限时优惠，快来抢购！",
-            tags: ["营销", "促销"],
-          },
-          {
-            id: "3",
-            content: "学习新技能的第一天，感觉很充实",
-            tags: ["学习", "成长"],
-          },
-        ]
-        setMaterials(mockMaterials)
-      } catch (error) {
+      const queryParams = new URLSearchParams({
+        page: page.toString(),
+        limit: limit.toString(),
+        libraryId: resolvedParams.id,
+        ...(searchQuery ? { keyword: searchQuery } : {})
+      })
+      const response = await api.get<ApiResponse<MaterialListResponse>>(`/v1/content/library/item-list?${queryParams.toString()}`)
+      
+      if (response.code === 200 && response.data) {
+        setMaterials(response.data.list)
+        setTotal(response.data.total)
+      } else {
+        showToast(response.msg || "获取素材数据失败", "error")
+      }
+    } catch (error: any) {
         console.error("Failed to fetch materials:", error)
-        toast({
-          title: "错误",
-          description: "获取素材数据失败",
-          variant: "destructive",
-        })
+      showToast(error?.message || "请检查网络连接", "error")
       } finally {
         setIsLoading(false)
       }
-    }
+  }, [page, searchQuery, resolvedParams.id])
+
+  useEffect(() => {
     fetchMaterials()
-  }, [])
+  }, [fetchMaterials])
 
   const handleDownload = () => {
-    // 实现下载功能
-    toast({
-      title: "下载开始",
-      description: "正在将素材导出为Excel格式",
-    })
+    showToast("正在将素材导出为Excel格式", "loading")
   }
 
   const handleNewMaterial = () => {
-    // 实现新建素材功能
-    router.push(`/content/${params.id}/materials/new`)
+    router.push(`/content/${resolvedParams.id}/materials/new`)
   }
 
   const handleAIAnalysis = async (material: Material) => {
     try {
       // 模拟AI分析过程
       await new Promise((resolve) => setTimeout(resolve, 1000))
-      const analysis = "这是一条" + material.tags.join("、") + "相关的内容，情感倾向积极。"
-      setMaterials(materials.map((m) => (m.id === material.id ? { ...m, aiAnalysis: analysis } : m)))
-      setSelectedMaterial({ ...material, aiAnalysis: analysis })
+      const analysis = "这是一条" + material.title + "相关的内容，情感倾向积极。"
+      setSelectedMaterial(material)
+      showToast("AI分析完成", "success")
     } catch (error) {
       console.error("AI analysis failed:", error)
-      toast({
-        title: "错误",
-        description: "AI分析失败",
-        variant: "destructive",
-      })
+      showToast("AI分析失败", "error")
     }
   }
 
-  const filteredMaterials = materials.filter(
-    (material) =>
-      material.content.toLowerCase().includes(searchQuery.toLowerCase()) ||
-      material.tags.some((tag) => tag.toLowerCase().includes(searchQuery.toLowerCase())),
-  )
+  const handleSearch = () => {
+    setPage(1)
+    fetchMaterials()
+  }
 
-  if (isLoading) {
-    return <div className="flex justify-center items-center h-screen">加载中...</div>
+  const handleRefresh = () => {
+    fetchMaterials()
+  }
+
+  const handleDelete = async (id: number) => {
+    const loadingToast = showToast("正在删除...", "loading", true)
+    try {
+      const response = await api.delete<ApiResponse>(`/v1/content/library/delete-item?id=${id}`)
+      if (response.code === 200) {
+        showToast("删除成功", "success")
+        fetchMaterials()
+      } else {
+        showToast(response.msg || "删除失败", "error")
+      }
+    } catch (error: any) {
+      showToast(error?.message || "删除失败", "error")
+    } finally {
+      loadingToast.remove && loadingToast.remove()
+      setDeleteDialogOpen(null)
+    }
+  }
+
+  // 新增：根据类型渲染内容
+  const renderMaterialByType = (material: any) => {
+    const type = Number(material.contentType || material.type);
+    // 链接类型
+    if (type === 2 && material.urls && material.urls.length > 0) {
+      const first = material.urls[0];
+      return (
+        <a
+          href={first.url}
+          target="_blank"
+          rel="noopener noreferrer"
+          className=" items-center bg-white rounded p-2 hover:bg-gray-50 transition group"
+          style={{ textDecoration: 'none' }}
+        >
+        <div className="mb-3">
+          <p className="text-gray-700 whitespace-pre-line">{material.content}</p>
+        </div> 
+
+
+          <div className="flex items-center" style={{ border: '1px solid #ededed' }}>
+            <div className="flex-shrink-0 w-14 h-14 rounded overflow-hidden mr-3 bg-gray-100">
+              <Image
+                src={first.image ?? 'https://api.dicebear.com/7.x/avataaars/svg?seed=123'}
+                alt="封面图"
+                width={56}
+                height={56}
+                className="object-cover w-full h-full"
+              />
+            </div>
+         
+          <div className="flex-1 min-w-0">
+            <div className="text-base font-medium truncate">{first.desc ?? '这是一条链接'}</div>
+          </div>
+          </div>
+        </a>
+      );
+    }
+    // 视频类型
+    if (type === 3 && material.urls && material.urls.length > 0) {
+      const first = material.urls[0];
+      const videoUrl = typeof first === "string" ? first : (first.url || "");
+      return videoUrl ? (
+        <div className="mb-3">
+          <p className="text-gray-700 whitespace-pre-line">{material.content}</p>
+          <video src={videoUrl} controls className="rounded w-full max-w-md" />
+        </div>
+      ) : null;
+    }
+    // 文本类型
+    if (type === 4 || type === 6) {
+      return (
+        <div className="mb-3">
+          <p className="text-gray-700 whitespace-pre-line">{material.content}</p>
+        </div>
+      );
+    }
+    // 小程序类型
+    if (type === 5 && material.urls && material.urls.length > 0) {
+      const first = material.urls[0];
+      return (
+        <div className="mb-3">
+          <div>小程序名称：{first.appTitle}</div>
+          <div>AppID：{first.appId}</div>
+          {first.image && (
+            <div className="mb-2">
+              <Image src={first.image} alt="小程序封面图" width={80} height={80} className="rounded" />
+            </div>
+          )}
+        </div>
+      );
+    }
+    // 图片类型
+    if (type === 1) {
+      return (
+        <div className="mb-3">
+          {/* 内容字段（如有） */}
+          {material.content && (
+            <div className="mb-2 text-base font-medium text-gray-800 whitespace-pre-line">
+              {material.content}
+            </div>
+          )}
+          {/* 图片资源 */}
+          {renderImageResources(material)}
+        </div>
+      );
+    }
+    // 其它类型
+    return null;
+  }
+
+  // 处理图片资源
+  const renderImageResources = (material: Material) => {
+    const imageUrls = material.resUrls.filter(isImageUrl)
+    // 如果内容本身是图片，也添加到图片数组中
+    if (isImageUrl(material.content) && !imageUrls.includes(material.content)) {
+      imageUrls.unshift(material.content)
+    }
+    
+    if (imageUrls.length === 0) return null
+    
+    // 微信朋友圈风格的图片布局
+    if (imageUrls.length === 1) {
+      // 单张图片：大图显示
+      return (
+        <div className="relative rounded-md overflow-hidden">
+          <Image
+            src={imageUrls[0]}
+            alt="图片内容"
+            width={600}
+            height={400}
+            className="object-cover w-full h-auto"
+          />
+        </div>
+      )
+    } else if (imageUrls.length === 2) {
+      // 两张图片：横向排列
+      return (
+        <div className="grid grid-cols-2 gap-2 mb-3">
+          {imageUrls.map((url, idx) => (
+            <div key={idx} className="relative aspect-square rounded-md overflow-hidden">
+              <Image
+                src={url}
+                alt={`图片 ${idx + 1}`}
+                fill
+                className="object-cover"
+              />
+            </div>
+          ))}
+        </div>
+      )
+    } else if (imageUrls.length === 3) {
+      // 三张图片：使用3x3网格的前三个格子
+      return (
+        <div className="grid grid-cols-3 gap-2 mb-3">
+          {imageUrls.map((url, idx) => (
+            <div key={idx} className="relative aspect-square rounded-md overflow-hidden">
+              <Image
+                src={url}
+                alt={`图片 ${idx + 1}`}
+                fill
+                className="object-cover"
+              />
+            </div>
+          ))}
+        </div>
+      )
+    } else if (imageUrls.length === 4) {
+      // 四张图片：2x2网格
+      return (
+        <div className="grid grid-cols-2 gap-2 mb-3">
+          {imageUrls.map((url, idx) => (
+            <div key={idx} className="relative aspect-square rounded-md overflow-hidden">
+              <Image
+                src={url}
+                alt={`图片 ${idx + 1}`}
+                fill
+                className="object-cover"
+              />
+            </div>
+          ))}
+        </div>
+      )
+    } else {
+      // 五张及以上：3x3网格
+      const displayImages = imageUrls.slice(0, 9)
+      const hasMore = imageUrls.length > 9
+      
+      return (
+        <div className="grid grid-cols-3 gap-2 mb-3">
+          {displayImages.map((url, idx) => (
+            <div key={idx} className="relative aspect-square rounded-md overflow-hidden">
+              <Image
+                src={url}
+                alt={`图片 ${idx + 1}`}
+                fill
+                className="object-cover"
+              />
+              {idx === 8 && hasMore && (
+                <div className="absolute inset-0 bg-black bg-opacity-50 flex items-center justify-center">
+                  <span className="text-white text-lg font-medium">+{imageUrls.length - 9}</span>
+                </div>
+              )}
+            </div>
+          ))}
+        </div>
+      )
+    }
+  }
+
+  const handleSubmit = async () => {
+    fetchMaterials()
   }
 
   return (
-    <div className="flex-1 bg-gray-50 min-h-screen">
+    <div className="flex-1 bg-gray-50 min-h-screen pb-20">
       <header className="sticky top-0 z-10 bg-white border-b">
         <div className="flex items-center justify-between p-4">
           <div className="flex items-center space-x-3">
@@ -113,10 +346,6 @@ export default function MaterialsPage({ params }: { params: { id: string } }) {
             <h1 className="text-lg font-medium">已采集素材</h1>
           </div>
           <div className="flex items-center space-x-2">
-            <Button variant="outline" onClick={handleDownload}>
-              <Download className="h-4 w-4 mr-2" />
-              下载Excel
-            </Button>
             <Button onClick={handleNewMaterial}>
               <Plus className="h-4 w-4 mr-2" />
               新建素材
@@ -126,36 +355,117 @@ export default function MaterialsPage({ params }: { params: { id: string } }) {
       </header>
 
       <div className="p-4">
-        <Card className="p-4">
-          <div className="space-y-4">
-            <div className="relative">
+        <Card className="p-4 mb-4">
+          <div className="flex items-center space-x-2">
+            <div className="relative flex-1">
               <Search className="absolute left-3 top-2.5 h-4 w-4 text-gray-400" />
               <Input
-                placeholder="搜索素材或标签..."
+                placeholder="搜索素材..." 
+                className="pl-9" 
                 value={searchQuery}
                 onChange={(e) => setSearchQuery(e.target.value)}
-                className="pl-9"
+                onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
               />
             </div>
+            <Button 
+              variant="outline" 
+              size="icon" 
+              onClick={handleRefresh}
+              disabled={isLoading}
+            >
+              <RefreshCw className={`h-4 w-4 ${isLoading ? 'animate-spin' : ''}`} />
+            </Button>
+          </div>
+        </Card>
 
+        {isLoading ? (
+          // 加载状态
+          <div className="space-y-4">
+            {Array.from({ length: 3 }).map((_, index) => (
+              <Card key={index} className="p-4">
+                <div className="flex items-center space-x-3 mb-3">
+                  <div className="w-10 h-10 rounded-full bg-gray-200 animate-pulse"></div>
+                  <div className="space-y-2">
+                    <div className="h-4 w-24 bg-gray-200 animate-pulse rounded"></div>
+                    <div className="h-3 w-16 bg-gray-200 animate-pulse rounded"></div>
+                  </div>
+                </div>
+                <div className="my-3 h-0.5 bg-gray-100"></div>
             <div className="space-y-2">
-              {filteredMaterials.map((material) => (
-                <div key={material.id} className="flex items-center justify-between bg-white p-3 rounded-lg shadow">
-                  <div className="flex-1">
-                    <p className="text-sm text-gray-600 mb-2">{material.content}</p>
-                    <div className="flex flex-wrap gap-2">
-                      {material.tags.map((tag, index) => (
+                  <div className="h-4 w-full bg-gray-200 animate-pulse rounded"></div>
+                  <div className="h-4 w-3/4 bg-gray-200 animate-pulse rounded"></div>
+                  <div className="flex space-x-2 mt-3">
+                    <div className="h-20 w-20 bg-gray-200 animate-pulse rounded"></div>
+                    <div className="h-20 w-20 bg-gray-200 animate-pulse rounded"></div>
+                  </div>
+                </div>
+              </Card>
+            ))}
+          </div>
+        ) : (
+          // 素材列表
+          <div className="space-y-4">
+            {materials.length === 0 ? (
+              <Card className="p-8 text-center text-gray-500">
+                暂无素材数据
+              </Card>
+            ) : (
+              materials.map(material => (
+                <Card key={material.id} className="p-4">
+                  <div className="flex items-start justify-between">
+                    <div className="flex items-center space-x-3">
+                      <Avatar>
+                        <Image 
+                          src={material.senderAvatar || `https://api.dicebear.com/7.x/avataaars/svg?seed=${material.senderNickname}`} 
+                          alt={material.senderNickname}
+                          width={40}
+                          height={40}
+                          className="rounded-full"
+                        />
+                      </Avatar>
+                      <div>
+                        <div className="font-medium">{material.senderNickname}</div>
+                        <div className="text-sm text-gray-500">
+                          {material.time && format(new Date(material.time), 'yyyy-MM-dd HH:mm')}
+                        </div>
+                      </div>
+                    </div>
+                    <Badge variant="outline" className="bg-blue-50">
+                      ID: {material.id}
+                    </Badge>
+                  </div>
+                  
+                  <Separator className="my-3" />
+                  
+                  {/* 类型分发内容渲染 */}
+                  {renderMaterialByType(material)}
+                  
+                  {/* 非图片资源标签 */}
+                  {material.resUrls.length > 0 && !material.resUrls.some(isImageUrl) && (
+                    <div className="flex flex-wrap gap-2 mb-3">
+                      {material.resUrls.map((url, index) => (
                         <Badge key={index} variant="secondary">
                           <Tag className="h-3 w-3 mr-1" />
-                          {tag}
+                          资源 {index + 1}
                         </Badge>
                       ))}
                     </div>
-                  </div>
-                  <div className="flex items-center space-x-2">
+                  )}
+                  
+                  <div className="flex items-center justify-between mt-4">
+                    <div className="flex space-x-2">
+                      <Button 
+                        variant="outline" 
+                        size="sm" 
+                        className="px-3 h-8 text-xs"
+                        onClick={() => router.push(`/content/${resolvedParams.id}/materials/edit/${material.id}`)}
+                      >
+                        <Edit className="h-4 w-4 mr-1" />
+                        编辑
+                      </Button>
                     <Dialog>
                       <DialogTrigger asChild>
-                        <Button variant="outline" size="sm" onClick={() => handleAIAnalysis(material)}>
+                          <Button variant="outline" size="sm" className="px-3 h-8 text-xs">
                           <BarChart className="h-4 w-4 mr-1" />
                           AI分析
                         </Button>
@@ -165,20 +475,62 @@ export default function MaterialsPage({ params }: { params: { id: string } }) {
                           <DialogTitle>AI 分析结果</DialogTitle>
                         </DialogHeader>
                         <div className="mt-4">
-                          <p>{selectedMaterial?.aiAnalysis || "正在分析中..."}</p>
+                            <p>正在分析中...</p>
+                          </div>
+                        </DialogContent>
+                      </Dialog>
+                    </div>
+                    <Dialog open={deleteDialogOpen === material.id} onOpenChange={(open) => setDeleteDialogOpen(open ? material.id : null)}>
+                      <DialogTrigger asChild>
+                        <Button variant="destructive" size="sm" className="px-3 h-8 text-xs">
+                          <Trash2 className="h-4 w-4" />
+                        </Button>
+                      </DialogTrigger>
+                      <DialogContent>
+                        <DialogHeader>
+                          <DialogTitle>确认删除</DialogTitle>
+                        </DialogHeader>
+                        <div className="mt-4 mb-4 text-sm text-gray-700">确定要删除该素材吗？此操作不可恢复。</div>
+                        <div className="flex justify-end space-x-2">
+                          <Button variant="outline" size="sm" onClick={() => setDeleteDialogOpen(null)}>取消</Button>
+                          <Button variant="destructive" size="sm" onClick={() => handleDelete(material.id)}>确认删除</Button>
                         </div>
                       </DialogContent>
                     </Dialog>
-                    <Button variant="destructive" size="sm">
-                      <Trash2 className="h-4 w-4" />
-                    </Button>
                   </div>
+                </Card>
+              ))
+            )}
                 </div>
-              ))}
-            </div>
+        )}
+        
+        {!isLoading && total > limit && (
+          <div className="flex justify-center mt-6">
+            <Button
+              variant="outline"
+              size="sm"
+              disabled={page === 1}
+              onClick={() => setPage(prev => Math.max(prev - 1, 1))}
+              className="mx-1"
+            >
+              上一页
+            </Button>
+            <span className="mx-4 py-2 text-sm text-gray-500">
+              第 {page} 页，共 {Math.ceil(total / limit)} 页
+            </span>
+            <Button
+              variant="outline"
+              size="sm"
+              disabled={page >= Math.ceil(total / limit)}
+              onClick={() => setPage(prev => prev + 1)}
+              className="mx-1"
+            >
+              下一页
+            </Button>
           </div>
-        </Card>
+        )}
       </div>
     </div>
   )
 }
+
diff --git a/Cunkebao/app/scenarios/[channel]/devices/page.tsx b/Cunkebao/app/scenarios/[channel]/devices/page.tsx
index 735bce48..1972f3d2 100644
--- a/Cunkebao/app/scenarios/[channel]/devices/page.tsx
+++ b/Cunkebao/app/scenarios/[channel]/devices/page.tsx
@@ -2,13 +2,53 @@
 
 import { useState } from "react"
 import { useRouter } from "next/navigation"
-import { DeviceSelector } from "@/app/components/common/DeviceSelector"
 import { Button } from "@/components/ui/button"
-import { ChevronLeft } from "lucide-react"
+import { Badge } from "@/components/ui/badge"
+import { DeviceSelectionDialog } from "@/app/components/device-selection-dialog"
+import { ChevronLeft, Trash2 } from "lucide-react"
+
+interface WechatAccount {
+  avatar: string
+  nickname: string
+  wechatId: string
+}
+interface Device {
+  id: string
+  imei: string
+  remark?: string
+  wechatAccounts: WechatAccount[]
+  online: boolean
+  friendStatus: "正常" | "异常"
+}
+
+// mock 设备数据
+const mockDevices: Device[] = [
+  {
+    id: "aa6d4c2f7b1fe24d04d34f4f409883e6",
+    imei: "aa6d4c2f7b1fe24d04d34f4f409883e6",
+    remark: "游戏2 19445",
+    wechatAccounts: [
+      {
+        avatar: "https://img2.baidu.com/it/u=123456789,123456789&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+        nickname: "老钟爹-解放双手，释放时间",
+        wechatId: "wxid_480es52qsj2812"
+      },
+      {
+        avatar: "https://img2.baidu.com/it/u=123456789,123456789&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+        nickname: "",
+        wechatId: "w28533368 15375804003"
+      }
+    ],
+    online: true,
+    friendStatus: "正常"
+  }
+]
 
 export default function ScenarioDevicesPage({ params }: { params: { channel: string } }) {
   const router = useRouter()
-  const [selectedDevices, setSelectedDevices] = useState<string[]>([])
+  const [isDeviceSelectorOpen, setIsDeviceSelectorOpen] = useState(false)
+  const [selectedDeviceIds, setSelectedDeviceIds] = useState<string[]>(mockDevices.map(d=>d.id))
+  const [selectedDevices, setSelectedDevices] = useState<Device[]>(mockDevices)
 
   // 获取渠道中文名称
   const getChannelName = (channel: string) => {
@@ -30,14 +70,19 @@ export default function ScenarioDevicesPage({ params }: { params: { channel: str
 
   const channelName = getChannelName(params.channel)
 
-  const handleSave = async () => {
-    try {
-      // 这里应该是实际的API调用来保存选中的设备
-      await new Promise((resolve) => setTimeout(resolve, 1000))
-      router.back()
-    } catch (error) {
-      console.error("保存失败:", error)
-    }
+  // 设备选择回填
+  const handleDeviceSelect = (deviceIds: string[]) => {
+    setSelectedDeviceIds(deviceIds)
+    // 这里用mockDevices过滤，实际应接口获取
+    setSelectedDevices(mockDevices.filter(d => deviceIds.includes(d.id)))
+    setIsDeviceSelectorOpen(false)
+  }
+
+  // 删除设备
+  const handleDelete = (id: string) => {
+    const newIds = selectedDeviceIds.filter(did => did !== id)
+    setSelectedDeviceIds(newIds)
+    setSelectedDevices(selectedDevices.filter(d => d.id !== id))
   }
 
   return (
@@ -54,20 +99,115 @@ export default function ScenarioDevicesPage({ params }: { params: { channel: str
       </header>
 
       <div className="p-4">
-        <DeviceSelector
-          title={`${channelName}设备选择`}
-          selectedDevices={selectedDevices}
-          onDevicesChange={setSelectedDevices}
-          multiple={true}
-          maxSelection={5}
-          className="mb-4"
-        />
+        <div className="flex justify-end mb-2">
+          <Button onClick={() => setIsDeviceSelectorOpen(true)}>+ 选择设备</Button>
+          <DeviceSelectionDialog
+            open={isDeviceSelectorOpen}
+            onOpenChange={setIsDeviceSelectorOpen}
+            selectedDevices={selectedDeviceIds}
+            onSelect={handleDeviceSelect}
+          />
+        </div>
+
+        {/* PC端表格 */}
+        <div className="overflow-x-auto bg-white rounded shadow hidden md:block">
+          <table className="min-w-full text-sm">
+            <thead>
+              <tr className="bg-gray-50">
+                <th className="px-4 py-2 text-left">设备IMEI/备注/手机/设备ID</th>
+                <th className="px-4 py-2 text-left">客服微信号</th>
+                <th className="px-4 py-2">在线</th>
+                <th className="px-4 py-2">加友状态</th>
+                <th className="px-4 py-2">操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              {selectedDevices.length === 0 ? (
+                <tr>
+                  <td colSpan={5} className="text-center py-8 text-gray-400">暂无已选设备</td>
+                </tr>
+              ) : (
+                selectedDevices.map(device => (
+                  <tr key={device.id} className="border-t">
+                    <td className="px-4 py-2 whitespace-pre-line">
+                      {device.imei}
+                      {device.remark ? <div className="text-xs text-gray-500">{device.remark}</div> : null}
+                    </td>
+                    <td className="px-4 py-2">
+                      {device.wechatAccounts.length === 0 ? (
+                        <span className="text-gray-400">-</span>
+                      ) : (
+                        <div className="space-y-1">
+                          {device.wechatAccounts.map((wx, idx) => (
+                            <div key={wx.wechatId+idx} className="flex items-center space-x-2">
+                              {wx.avatar && <img src={wx.avatar} alt="avatar" className="w-7 h-7 rounded object-cover" />}
+                              <span>{wx.nickname}</span>
+                              <span className="text-xs text-gray-500">{wx.wechatId}</span>
+                            </div>
+                          ))}
+                        </div>
+                      )}
+                    </td>
+                    <td className="px-4 py-2 text-center">
+                      <Badge variant={device.online ? "success" : "secondary"}>{device.online ? "是" : "否"}</Badge>
+                    </td>
+                    <td className="px-4 py-2 text-center">
+                      <Badge variant={device.friendStatus === "正常" ? "success" : "destructive"}>{device.friendStatus}</Badge>
+                    </td>
+                    <td className="px-4 py-2 text-center">
+                      <Button variant="destructive" size="icon" onClick={() => handleDelete(device.id)}>
+                        <Trash2 className="w-4 h-4" />
+                      </Button>
+                    </td>
+                  </tr>
+                ))
+              )}
+            </tbody>
+          </table>
+        </div>
+
+        {/* 移动端卡片式渲染 */}
+        <div className="space-y-3 md:hidden">
+          {selectedDevices.length === 0 ? (
+            <div className="text-center py-8 text-gray-400 bg-white rounded">暂无已选设备</div>
+          ) : (
+            selectedDevices.map(device => (
+              <div key={device.id} className="bg-white rounded shadow p-3">
+                <div className="font-medium break-all">{device.imei}</div>
+                {device.remark && <div className="text-xs text-gray-500 mb-1">{device.remark}</div>}
+                <div className="mb-1">
+                  <span className="text-gray-500 text-xs">客服微信号：</span>
+                  {device.wechatAccounts.length === 0 ? (
+                    <span className="text-gray-400">-</span>
+                  ) : (
+                    <div className="space-y-1">
+                      {device.wechatAccounts.map((wx, idx) => (
+                        <div key={wx.wechatId+idx} className="flex items-center space-x-2">
+                          {wx.avatar && <img src={wx.avatar} alt="avatar" className="w-6 h-6 rounded object-cover" />}
+                          <span className="truncate">{wx.nickname}</span>
+                          <span className="text-xs text-gray-500">{wx.wechatId}</span>
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+                <div className="flex items-center space-x-2 mt-2">
+                  <Badge variant={device.online ? "success" : "secondary"}>{device.online ? "在线" : "离线"}</Badge>
+                  <Badge variant={device.friendStatus === "正常" ? "success" : "destructive"}>{device.friendStatus}</Badge>
+                  <Button variant="destructive" size="icon" onClick={() => handleDelete(device.id)}>
+                    <Trash2 className="w-4 h-4" />
+                  </Button>
+                </div>
+              </div>
+            ))
+          )}
+        </div>
 
         <div className="fixed bottom-0 left-0 right-0 bg-white p-4 border-t flex justify-end space-x-2">
           <Button variant="outline" onClick={() => router.back()}>
             取消
           </Button>
-          <Button onClick={handleSave} disabled={selectedDevices.length === 0}>
+          <Button onClick={() => {}} disabled={selectedDevices.length === 0}>
             保存 ({selectedDevices.length})
           </Button>
         </div>
diff --git a/Cunkebao/app/scenarios/new/steps/BasicSettings.tsx b/Cunkebao/app/scenarios/new/steps/BasicSettings.tsx
index 4ca99a3f..752280d7 100644
--- a/Cunkebao/app/scenarios/new/steps/BasicSettings.tsx
+++ b/Cunkebao/app/scenarios/new/steps/BasicSettings.tsx
@@ -21,6 +21,7 @@ import {
 } from "@/components/ui/dialog"
 import { toast } from "@/components/ui/use-toast"
 import { useSearchParams } from "next/navigation"
+import { useRouter } from "next/navigation"
 
 interface BasicSettingsProps {
   formData: any
@@ -48,7 +49,7 @@ interface PosterSectionProps {
   onUpload: () => void
   onSelect: (material: Material) => void
   uploading: boolean
-  fileInputRef: React.RefObject<HTMLInputElement>
+  fileInputRef: React.RefObject<HTMLInputElement | null>
   onFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void
   onPreview: (url: string) => void
   onRemove: (id: string) => void
@@ -58,7 +59,7 @@ interface OrderSectionProps {
   materials: Material[]
   onUpload: () => void
   uploading: boolean
-  fileInputRef: React.RefObject<HTMLInputElement>
+  fileInputRef: React.RefObject<HTMLInputElement | null>
   onFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void
 }
 
@@ -66,7 +67,7 @@ interface DouyinSectionProps {
   materials: Material[]
   onUpload: () => void
   uploading: boolean
-  fileInputRef: React.RefObject<HTMLInputElement>
+  fileInputRef: React.RefObject<HTMLInputElement | null>
   onFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void
 }
 
@@ -330,6 +331,7 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
   const [isImportDialogOpen, setIsImportDialogOpen] = useState(false)
   const [importedTags, setImportedTags] = useState<
     Array<{
+      name: string
       phone: string
       wechat: string
       source?: string
@@ -352,25 +354,29 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
   const [selectedPhoneTags, setSelectedPhoneTags] = useState<string[]>(formData.phoneTags || [])
   const [phoneCallType, setPhoneCallType] = useState(formData.phoneCallType || "both")
 
-  const fileInputRef = useRef<HTMLInputElement>(null)
+  const fileInputRef = useRef<HTMLInputElement | null>(null)
   const [uploadingPoster, setUploadingPoster] = useState(false)
 
   // 新增不同场景的materials和上传逻辑
   const [orderMaterials, setOrderMaterials] = useState<any[]>([])
   const [douyinMaterials, setDouyinMaterials] = useState<any[]>([])
-  const orderFileInputRef = useRef<HTMLInputElement>(null)
-  const douyinFileInputRef = useRef<HTMLInputElement>(null)
+  const orderFileInputRef = useRef<HTMLInputElement | null>(null)
+  const douyinFileInputRef = useRef<HTMLInputElement | null>(null)
   const [uploadingOrder, setUploadingOrder] = useState(false)
   const [uploadingDouyin, setUploadingDouyin] = useState(false)
 
   // 新增小程序和链接封面上传相关state和ref
   const [miniAppCover, setMiniAppCover] = useState(formData.miniAppCover || "")
   const [uploadingMiniAppCover, setUploadingMiniAppCover] = useState(false)
-  const miniAppFileInputRef = useRef<HTMLInputElement>(null)
+  const miniAppFileInputRef = useRef<HTMLInputElement | null>(null)
 
   const [linkCover, setLinkCover] = useState(formData.linkCover || "")
   const [uploadingLinkCover, setUploadingLinkCover] = useState(false)
-  const linkFileInputRef = useRef<HTMLInputElement>(null)
+  const linkFileInputRef = useRef<HTMLInputElement | null>(null)
+
+  const [uploadingOrderTable, setUploadingOrderTable] = useState(false)
+  const [uploadedOrderTableFile, setUploadedOrderTableFile] = useState<string>(formData.orderTableFileName || "")
+  const orderTableFileInputRef = useRef<HTMLInputElement | null>(null)
 
   const searchParams = useSearchParams()
   const type = searchParams.get("type")
@@ -532,8 +538,9 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
           const content = e.target?.result as string
           const rows = content.split("\n").filter((row) => row.trim())
           const tags = rows.slice(1).map((row) => {
-            const [phone, wechat, source, orderAmount, orderDate] = row.split(",")
+            const [name, phone, wechat, source, orderAmount, orderDate] = row.split(",")
             return {
+              name: name.trim(),
               phone: phone.trim(),
               wechat: wechat.trim(),
               source: source?.trim(),
@@ -552,7 +559,7 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
   }
 
   const handleDownloadTemplate = () => {
-    const template = "电话号码,微信号,来源,订单金额,下单日期\n13800138000,wxid_123,抖音,99.00,2024-03-03"
+    const template = "姓名,电话号码,微信号,来源,订单金额,下单日期\n张三,13800138000,wxid_123,抖音,99.00,2024-03-03"
     const blob = new Blob([template], { type: "text/csv" })
     const url = window.URL.createObjectURL(blob)
     const a = document.createElement("a")
@@ -607,6 +614,7 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
         const newPoster = {
           id: `custom_${Date.now()}`,
           name: result.data.name || '自定义海报',
+          type: 'poster',
           preview: result.data.url,
         }
         setMaterials(prev => [newPoster, ...prev])
@@ -748,7 +756,43 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
     }
   }
 
+  const handleUploadOrderTable = () => {
+    orderTableFileInputRef.current?.click()
+  }
+
+  const handleOrderTableFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0]
+    if (!file) return
+    setUploadingOrderTable(true)
+    const formDataObj = new FormData()
+    formDataObj.append('file', file)
+    try {
+      const token = localStorage.getItem('token')
+      const headers: HeadersInit = {}
+      if (token) headers['Authorization'] = `Bearer ${token}`
+      const response = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL}/v1/attachment/upload`, {
+        method: 'POST',
+        headers,
+        body: formDataObj,
+      })
+      const result = await response.json()
+      if (result.code === 200 && result.data?.url) {
+        setUploadedOrderTableFile(file.name)
+        onChange({ ...formData, orderTableFile: result.data.url, orderTableFileName: file.name })
+        toast({ title: '上传成功', description: '订单表格文件已上传' })
+      } else {
+        toast({ title: '上传失败', description: result.msg || '请重试', variant: 'destructive' })
+      }
+    } catch (e: any) {
+      toast({ title: '上传失败', description: e?.message || '请重试', variant: 'destructive' })
+    } finally {
+      setUploadingOrderTable(false)
+      if (orderTableFileInputRef.current) orderTableFileInputRef.current.value = ''
+    }
+  }
+
   const renderSceneExtra = () => {
+    console.log('currentScenario:', currentScenario?.name);
     switch (currentScenario?.name) {
       case "海报获客":
         return (
@@ -844,6 +888,44 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
     </div>
   )
 
+  const [saving, setSaving] = useState(false)
+
+  const handleSave = async () => {
+    if (saving) return // 防止重复点击
+    setSaving(true)
+    try {
+      // ...原有代码...
+      const submitData = {
+        ...formData,
+        device: formData.selectedDevices || formData.device,
+        posters: formData.materials || formData.posters,
+      };
+      const { selectedDevices, materials, ...finalData } = submitData;
+      const res = await api.post<ApiResponse>("/v1/plan/create", finalData);
+      if (res.code === 200) {
+        toast({
+          title: "创建成功",
+          description: "获客计划已创建",
+        })
+        router.push(`/scenarios/${formData.sceneId}`)
+      } else {
+        toast({
+          title: "创建失败",
+          description: res.msg || "创建计划失败，请重试",
+          variant: "destructive",
+        })
+      }
+    } catch (error: any) {
+      toast({
+        title: "创建失败",
+        description: error?.message || "创建计划失败，请重试",
+        variant: "destructive",
+      })
+    } finally {
+      setSaving(false)
+    }
+  }
+
   return (
     <TooltipProvider>
       <Card className="p-6">
@@ -1141,56 +1223,34 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
                       </div>
                     ))}
 
-              {String(currentScenario?.id) === "order" && (
+              {currentScenario?.name === "订单获客" && (
                 <div>
                   <div className="flex items-center justify-between mb-4">
-                    <Label>订单导入</Label>
-                    <div className="flex gap-2">
+                    <Label>订单表格上传</Label>
+                  </div>
+                  <div className="mb-4">
+                    <div className="flex gap-2 items-center">
                       <Button variant="outline" onClick={handleDownloadTemplate}>
                         <Download className="h-4 w-4 mr-2" />
                         下载模板
                       </Button>
-                      <Button onClick={() => setIsImportDialogOpen(true)}>
+                      <Button onClick={handleUploadOrderTable} disabled={uploadingOrderTable} variant="outline">
                         <Upload className="h-4 w-4 mr-2" />
-                        导入订单
+                        上传订单表格
+                        <input
+                          type="file"
+                          ref={orderTableFileInputRef}
+                          onChange={handleOrderTableFileChange}
+                          className="hidden"
+                          accept=".csv,.xlsx,.xls"
+                        />
                       </Button>
                     </div>
+                    {uploadedOrderTableFile && (
+                      <div className="mt-2 text-xs text-green-600 text-left">已上传：{uploadedOrderTableFile}</div>
+                    )}
+                    <div className="text-xs text-gray-500 mt-1">支持 CSV、Excel 格式，上传后将文件保存到服务器</div>
                   </div>
-
-                  {importedTags.length > 0 && (
-                    <div className="mt-4">
-                      <h4 className="text-sm font-medium mb-2">已导入 {importedTags.length} 条数据</h4>
-                      <div className="max-h-[300px] overflow-auto border rounded-md">
-                        <Table>
-                          <TableHeader>
-                            <TableRow>
-                              <TableHead>电话号码</TableHead>
-                              <TableHead>微信号</TableHead>
-                              <TableHead>来源</TableHead>
-                              <TableHead>订单金额</TableHead>
-                            </TableRow>
-                          </TableHeader>
-                          <TableBody>
-                            {importedTags.slice(0, 5).map((tag, index) => (
-                              <TableRow key={index}>
-                                <TableCell>{tag.phone}</TableCell>
-                                <TableCell>{tag.wechat}</TableCell>
-                                <TableCell>{tag.source}</TableCell>
-                                <TableCell>{tag.orderAmount}</TableCell>
-                              </TableRow>
-                            ))}
-                            {importedTags.length > 5 && (
-                              <TableRow>
-                                <TableCell colSpan={4} className="text-center text-gray-500">
-                                  还有 {importedTags.length - 5} 条数据未显示
-                                </TableCell>
-                              </TableRow>
-                            )}
-                          </TableBody>
-                        </Table>
-                      </div>
-                    </div>
-                  )}
                 </div>
               )}
               {String(formData.scenario) === "weixinqun" && (
@@ -1284,8 +1344,8 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
             />
           </div>
 
-          <Button className="w-full h-12 text-base" onClick={onNext}>
-            下一步
+          <Button className="w-full h-12 text-base" onClick={onNext} disabled={saving}>
+            {saving ? <span className="flex items-center justify-center"><svg className="animate-spin h-5 w-5 mr-2 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle><path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8v8z"></path></svg>提交中...</span> : "下一步"}
           </Button>
         </div>
       </Card>
@@ -1405,56 +1465,6 @@ export function BasicSettings({ formData, onChange, onNext, scenarios, loadingSc
           </DialogFooter>
         </DialogContent>
       </Dialog>
-
-      <Dialog open={isImportDialogOpen} onOpenChange={setIsImportDialogOpen}>
-        <DialogContent className="max-w-3xl">
-          <DialogHeader>
-            <DialogTitle>导入订单标签</DialogTitle>
-          </DialogHeader>
-          <div className="space-y-4">
-            <div className="flex items-center gap-4">
-              <Input type="file" accept=".csv" onChange={handleFileImport} className="flex-1" />
-            </div>
-            <div className="max-h-[400px] overflow-auto">
-              <Table>
-                <TableHeader>
-                  <TableRow>
-                    <TableHead>电话号码</TableHead>
-                    <TableHead>微信号</TableHead>
-                    <TableHead>来源</TableHead>
-                    <TableHead>订单金额</TableHead>
-                    <TableHead>下单日期</TableHead>
-                  </TableRow>
-                </TableHeader>
-                <TableBody>
-                  {importedTags.map((tag, index) => (
-                    <TableRow key={index}>
-                      <TableCell>{tag.phone}</TableCell>
-                      <TableCell>{tag.wechat}</TableCell>
-                      <TableCell>{tag.source}</TableCell>
-                      <TableCell>{tag.orderAmount}</TableCell>
-                      <TableCell>{tag.orderDate}</TableCell>
-                    </TableRow>
-                  ))}
-                </TableBody>
-              </Table>
-            </div>
-          </div>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setIsImportDialogOpen(false)}>
-              取消
-            </Button>
-            <Button
-              onClick={() => {
-                onChange({ ...formData, importedTags })
-                setIsImportDialogOpen(false)
-              }}
-            >
-              确认导入
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
     </TooltipProvider>
   )
 }
diff --git a/Cunkebao/app/workspace/moments-sync/[id]/page.tsx b/Cunkebao/app/workspace/moments-sync/[id]/page.tsx
index ff6e841d..a2db43a1 100644
--- a/Cunkebao/app/workspace/moments-sync/[id]/page.tsx
+++ b/Cunkebao/app/workspace/moments-sync/[id]/page.tsx
@@ -2,52 +2,243 @@
 
 import { useState, useEffect } from "react"
 import { useRouter } from "next/navigation"
-import { ChevronLeft } from "lucide-react"
+import { ChevronLeft, MoreVertical, Clock, Edit, Trash2, Copy, RefreshCw, FileText, MessageSquare, History } from "lucide-react"
 import { Card } from "@/components/ui/card"
 import { Button } from "@/components/ui/button"
 import { Badge } from "@/components/ui/badge"
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
+import { Avatar } from "@/components/ui/avatar"
 import { Switch } from "@/components/ui/switch"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog"
+import { api, ApiResponse } from "@/lib/api"
+import { showToast } from "@/lib/toast"
 
-interface SyncTask {
+// 定义任务详情的接口
+interface TaskDetail {
   id: string
   name: string
   status: "running" | "paused"
-  deviceCount: number
-  contentLib: string
+  syncType: number
+  accountType: number
   syncCount: number
+  syncInterval: number
+  startTime: string
+  endTime: string
+  enabled: boolean
+  config: any
   lastSyncTime: string
   createTime: string
   creator: string
 }
 
-export default function ViewMomentsSyncTask({ params }: { params: { id: string } }) {
+// 定义同步历史的接口
+interface SyncHistory {
+  id: string
+  syncTime: string
+  content: string
+  contentType: "text" | "image" | "video"
+  status: "success" | "failed"
+  errorMessage?: string
+}
+
+// 新增朋友圈发布记录类型
+type MomentRecord = {
+  id: number
+  workbenchId: number
+  publishTime: number
+  contentType: number // 1文本 2视频 3图片
+  content: string
+  resUrls: string[]
+  urls: string[]
+  operatorName: string
+  operatorAvatar: string
+}
+
+export default function MomentsSyncDetailPage({ params }: { params: { id: string } }) {
   const router = useRouter()
-  const [task, setTask] = useState<SyncTask | null>(null)
-
+  const [taskDetail, setTaskDetail] = useState<TaskDetail | null>(null)
+  const [syncHistory, setSyncHistory] = useState<SyncHistory[]>([])
+  const [isLoading, setIsLoading] = useState(true)
+  const [activeTab, setActiveTab] = useState("overview")
+  const [showDeleteAlert, setShowDeleteAlert] = useState(false)
+  const [momentRecords, setMomentRecords] = useState<MomentRecord[]>([])
+  const [isMomentLoading, setIsMomentLoading] = useState(false)
+  
+  // 获取任务详情
   useEffect(() => {
-    // Fetch task data from API
-    // For now, we'll use mock data
-    setTask({
-      id: params.id,
-      name: "同步卡若主号",
-      deviceCount: 2,
-      contentLib: "卡若朋友圈",
-      syncCount: 307,
-      lastSyncTime: "2025-02-06 13:12:35",
-      createTime: "2024-11-20 19:04:14",
-      creator: "karuo",
-      status: "running",
-    })
-  }, [params.id])
+    const fetchTaskDetail = async () => {
+      setIsLoading(true)
+      try {
+        const response = await api.get<ApiResponse>(`/v1/workbench/detail?id=${params.id}`)
+        if (response.code === 200 && response.data) {
+          setTaskDetail(response.data)
+          
+          // 获取同步历史
+          if (activeTab === "history") {
+            fetchSyncHistory()
+          }
+        } else {
+          showToast(response.msg || "获取任务详情失败", "error")
+          router.push("/workspace/moments-sync")
+        }
+      } catch (error: any) {
+        console.error("获取任务详情失败:", error)
+        showToast(error?.message || "获取任务详情失败", "error")
+        router.push("/workspace/moments-sync")
+      } finally {
+        setIsLoading(false)
+      }
+    }
 
-  const toggleTaskStatus = () => {
-    if (task) {
-      setTask({ ...task, status: task.status === "running" ? "paused" : "running" })
+    fetchTaskDetail()
+  }, [params.id, router])
+
+  // 获取同步历史
+  const fetchSyncHistory = async () => {
+    try {
+      const response = await api.get<ApiResponse>(`/v1/workbench/sync/history?id=${params.id}`)
+      if (response.code === 200 && response.data) {
+        setSyncHistory(response.data.list || [])
+      } else {
+        setSyncHistory([])
+      }
+    } catch (error) {
+      console.error("获取同步历史失败:", error)
+      setSyncHistory([])
     }
   }
 
-  if (!task) {
-    return <div>Loading...</div>
+  // 获取朋友圈发布记录
+  type MomentsApiResponse = { code: number; msg: string; data: { list: MomentRecord[] } }
+  const fetchMomentRecords = async () => {
+    setIsMomentLoading(true)
+    try {
+      const response = await api.get<MomentsApiResponse>(`/v1/workbench/moments-records?workbenchId=${params.id}`)
+      if (response.code === 200 && response.data) {
+        setMomentRecords(response.data.list || [])
+      } else {
+        setMomentRecords([])
+      }
+    } catch (error) {
+      setMomentRecords([])
+    } finally {
+      setIsMomentLoading(false)
+    }
+  }
+
+  // 切换Tab时加载数据
+  const handleTabChange = (value: string) => {
+    setActiveTab(value)
+    if (value === "history" && syncHistory.length === 0) {
+      fetchSyncHistory()
+    }
+    if (value === "moments" && momentRecords.length === 0) {
+      fetchMomentRecords()
+    }
+  }
+
+  // 切换任务状态
+  const toggleTaskStatus = async () => {
+    if (!taskDetail) return
+
+    try {
+      const newStatus = taskDetail.status === "running" ? "paused" : "running"
+      const response = await api.post<ApiResponse>('/v1/workbench/update/status', {
+        id: params.id,
+        status: newStatus === "running" ? 1 : 0
+      })
+
+      if (response.code === 200) {
+        setTaskDetail({
+          ...taskDetail,
+          status: newStatus
+        })
+        showToast(`任务已${newStatus === "running" ? "启用" : "暂停"}`, "success")
+      } else {
+        showToast(response.msg || "操作失败", "error")
+      }
+    } catch (error: any) {
+      console.error("更新任务状态失败:", error)
+      showToast(error?.message || "更新任务状态失败", "error")
+    }
+  }
+
+  // 编辑任务
+  const handleEdit = () => {
+    router.push(`/workspace/moments-sync/${params.id}/edit`)
+  }
+
+  // 确认删除
+  const confirmDelete = () => {
+    setShowDeleteAlert(true)
+  }
+
+  // 执行删除
+  const handleDelete = async () => {
+    try {
+      const response = await api.post<ApiResponse>('/v1/workbench/delete', {
+        id: params.id
+      })
+
+      if (response.code === 200) {
+        showToast("删除成功", "success")
+        router.push("/workspace/moments-sync")
+      } else {
+        showToast(response.msg || "删除失败", "error")
+      }
+    } catch (error: any) {
+      console.error("删除任务失败:", error)
+      showToast(error?.message || "删除任务失败", "error")
+    } finally {
+      setShowDeleteAlert(false)
+    }
+  }
+
+  // 复制任务
+  const handleCopy = async () => {
+    try {
+      const response = await api.post<ApiResponse>('/v1/workbench/copy', {
+        id: params.id
+      })
+
+      if (response.code === 200) {
+        showToast("复制成功，正在跳转到新任务", "success")
+        // 假设后端返回了新任务的ID
+        if (response.data?.id) {
+          router.push(`/workspace/moments-sync/${response.data.id}`)
+        } else {
+          router.push("/workspace/moments-sync")
+        }
+      } else {
+        showToast(response.msg || "复制失败", "error")
+      }
+    } catch (error: any) {
+      console.error("复制任务失败:", error)
+      showToast(error?.message || "复制任务失败", "error")
+    }
+  }
+
+  if (isLoading) {
+    return (
+      <div className="min-h-screen bg-[#F8F9FA] flex justify-center items-center">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600 mx-auto mb-4"></div>
+          <p className="text-gray-500">加载中...</p>
+        </div>
+      </div>
+    )
+  }
+
+  if (!taskDetail) {
+    return (
+      <div className="min-h-screen bg-[#F8F9FA] flex justify-center items-center">
+        <div className="text-center">
+          <p className="text-gray-500 mb-4">任务不存在或已被删除</p>
+          <Button onClick={() => router.push("/workspace/moments-sync")}>返回列表</Button>
+        </div>
+      </div>
+    )
   }
 
   return (
@@ -55,53 +246,222 @@ export default function ViewMomentsSyncTask({ params }: { params: { id: string }
       <header className="sticky top-0 z-10 bg-white border-b">
         <div className="flex items-center justify-between p-4">
           <div className="flex items-center space-x-3">
-            <Button variant="ghost" size="icon" onClick={() => router.back()}>
+            <Button variant="ghost" size="icon" onClick={() => router.push("/workspace/moments-sync")}>
               <ChevronLeft className="h-5 w-5" />
             </Button>
-            <h1 className="text-lg font-medium">查看朋友圈同步任务</h1>
+            <h1 className="text-lg font-medium">任务详情</h1>
           </div>
-          <Button onClick={() => router.push(`/workspace/moments-sync/${task.id}/edit`)}>编辑任务</Button>
         </div>
       </header>
 
       <div className="p-4">
-        <Card className="p-6">
-          <div className="flex items-center justify-between mb-6">
-            <div className="flex items-center space-x-2">
-              <h2 className="text-2xl font-bold">{task.name}</h2>
-              <Badge variant={task.status === "running" ? "success" : "secondary"}>
-                {task.status === "running" ? "进行中" : "已暂停"}
-              </Badge>
-            </div>
-            <Switch checked={task.status === "running"} onCheckedChange={toggleTaskStatus} />
-          </div>
-
-          <div className="grid grid-cols-2 gap-6 mb-6">
-            <div>
-              <h3 className="text-lg font-semibold mb-2">任务详情</h3>
-              <div className="space-y-2">
-                <p>推送设备：{task.deviceCount} 个</p>
-                <p>内容库：{task.contentLib}</p>
-                <p>已同步：{task.syncCount} 条</p>
-                <p>创建人：{task.creator}</p>
+        <Card className="mb-4">
+          <div className="p-4 border-b">
+            <div className="flex items-center justify-between mb-4">
+              <div className="flex items-center space-x-2">
+                <h2 className="text-xl font-semibold">{taskDetail.name}</h2>
+                <Badge variant={taskDetail.status == 1 ? "success" : "secondary"}>
+                  {taskDetail.status == 1 ? "进行中" : "已暂停"}
+                </Badge>
               </div>
             </div>
-            <div>
-              <h3 className="text-lg font-semibold mb-2">时间信息</h3>
-              <div className="space-y-2">
-                <p>创建时间：{task.createTime}</p>
-                <p>上次同步：{task.lastSyncTime}</p>
-              </div>
+            <div className="grid grid-cols-2 gap-4 text-sm text-gray-500">
+              <div>创建时间：{taskDetail.createTime}</div>
+              <div>创建人：{taskDetail.creator}</div>
+              <div>上次同步：{taskDetail.lastSyncTime}</div>
+              <div>已同步：{taskDetail.syncCount} 条</div>
             </div>
           </div>
-
-          <div className="border-t pt-4">
-            <h3 className="text-lg font-semibold mb-2">同步内容预览</h3>
-            {/* Add content preview here */}
-            <p className="text-gray-500">暂无内容预览</p>
-          </div>
         </Card>
+
+        <Tabs value={activeTab} onValueChange={handleTabChange} className="mb-4">
+          <TabsList className="grid grid-cols-4">
+            <TabsTrigger value="overview">基本信息</TabsTrigger>
+            <TabsTrigger value="devices">设备列表</TabsTrigger>
+            <TabsTrigger value="history">同步历史</TabsTrigger>
+            <TabsTrigger value="moments">发布记录</TabsTrigger>
+          </TabsList>
+          
+          <TabsContent value="overview" className="mt-4">
+            <Card className="p-4">
+              <div className="space-y-4">
+                <div>
+                  <div className="font-medium mb-1">账号类型</div>
+                  <div className="text-gray-600">{taskDetail.config.accountType === 1 ? "业务号" : "人设号"}</div>
+                </div>
+                <div>
+                  <div className="font-medium mb-1">同步间隔</div>
+                  <div className="text-gray-600">{taskDetail.config.syncInterval} 分钟</div>
+                </div>
+                <div>
+                  <div className="font-medium mb-1">每日同步数量</div>
+                  <div className="text-gray-600">{taskDetail.config.syncCount} 条</div>
+                </div>
+                <div>
+                  <div className="font-medium mb-1">允许发布时间段</div>
+                  <div className="text-gray-600">{taskDetail.config.startTime} - {taskDetail.config.endTime}</div>
+                </div>
+                <div>
+                  <div className="font-medium mb-1">内容库</div>
+                  <div className="flex flex-wrap gap-2 mt-1">
+                    {taskDetail.config.contentLibraries.map((lib) => (
+                      <Badge key={lib.id} variant="outline" className="bg-blue-50">
+                        {lib.name}
+                      </Badge>
+                    ))}
+                  </div>
+                </div>
+              </div>
+            </Card>
+          </TabsContent>
+          
+          <TabsContent value="devices" className="mt-4">
+            <Card className="p-4">
+              {taskDetail.config.deviceList.length === 0 ? (
+                <div className="text-center py-8 text-gray-500">暂无关联设备</div>
+              ) : (
+                <div className="divide-y">
+                  {taskDetail.config.deviceList.map((device) => (
+                    <div key={device.id} className="flex items-center py-3 first:pt-0 last:pb-0">
+                      <Avatar className="h-10 w-10 mr-3">
+                        {device.avatar ? (
+                          <img src={device.avatar} alt={device.nickname} />
+                        ) : (
+                          <div className="bg-blue-100 text-blue-600 h-full w-full flex items-center justify-center">
+                            {device.nickname}
+                          </div>
+                        )}
+                      </Avatar>
+                      <div>
+                        <div className="font-medium">{device.nickname}</div>
+                        <div className="text-xs text-gray-500">{device.alias || device.wechatId}</div>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </Card>
+          </TabsContent>
+          
+          <TabsContent value="history" className="mt-4">
+            <Card className="p-4">
+              <div className="flex items-center justify-between mb-4">
+                <h3 className="font-medium">同步历史</h3>
+                <Button variant="outline" size="sm" onClick={fetchSyncHistory}>
+                  <RefreshCw className="h-4 w-4 mr-2" />
+                  刷新
+                </Button>
+              </div>
+              
+              {syncHistory.length === 0 ? (
+                <div className="text-center py-8 text-gray-500">暂无同步历史</div>
+              ) : (
+                <div className="space-y-4">
+                  {syncHistory.map((record) => (
+                    <div key={record.id} className="border rounded-lg p-3">
+                      <div className="flex items-center justify-between mb-2">
+                        <div className="flex items-center">
+                          {record.contentType === "text" && <FileText className="h-4 w-4 mr-2 text-gray-500" />}
+                          {record.contentType === "image" && <img className="h-4 w-4 mr-2" src="/icons/image.svg" alt="图片" />}
+                          {record.contentType === "video" && <img className="h-4 w-4 mr-2" src="/icons/video.svg" alt="视频" />}
+                          <Badge variant={record.status === "success" ? "success" : "destructive"} className="text-xs">
+                            {record.status === "success" ? "成功" : "失败"}
+                          </Badge>
+                        </div>
+                        <div className="text-xs text-gray-500">{record.syncTime}</div>
+                      </div>
+                      <div className="text-sm text-gray-700 line-clamp-2">{record.content}</div>
+                      {record.status === "failed" && record.errorMessage && (
+                        <div className="mt-2 text-xs text-red-500">
+                          错误信息: {record.errorMessage}
+                        </div>
+                      )}
+                    </div>
+                  ))}
+                </div>
+              )}
+            </Card>
+          </TabsContent>
+          
+          <TabsContent value="moments" className="mt-4">
+            <Card className="p-4">
+              <div className="flex items-center justify-between mb-4">
+                <h3 className="font-medium">朋友圈发布记录</h3>
+                <Button variant="outline" size="sm" onClick={fetchMomentRecords} disabled={isMomentLoading}>
+                  <RefreshCw className="h-4 w-4 mr-2" />
+                  刷新
+                </Button>
+              </div>
+              {isMomentLoading ? (
+                <div className="text-center py-8 text-gray-500">加载中...</div>
+              ) : momentRecords.length === 0 ? (
+                <div className="text-center py-8 text-gray-500">暂无发布记录</div>
+              ) : (
+                <div className="space-y-4">
+                  {momentRecords.map((rec) => (
+                    <div key={rec.id} className="border rounded-lg p-3 flex gap-3">
+                      <Avatar className="h-10 w-10">
+                        {rec.operatorAvatar ? (
+                          <img src={rec.operatorAvatar} alt={rec.operatorName} />
+                        ) : (
+                          <div className="bg-blue-100 text-blue-600 h-full w-full flex items-center justify-center">
+                            {rec.operatorName?.charAt(0) || "?"}
+                          </div>
+                        )}
+                      </Avatar>
+                      <div className="flex-1">
+                        <div className="flex items-center gap-2 mb-1">
+                          <span className="font-medium text-sm">{rec.operatorName}</span>
+                          <span className="text-xs text-gray-400">{rec.publishTime ? new Date(rec.publishTime * 1000).toLocaleString() : "-"}</span>
+                        </div>
+                        <div className="mb-1 text-gray-800 text-sm">
+                          {rec.contentType === 1 && rec.content}
+                          {rec.contentType === 3 && rec.content}
+                        </div>
+                        {/* 图片展示 */}
+                        {rec.contentType === 3 && rec.resUrls && rec.resUrls.length > 0 && (
+                          <div className="flex gap-2 flex-wrap mt-1">
+                            {rec.resUrls.map((url, idx) => (
+                              <img key={idx} src={url} alt="图片" className="h-20 w-20 object-cover rounded" />
+                            ))}
+                          </div>
+                        )}
+                        {/* 视频展示 */}
+                        {rec.contentType === 2 && rec.urls && rec.urls.length > 0 && (
+                          <div className="mt-1">
+                            {rec.urls.map((url, idx) => (
+                              <video key={idx} src={url} controls className="h-32 w-48 rounded" />
+                            ))}
+                          </div>
+                        )}
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </Card>
+          </TabsContent>
+        </Tabs>
       </div>
+      
+      {/* 删除确认对话框 */}
+      <AlertDialog open={showDeleteAlert} onOpenChange={setShowDeleteAlert}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>确认删除</AlertDialogTitle>
+            <AlertDialogDescription>
+              删除后，此任务将无法恢复。确定要删除吗？
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>取消</AlertDialogCancel>
+            <AlertDialogAction onClick={handleDelete} className="bg-red-500 hover:bg-red-600">
+              删除
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
     </div>
   )
 }
+
diff --git a/Server/application/api/controller/AutomaticAssign.php b/Server/application/api/controller/AutomaticAssign.php
index 88e0048f..66b0d3d5 100644
--- a/Server/application/api/controller/AutomaticAssign.php
+++ b/Server/application/api/controller/AutomaticAssign.php
@@ -7,6 +7,7 @@ use app\api\model\CompanyModel;
 use Library\S2\Logics\AccountLogic;
 use think\Db;
 use think\facade\Request;
+use think\facade\Cache;
 
 /**
  * 账号管理控制器
@@ -174,7 +175,7 @@ class AutomaticAssign extends BaseController
     public function allotWechatFriend($data = [],$isInner = false)
     {
         // 获取授权token
-        $authorization = trim($this->request->header('authorization', $this->authorization));
+        $authorization =  $this->authorization;
         if (empty($authorization)) {
             if($isInner){
                 return json_encode(['code'=>500,'msg'=>'缺少授权信息']);
diff --git a/Server/application/command.php b/Server/application/command.php
index 2dcd3178..b8fb90e2 100644
--- a/Server/application/command.php
+++ b/Server/application/command.php
@@ -32,4 +32,5 @@ return [
     'sync:wechatData' => 'app\command\SyncWechatDataToCkbTask', // 同步微信数据到存客宝
     'sync:allFriends' => 'app\command\SyncAllFriendsCommand', // 同步所有在线好友
     'workbench:trafficDistribute' => 'app\command\WorkbenchTrafficDistributeCommand', // 工作台流量分发任务
+    'switch:friends' => 'app\command\SwitchFriendsCommand', // 切换好友
 ];
diff --git a/Server/application/command/SwitchFriendsCommand.php b/Server/application/command/SwitchFriendsCommand.php
new file mode 100644
index 00000000..c1035cb0
--- /dev/null
+++ b/Server/application/command/SwitchFriendsCommand.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace app\command;
+
+use app\job\WorkbenchAutoLikeJob;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\Cache;
+use think\facade\Log;
+use think\Queue;
+use app\api\controller\AutomaticAssign;
+
+class SwitchFriendsCommand extends Command
+{
+// 队列名称
+    protected $queueName = 'switch_friends';
+
+    protected function configure()
+    {
+        $this->setName('switch:friends')
+            ->setDescription('切换好友命令');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $cacheKey = 'allotWechatFriend';
+        $now = time();
+        $maxRetry = 5;
+        $retry = 0;
+        $switchedIds = [];
+
+
+        do {
+            $friends = Cache::get($cacheKey, []);
+
+            $toSwitch = [];
+            foreach ($friends as $friend) {
+                if (isset($friend['time']) && $friend['time'] < $now) {
+                    $toSwitch[] = $friend;
+                }
+            }
+
+            if (empty($toSwitch)) {
+                $output->writeln('没有需要切换的好友');
+                return;
+            }
+
+            $automaticAssign = new AutomaticAssign();
+            foreach ($toSwitch as $friend) {
+                $friendId = !empty($friend['friendId']) ? $friend['friendId'] : $friend['id'];
+                $res = $automaticAssign->allotWechatFriend([
+                    'wechatFriendId' => $friendId,
+                    'toAccountId'    => $friend['accountId'],
+                ], true);
+                $res = json_decode($res, true);
+                if ($res['code'] == 200){
+                    $output->writeln('切换好友：' . $friendId . ' 到账号：' . $friend['accountId']);
+                    $switchedIds[] = $friendId;
+                }else{
+                    $output->writeln('切换好友：' . $friendId . ' 到账号：' . $friend['accountId'] .' 结果：' .$res['msg']);
+                }
+            }
+
+            // 过滤掉已切换的，保留未切换和新进来的
+            $newFriends = Cache::get($cacheKey, []);
+            $updated = [];
+            foreach ($newFriends as $friend) {
+                $friendId = !empty($friend['friendId']) ? $friend['friendId'] : $friend['id'];
+                if (!in_array($friendId, $switchedIds)) {
+                    $updated[] = $friend;
+                }
+            }
+
+            // 按time升序排序
+            usort($updated, function($a, $b) {
+                return ($a['time'] ?? 0) <=> ($b['time'] ?? 0);
+            });
+
+            $success = Cache::set($cacheKey, $updated);
+            $retry++;
+        } while (!$success && $retry < $maxRetry);
+
+        $output->writeln('切换完成，缓存已更新并排序');
+    }
+
+}
\ No newline at end of file
diff --git a/Server/application/common.php b/Server/application/common.php
index d412b53a..389a9fad 100644
--- a/Server/application/common.php
+++ b/Server/application/common.php
@@ -518,6 +518,34 @@ if (!function_exists('exit_data')) {
     }
 }
 
+if (!function_exists('artificialAllotWechatFriend')) {
+    function artificialAllotWechatFriend($friend = [])
+    {
+        if (empty($friend)) {
+            return false;
+        }
+
+        //记录切换好友
+        $cacheKey = 'allotWechatFriend';
+        $cacheFriend = $friend;
+        $cacheFriend['time'] = time() + 120;
+        $maxRetry = 5;
+        $retry = 0;
+        do {
+            $cacheFriendData = Cache::get($cacheKey, []);
+            // 去重：移除同friendId的旧数据
+            $cacheFriendData = array_filter($cacheFriendData, function($item) use ($cacheFriend) {
+                return $item['friendId'] !== $cacheFriend['friendId'];
+            });
+            $cacheFriendData[] = $cacheFriend;
+            $success = Cache::set($cacheKey, $cacheFriendData);
+            $retry++;
+        } while (!$success && $retry < $maxRetry);
+    }
+}
+
+
+
 /**
  * 调试打印变量但不终止程序
  * @return void
diff --git a/Server/application/common/controller/Attachment.php b/Server/application/common/controller/Attachment.php
index 062bde02..e866d968 100644
--- a/Server/application/common/controller/Attachment.php
+++ b/Server/application/common/controller/Attachment.php
@@ -28,17 +28,17 @@ class Attachment extends Controller
             $validate = \think\facade\Validate::rule([
                 'file' => [
                     'fileSize' => 10485760, // 10MB
-                    'fileExt' => 'jpg,jpeg,png,gif,doc,docx,pdf,zip,rar,mp4,mp3',
+                    'fileExt' => 'jpg,jpeg,png,gif,doc,docx,pdf,zip,rar,mp4,mp3,csv,xls,xlsx',
                     'fileMime' => 'image/jpeg,image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/zip,application/x-rar-compressed,video/mp4,audio/mp3'
                 ]
             ]);
             
-            if (!$validate->check(['file' => $file])) {
-                return json([
-                    'code' => 400,
-                    'msg' => $validate->getError()
-                ]);
-            }
+            // if (!$validate->check(['file' => $file])) {
+            //     return json([
+            //         'code' => 400,
+            //         'msg' => $validate->getError()
+            //     ]);
+            // }
             
             // 生成文件hash
             $hashKey = md5_file($file->getRealPath());
diff --git a/Server/application/cunkebao/config/route.php b/Server/application/cunkebao/config/route.php
index ff4709e6..fc6f5588 100644
--- a/Server/application/cunkebao/config/route.php
+++ b/Server/application/cunkebao/config/route.php
@@ -40,7 +40,7 @@ Route::group('v1/', function () {
         Route::get('scenes-detail', 'app\cunkebao\controller\plan\GetPlanSceneListV1Controller@detail');
         Route::post('create', 'app\cunkebao\controller\plan\PostCreateAddFriendPlanV1Controller@index');
         Route::get('list', 'app\cunkebao\controller\plan\PlanSceneV1Controller@index');
-        Route::get('copy', 'app\cunkebao\controller\plan\PlanSceneV1Controller@copy');
+        Route::get('copy', 'app\cunkebao\controller\plan\GetCreateAddFriendPlanV1Controller@copy');
         Route::delete('delete', 'app\cunkebao\controller\plan\PlanSceneV1Controller@delete');
         Route::post('updateStatus', 'app\cunkebao\controller\plan\PlanSceneV1Controller@updateStatus');
         Route::get('detail', 'app\cunkebao\controller\plan\GetAddFriendPlanDetailV1Controller@index');
diff --git a/Server/application/cunkebao/controller/ContentLibraryController.php b/Server/application/cunkebao/controller/ContentLibraryController.php
index 20bccc7e..3aea2a28 100644
--- a/Server/application/cunkebao/controller/ContentLibraryController.php
+++ b/Server/application/cunkebao/controller/ContentLibraryController.php
@@ -7,6 +7,7 @@ use app\cunkebao\model\ContentItem;
 use think\Controller;
 use think\Db;
 use app\api\controller\WebSocketController;
+use think\facade\Cache;
 use think\facade\Env;
 use app\api\controller\AutomaticAssign;
 
@@ -761,7 +762,8 @@ class ContentLibraryController extends Controller
         // 查询条件：未删除且已开启的内容库
         $where = [
             ['isDel', '=', 0],      // 未删除
-            ['status', '=', 1]       // 已开启
+            ['status', '=', 1],       // 已开启
+            ['id', '=', 27]
         ];
         
         // 查询符合条件的内容库
@@ -862,6 +864,7 @@ class ContentLibraryController extends Controller
                 'message' => '没有指定要采集的好友'
             ];
         }
+        $friendData = [];
         try {
             $toAccountId = '';
             $username = Env::get('api.username', '');
@@ -889,6 +892,7 @@ class ContentLibraryController extends Controller
             $totalMomentsCount = 0;
 
             foreach ($friends as $friend) {
+                $friendData = $friend;
                 if (!empty($username) && !empty($password)) {
                     //执行切换好友命令
                     $automaticAssign = new AutomaticAssign();
@@ -897,7 +901,13 @@ class ContentLibraryController extends Controller
                     $webSocket = new WebSocketController(['userName' => $username,'password' => $password,'accountId' => $toAccountId]);
                     $webSocket->getMoments(['wechatFriendId' => $friend['id'],'wechatAccountId' => $friend['wechatAccountId']]);
                     //采集完毕切换
-                    $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'],'toAccountId' => $friend['accountId']],true);
+                    $res =  $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['id'],'toAccountId' => $friend['accountId']],true);
+                    $res = json_decode($res, true);
+                    if($res == '无效路径或登录状态失效'){
+                        $cacheFriend = $friend;
+                        $cacheFriend['friendId'] = $friend['id'];
+                        artificialAllotWechatFriend($friend);
+                    }
                 }
 
 
@@ -1006,6 +1016,12 @@ class ContentLibraryController extends Controller
             ];
             
         } catch (\Exception $e) {
+
+            $cacheFriend = $friendData;
+            $cacheFriend['friendId'] = $friend['id'];
+            artificialAllotWechatFriend($friend);
+
+
             return [
                 'status' => 'error',
                 'message' => '采集过程发生错误: ' . $e->getMessage()
@@ -1390,8 +1406,44 @@ class ContentLibraryController extends Controller
             }
             
             // 判断内容类型 (0=未知, 1=图片, 2=链接, 3=视频, 4=文本, 5=小程序, 6=图文)
-            $contentType = $this->determineContentType($moment['content'] ?? '', $resUrls, $urls);
-            
+            if($moment['type'] == 1) {
+                //图文
+                $contentType = 6;
+            }elseif ($moment['type'] == 3){
+                //链接
+                $contentType = 2;
+                $urls = [];
+                $url = is_string($moment['urls']) ? json_decode($moment['urls'], true) : $moment['urls'] ?? [];
+                $url = $url[0];
+                if(strpos($url, 'feishu.cn') !== false){
+                    $urls[] = [
+                        'url' => $url,
+                        'image' => 'http://karuosiyujzk.oss-cn-shenzhen.aliyuncs.com/2025/07/09/3db2a5d7fe49011ab68175a42a5094ce.jpeg',
+                        'desc' => '点击查看详情'
+                    ];
+                }else{
+                    $urls[] = [
+                        'url' => $url,
+                        'image' => 'http://karuosiyujzk.oss-cn-shenzhen.aliyuncs.com/2025/07/09/ec039d96fad6eab1d960f207d3d9ca9f.jpeg',
+                        'desc' => '点击查看详情'
+                    ];
+                }
+                $moment['urls'] = $urls;
+    
+
+            }elseif ($moment['type'] == 15){
+                //视频
+                $contentType = 3;
+            }elseif ($moment['type'] == 2){
+                //纯文本
+                $contentType = 4;
+            }elseif ($moment['type'] == 30){
+                //小程序
+                $contentType = 5;
+            }else{
+                $contentType = 1;
+            }
+
             // 如果不存在，则创建新的内容项目
             $item = new ContentItem();
             $item->libraryId = $libraryId;
@@ -1695,4 +1747,167 @@ class ContentLibraryController extends Controller
             return [];
         }
     }
-} 
\ No newline at end of file
+
+
+
+
+        /**
+     * 解析URL获取网页信息（内部调用）
+     * @param string $url 要解析的URL
+     * @return array 包含title、icon的数组，失败返回空数组
+     */
+    public function parseUrl($url)
+    {
+        if (empty($url) || !filter_var($url, FILTER_VALIDATE_URL)) {
+            return [];
+        }
+
+        try {
+            // 设置请求头，模拟浏览器访问
+            $context = stream_context_create([
+                'http' => [
+                    'method' => 'GET',
+                    'header' => [
+                        'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+                        'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+                        'Accept-Language: zh-CN,zh;q=0.9,en;q=0.8',
+                        'Accept-Encoding: gzip, deflate',
+                        'Connection: keep-alive',
+                        'Upgrade-Insecure-Requests: 1'
+                    ],
+                    'timeout' => 10,
+                    'follow_location' => true,
+                    'max_redirects' => 3
+                ]
+            ]);
+
+            // 获取网页内容
+            $html = @file_get_contents($url, false, $context);
+            
+            if ($html === false) {
+                return [];
+            }
+
+            // 检测编码并转换为UTF-8
+            $encoding = mb_detect_encoding($html, ['UTF-8', 'GBK', 'GB2312', 'BIG5', 'ASCII']);
+            if ($encoding && $encoding !== 'UTF-8') {
+                $html = mb_convert_encoding($html, 'UTF-8', $encoding);
+            }
+
+            // 解析HTML
+            $dom = new \DOMDocument();
+            @$dom->loadHTML($html, LIBXML_NOERROR | LIBXML_NOWARNING);
+            $xpath = new \DOMXPath($dom);
+
+            $result = [
+                'title' => '',
+                'icon' => '',
+                'url' => $url
+            ];
+
+            // 提取标题
+            $titleNodes = $xpath->query('//title');
+            if ($titleNodes->length > 0) {
+                $result['title'] = trim($titleNodes->item(0)->textContent);
+            }
+
+            // 提取图标 - 优先获取favicon
+            $iconNodes = $xpath->query('//link[@rel="icon"]/@href | //link[@rel="shortcut icon"]/@href | //link[@rel="apple-touch-icon"]/@href');
+            if ($iconNodes->length > 0) {
+                $iconUrl = trim($iconNodes->item(0)->value);
+                $result['icon'] = $this->makeAbsoluteUrl($iconUrl, $url);
+            } else {
+                // 尝试获取Open Graph图片
+                $ogImageNodes = $xpath->query('//meta[@property="og:image"]/@content');
+                if ($ogImageNodes->length > 0) {
+                    $result['icon'] = trim($ogImageNodes->item(0)->value);
+                } else {
+                    // 默认favicon路径
+                    $result['icon'] = $this->makeAbsoluteUrl('/favicon.ico', $url);
+                }
+            }
+
+            // 清理和验证数据
+            $result['title'] = $this->cleanText($result['title']);
+
+            return $result;
+
+        } catch (\Exception $e) {
+            // 记录错误日志但不抛出异常
+            \think\facade\Log::error('URL解析失败: ' . $e->getMessage() . ' URL: ' . $url);
+            return [];
+        }
+    }
+
+
+
+
+
+    /**
+     * 将相对URL转换为绝对URL
+     * @param string $relativeUrl 相对URL
+     * @param string $baseUrl 基础URL
+     * @return string 绝对URL
+     */
+    private function makeAbsoluteUrl($relativeUrl, $baseUrl)
+    {
+        if (empty($relativeUrl)) {
+            return '';
+        }
+
+        // 如果已经是绝对URL，直接返回
+        if (filter_var($relativeUrl, FILTER_VALIDATE_URL)) {
+            return $relativeUrl;
+        }
+
+        // 解析基础URL
+        $baseParts = parse_url($baseUrl);
+        if (!$baseParts) {
+            return $relativeUrl;
+        }
+
+        // 处理以/开头的绝对路径
+        if (strpos($relativeUrl, '/') === 0) {
+            return $baseParts['scheme'] . '://' . $baseParts['host'] . 
+                   (isset($baseParts['port']) ? ':' . $baseParts['port'] : '') . 
+                   $relativeUrl;
+        }
+
+        // 处理相对路径
+        $basePath = isset($baseParts['path']) ? dirname($baseParts['path']) : '/';
+        if ($basePath === '.') {
+            $basePath = '/';
+        }
+
+        return $baseParts['scheme'] . '://' . $baseParts['host'] . 
+               (isset($baseParts['port']) ? ':' . $baseParts['port'] : '') . 
+               $basePath . '/' . $relativeUrl;
+    }
+
+    /**
+     * 清理文本内容
+     * @param string $text 要清理的文本
+     * @return string 清理后的文本
+     */
+    private function cleanText($text)
+    {
+        if (empty($text)) {
+            return '';
+        }
+
+        // 移除HTML实体
+        $text = html_entity_decode($text, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+        
+        // 移除多余的空白字符
+        $text = preg_replace('/\s+/', ' ', $text);
+        
+        // 移除控制字符
+        $text = preg_replace('/[\x00-\x1F\x7F]/', '', $text);
+        
+        return trim($text);
+    }
+
+
+
+
+}
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/WorkbenchController.php b/Server/application/cunkebao/controller/WorkbenchController.php
index 86d80095..67eb0b9b 100644
--- a/Server/application/cunkebao/controller/WorkbenchController.php
+++ b/Server/application/cunkebao/controller/WorkbenchController.php
@@ -2,6 +2,8 @@
 
 namespace app\cunkebao\controller;
 
+use app\common\model\Device as DeviceModel;
+use app\common\model\DeviceWechatLogin as DeviceWechatLoginModel;
 use app\cunkebao\model\Workbench;
 use app\cunkebao\model\WorkbenchAutoLike;
 use app\cunkebao\model\WorkbenchMomentsSync;
@@ -236,7 +238,12 @@ class WorkbenchController extends Controller
                             $item->config = $item->momentsSync;
                             $item->config->devices = json_decode($item->config->devices, true);
                             $item->config->contentLibraries = json_decode($item->config->contentLibraries, true);
-                            
+                            //同步记录
+                            $sendNum = Db::name('workbench_moments_sync_item')->where(['workbenchId' => $item->id])->count();
+                            $item->syncCount = $sendNum;
+                            $lastTime = Db::name('workbench_moments_sync_item')->where(['workbenchId' => $item->id])->order('id DESC')->value('createTime');
+                            $item->lastSyncTime = !empty($lastTime) ? date('Y-m-d H:i',$lastTime) : '--';
+
                             // 获取内容库名称
                             if (!empty($item->config->contentLibraries)) {
                                 $libraryNames = ContentLibrary::where('id', 'in', $item->config->contentLibraries)
@@ -426,6 +433,42 @@ class WorkbenchController extends Controller
                     $workbench->config = $workbench->momentsSync;
                     $workbench->config->devices = json_decode($workbench->config->devices, true);
                     $workbench->config->contentLibraries = json_decode($workbench->config->contentLibraries, true);
+
+                    //同步记录
+                    $sendNum = Db::name('workbench_moments_sync_item')->where(['workbenchId' => $workbench->id])->count();
+                    $workbench->syncCount = $sendNum;
+                    $lastTime = Db::name('workbench_moments_sync_item')->where(['workbenchId' => $workbench->id])->order('id DESC')->value('createTime');
+                    $workbench->lastSyncTime = !empty($lastTime) ? date('Y-m-d H:i',$lastTime) : '--';
+
+                    // 获取内容库名称
+                    if (!empty($workbench->config->contentLibraries)) {
+                        $libraryNames = ContentLibrary::where('id', 'in', $workbench->config->contentLibraries)
+                            ->select();
+                        $workbench->config->contentLibraries = $libraryNames;
+                    } else {
+                        $workbench->config->contentLibraryNames = [];
+                    }
+
+                    if(!empty($workbench->config->devices)){
+                        $deviceList =  DeviceModel::alias('d')
+                            ->field([
+                                'd.id', 'd.imei', 'd.memo', 'd.alive',
+                                'l.wechatId',
+                                'a.nickname', 'a.alias', 'a.avatar','a.alias'
+                            ])
+                            ->leftJoin('device_wechat_login l', 'd.id = l.deviceId and l.alive =' . DeviceWechatLoginModel::ALIVE_WECHAT_ACTIVE . ' and l.companyId = d.companyId')
+                            ->leftJoin('wechat_account a', 'l.wechatId = a.wechatId')
+                            ->whereIn('d.id',$workbench->config->devices)
+                            ->order('d.id desc')
+                            ->select();
+                        $workbench->config->deviceList = $deviceList;
+                    }else{
+                        $workbench->config->deviceList = [];
+                    }
+
+
+
+
                     unset($workbench->momentsSync,$workbench->moments_sync);
                 }
                 break;
diff --git a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
index 3d958815..f43428e3 100644
--- a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php
@@ -54,18 +54,18 @@ class PlanSceneV1Controller extends BaseController
                     $val['acquiredCount'] = Db::name('task_customer')->where('task_id',$val['id'])->count();
                     $val['addedCount'] = Db::name('task_customer')->where('task_id',$val['id'])->whereIn('status',[1,2,3,4])->count();
                     $val['passCount'] = Db::name('task_customer')->where('task_id',$val['id'])->where('status',4)->count();
-
                     $val['passRate'] = 0;
                     if(!empty($val['passCount']) && !empty($val['addedCount'])){
-                        $passRate = ($val['addedCount'] / $val['passCount']) * 100;
+                        $passRate = ($val['passCount'] / $val['addedCount']) * 100;
                         $val['passRate'] = number_format($passRate,2);
                     }
 
+                    $lastTime = Db::name('task_customer')->where(['task_id'=>$val['id']])->max('updated_at');
+                    $val['lastUpdated'] = !empty($lastTime) ? date('Y-m-d H:i', $lastTime) : '--';
+
+
                 }
                 unset($val);
-
-
-
             return ResponseHelper::success([
                 'total' => $total,
                 'list' => $list
@@ -75,41 +75,6 @@ class PlanSceneV1Controller extends BaseController
         }
     }
 
-    /**
-     * 拷贝计划任务
-     *
-     * @return \think\response\Json
-     */
-    public function copy()
-    {
-        try {
-            $params = $this->request->param();
-            $planId = isset($params['planId']) ? intval($params['planId']) : 0;
-
-            if ($planId <= 0) {
-                return ResponseHelper::error('计划ID不能为空', 400);
-            }
-
-            $plan = Db::name('customer_acquisition_task')->where('id', $planId)->find();
-            if (!$plan) {
-                return ResponseHelper::error('计划不存在', 404);
-            }
-
-            unset($plan['id']);
-            $plan['name'] = $plan['name'] . ' (拷贝)';
-            $plan['createTime'] = time();
-            $plan['updateTime'] = time();
-
-            $newPlanId = Db::name('customer_acquisition_task')->insertGetId($plan);
-            if (!$newPlanId) {
-                return ResponseHelper::error('拷贝计划失败', 500);
-            }
-
-            return ResponseHelper::success(['planId' => $newPlanId], '拷贝计划任务成功');
-        } catch (\Exception $e) {
-            return ResponseHelper::error('系统错误: ' . $e->getMessage(), 500);
-        }
-    }
 
     /**
      * 删除计划任务
@@ -163,4 +128,251 @@ class PlanSceneV1Controller extends BaseController
             return ResponseHelper::error('系统错误: ' . $e->getMessage(), 500);
         }
     }
+
+    /**
+     * 获取获客计划设备列表
+     *
+     * @return \think\response\Json
+     */
+    public function getPlanDevices()
+    {
+        try {
+            $params = $this->request->param();
+            $planId = isset($params['planId']) ? intval($params['planId']) : 0;
+            $page = isset($params['page']) ? intval($params['page']) : 1;
+            $limit = isset($params['limit']) ? intval($params['limit']) : 10;
+            $deviceStatus = isset($params['deviceStatus']) ? $params['deviceStatus'] : '';
+            $searchKeyword = isset($params['searchKeyword']) ? trim($params['searchKeyword']) : '';
+
+            // 验证计划ID
+            if ($planId <= 0) {
+                return ResponseHelper::error('计划ID不能为空', 400);
+            }
+
+            // 验证计划是否存在且用户有权限
+            $plan = Db::name('customer_acquisition_task')
+                ->where([
+                    'id' => $planId,
+                    'deleteTime' => 0,
+                    'companyId' => $this->getUserInfo('companyId')
+                ])
+                ->find();
+
+            if (!$plan) {
+                return ResponseHelper::error('计划不存在或无权限访问', 404);
+            }
+
+            // 如果是管理员，需要验证用户权限
+            if ($this->getUserInfo('isAdmin')) {
+                $userPlan = Db::name('customer_acquisition_task')
+                    ->where([
+                        'id' => $planId,
+                        'userId' => $this->getUserInfo('id')
+                    ])
+                    ->find();
+                
+                if (!$userPlan) {
+                    return ResponseHelper::error('您没有权限访问该计划', 403);
+                }
+            }
+
+            // 构建查询条件
+            $where = [
+                'pt.plan_id' => $planId,
+                'd.deleteTime' => 0,
+                'd.companyId' => $this->getUserInfo('companyId')
+            ];
+
+            // 设备状态筛选
+            if (!empty($deviceStatus)) {
+                $where['d.alive'] = $deviceStatus;
+            }
+
+            // 搜索关键词
+            $searchWhere = [];
+            if (!empty($searchKeyword)) {
+                $searchWhere[] = ['d.imei', 'like', "%{$searchKeyword}%"];
+                $searchWhere[] = ['d.memo', 'like', "%{$searchKeyword}%"];
+            }
+
+            // 查询设备总数
+            $totalQuery = Db::name('plan_task_device')->alias('pt')
+                ->join('device d', 'pt.device_id = d.id')
+                ->where($where);
+
+            if (!empty($searchWhere)) {
+                $totalQuery->where(function ($query) use ($searchWhere) {
+                    foreach ($searchWhere as $condition) {
+                        $query->whereOr($condition[0], $condition[1], $condition[2]);
+                    }
+                });
+            }
+
+            $total = $totalQuery->count();
+
+            // 查询设备列表
+            $listQuery = Db::name('plan_task_device')->alias('pt')
+                ->join('device d', 'pt.device_id = d.id')
+                ->field([
+                    'd.id',
+                    'd.imei',
+                    'd.memo',
+                    'd.alive',
+                    'd.extra',
+                    'd.createTime',
+                    'd.updateTime',
+                    'pt.status as plan_device_status',
+                    'pt.createTime as assign_time'
+                ])
+                ->where($where)
+                ->order('pt.createTime', 'desc');
+
+            if (!empty($searchWhere)) {
+                $listQuery->where(function ($query) use ($searchWhere) {
+                    foreach ($searchWhere as $condition) {
+                        $query->whereOr($condition[0], $condition[1], $condition[2]);
+                    }
+                });
+            }
+
+            $list = $listQuery->page($page, $limit)->select();
+
+            // 处理设备数据
+            foreach ($list as &$device) {
+                // 格式化时间
+                $device['createTime'] = date('Y-m-d H:i:s', $device['createTime']);
+                $device['updateTime'] = date('Y-m-d H:i:s', $device['updateTime']);
+                $device['assign_time'] = date('Y-m-d H:i:s', $device['assign_time']);
+
+                // 解析设备额外信息
+                if (!empty($device['extra'])) {
+                    $extra = json_decode($device['extra'], true);
+                    $device['battery'] = isset($extra['battery']) ? intval($extra['battery']) : 0;
+                    $device['device_info'] = $extra;
+                } else {
+                    $device['battery'] = 0;
+                    $device['device_info'] = [];
+                }
+
+                // 设备状态文本
+                $device['alive_text'] = $this->getDeviceStatusText($device['alive']);
+                $device['plan_device_status_text'] = $this->getPlanDeviceStatusText($device['plan_device_status']);
+
+                // 获取设备当前微信登录信息
+                $wechatLogin = Db::name('device_wechat_login')
+                    ->where([
+                        'deviceId' => $device['id'],
+                        'companyId' => $this->getUserInfo('companyId'),
+                        'alive' => 1
+                    ])
+                    ->order('createTime', 'desc')
+                    ->find();
+
+                $device['current_wechat'] = $wechatLogin ? [
+                    'wechatId' => $wechatLogin['wechatId'],
+                    'nickname' => $wechatLogin['nickname'] ?? '',
+                    'loginTime' => date('Y-m-d H:i:s', $wechatLogin['createTime'])
+                ] : null;
+
+                // 获取设备在该计划中的任务统计
+                $device['task_stats'] = $this->getDeviceTaskStats($device['id'], $planId);
+
+                // 移除原始extra字段
+                unset($device['extra']);
+            }
+            unset($device);
+
+            return ResponseHelper::success([
+                'total' => $total,
+                'list' => $list,
+                'plan_info' => [
+                    'id' => $plan['id'],
+                    'name' => $plan['name'],
+                    'status' => $plan['status']
+                ]
+            ], '获取计划设备列表成功');
+
+        } catch (\Exception $e) {
+            return ResponseHelper::error('系统错误: ' . $e->getMessage(), 500);
+        }
+    }
+
+    /**
+     * 获取设备状态文本
+     *
+     * @param int $status
+     * @return string
+     */
+    private function getDeviceStatusText($status)
+    {
+        $statusMap = [
+            0 => '离线',
+            1 => '在线',
+            2 => '忙碌',
+            3 => '故障'
+        ];
+        return isset($statusMap[$status]) ? $statusMap[$status] : '未知';
+    }
+
+    /**
+     * 获取计划设备状态文本
+     *
+     * @param int $status
+     * @return string
+     */
+    private function getPlanDeviceStatusText($status)
+    {
+        $statusMap = [
+            0 => '待分配',
+            1 => '已分配',
+            2 => '执行中',
+            3 => '已完成',
+            4 => '已暂停',
+            5 => '已取消'
+        ];
+        return isset($statusMap[$status]) ? $statusMap[$status] : '未知';
+    }
+
+    /**
+     * 获取设备在指定计划中的任务统计
+     *
+     * @param int $deviceId
+     * @param int $planId
+     * @return array
+     */
+    private function getDeviceTaskStats($deviceId, $planId)
+    {
+        // 获取该设备在计划中的任务总数
+        $totalTasks = Db::name('task_customer')
+            ->where([
+                'task_id' => $planId,
+                'device_id' => $deviceId
+            ])
+            ->count();
+
+        // 获取已完成的任务数
+        $completedTasks = Db::name('task_customer')
+            ->where([
+                'task_id' => $planId,
+                'device_id' => $deviceId,
+                'status' => 4
+            ])
+            ->count();
+
+        // 获取进行中的任务数
+        $processingTasks = Db::name('task_customer')
+            ->where([
+                'task_id' => $planId,
+                'device_id' => $deviceId,
+                'status' => ['in', [1, 2, 3]]
+            ])
+            ->count();
+
+        return [
+            'total_tasks' => $totalTasks,
+            'completed_tasks' => $completedTasks,
+            'processing_tasks' => $processingTasks,
+            'completion_rate' => $totalTasks > 0 ? round(($completedTasks / $totalTasks) * 100, 2) : 0
+        ];
+    }
 } 
\ No newline at end of file
diff --git a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
index a2303056..011d3fae 100644
--- a/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PostCreateAddFriendPlanV1Controller.php
@@ -13,10 +13,6 @@ use think\facade\Request;
 class PostCreateAddFriendPlanV1Controller extends Controller
 {
 
-    protected function yyyyyyy()
-    {
-
-    }
 
     /**
      * 生成唯一API密钥
@@ -60,6 +56,7 @@ class PostCreateAddFriendPlanV1Controller extends Controller
         try {
             $params = $this->request->param();
             
+
             // 验证必填字段
             if (empty($params['name'])) {
                 return ResponseHelper::error('计划名称不能为空', 400);
@@ -91,16 +88,25 @@ class PostCreateAddFriendPlanV1Controller extends Controller
             // 其余参数归为sceneConf
             $sceneConf = $params;
             unset(
+                $sceneConf['id'],
+                $sceneConf['apiKey'],
+                $sceneConf['userId'],
+                $sceneConf['status'],
+                $sceneConf['planId'],
                 $sceneConf['name'],
                 $sceneConf['sceneId'],
                 $sceneConf['messagePlans'],
                 $sceneConf['scenarioTags'],
                 $sceneConf['customTags'],
                 $sceneConf['device'],
+                $sceneConf['orderTableFileName'],
+                $sceneConf['userInfo'],
+                $sceneConf['textUrl'],
                 $sceneConf['remarkType'],
                 $sceneConf['greeting'],
                 $sceneConf['addFriendInterval'],
                 $sceneConf['startTime'],
+                $sceneConf['orderTableFile'],
                 $sceneConf['endTime']
             );
 
@@ -122,9 +128,9 @@ class PostCreateAddFriendPlanV1Controller extends Controller
 
         
 
-            // 开启事务
-            Db::startTrans();
+
             try {
+                Db::startTrans();
                 // 插入数据
                 $planId = Db::name('customer_acquisition_task')->insertGetId($data);
                 
@@ -132,7 +138,132 @@ class PostCreateAddFriendPlanV1Controller extends Controller
                     throw new \Exception('添加计划失败');
                 }
 
-                // 提交事务
+
+                //订单
+                if($params['sceneId'] == 2){
+                    if(!empty($params['orderTableFile'])){
+                        // 先下载到本地临时文件，再分析，最后删除
+                        $originPath = $params['orderTableFile'];
+                        $tmpFile = tempnam(sys_get_temp_dir(), 'order_');
+                        // 判断是否为远程文件
+                        if (preg_match('/^https?:\/\//i', $originPath)) {
+                            // 远程URL，下载到本地
+                            $fileContent = file_get_contents($originPath);
+                            if ($fileContent === false) {
+                                exit('远程文件下载失败: ' . $originPath);
+                            }
+                            file_put_contents($tmpFile, $fileContent);
+                        } else {
+                            // 本地文件，直接copy
+                            if (!file_exists($originPath)) {
+                                exit('文件不存在: ' . $originPath);
+                            }
+                            copy($originPath, $tmpFile);
+                        }
+                        // 解析临时文件
+                        $ext = strtolower(pathinfo($originPath, PATHINFO_EXTENSION));
+                        $rows = [];
+                        if (in_array($ext, ['xls', 'xlsx'])) {
+                            // 直接用composer自动加载的PHPExcel
+                            $excel = \PHPExcel_IOFactory::load($tmpFile);
+                            $sheet = $excel->getActiveSheet();
+                            $data = $sheet->toArray();
+                            if (count($data) > 1) {
+                                array_shift($data); // 去掉表头
+                            }
+
+                            foreach ($data as $cols) {
+                                $rows[] = [
+                                    'name'        => isset($cols[0]) ? trim($cols[0]) : '',
+                                    'phone'       => isset($cols[1]) ? trim($cols[1]) : '',
+                                    'wechat'      => isset($cols[2]) ? trim($cols[2]) : '',
+                                    'source'      => isset($cols[3]) ? trim($cols[3]) : '',
+                                    'orderAmount' => isset($cols[4]) ? trim($cols[4]) : '',
+                                    'orderDate'   => isset($cols[5]) ? trim($cols[5]) : '',
+                                ];
+                            }
+                        } elseif ($ext === 'csv') {
+                            $content = file_get_contents($tmpFile);
+                            $lines = preg_split('/\r\n|\r|\n/', $content);
+                            if (count($lines) > 1) {
+                                array_shift($lines); // 去掉表头
+                                foreach ($lines as $line) {
+                                    if (trim($line) === '') continue;
+                                    $cols = str_getcsv($line);
+                                    if (count($cols) >= 6) {
+                                        $rows[] = [
+                                            'name'        => isset($cols[0]) ? trim($cols[0]) : '',
+                                            'phone'       => isset($cols[1]) ? trim($cols[1]) : '',
+                                            'wechat'      => isset($cols[2]) ? trim($cols[2]) : '',
+                                            'source'      => isset($cols[3]) ? trim($cols[3]) : '',
+                                            'orderAmount' => isset($cols[4]) ? trim($cols[4]) : '',
+                                            'orderDate'   => isset($cols[5]) ? trim($cols[5]) : '',
+                                        ];
+                                    }
+                                }
+                            }
+                        } else {
+                            unlink($tmpFile);
+                            exit('暂不支持的文件类型: ' . $ext);
+                        }
+                        // 删除临时文件
+                        unlink($tmpFile);
+
+                        // 1000条为一组进行批量处理
+                        $batchSize = 1000;
+                        $totalRows = count($rows);
+
+                        for ($i = 0; $i < $totalRows; $i += $batchSize) {
+                            $batchRows = array_slice($rows, $i, $batchSize);
+
+                            if (!empty($batchRows)) {
+                                // 1. 提取当前批次的phone
+                                $phones = [];
+                                foreach ($batchRows as $row) {
+                                    $phone = !empty($row['phone']) ? $row['phone'] : $row['wechat'];
+                                    if (!empty($phone)) {
+                                        $phones[] = $phone;
+                                    }
+                                }
+
+                                // 2. 批量查询已存在的phone
+                                $existingPhones = [];
+                                if (!empty($phones)) {
+                                    $existing = Db::name('task_customer')
+                                        ->where('task_id', $planId)
+                                        ->where('phone', 'in', $phones)
+                                        ->field('phone')
+                                        ->select();
+                                    $existingPhones = array_column($existing, 'phone');
+                                }
+
+                                // 3. 过滤出新数据，批量插入
+                                $newData = [];
+                                foreach ($batchRows as $row) {
+                                    $phone = !empty($row['phone']) ? $row['phone'] : $row['wechat'];
+                                    if (!empty($phone) && !in_array($phone, $existingPhones)) {
+                                        $newData[] = [
+                                            'task_id' => $planId,
+                                            'name' => $row['name'] ?? '',
+                                            'source' => $row['source'] ?? '',
+                                            'phone' => $phone,
+                                            'tags' => json_encode([], JSON_UNESCAPED_UNICODE),
+                                            'siteTags' => json_encode([], JSON_UNESCAPED_UNICODE),
+                                            'created_at' => time(),
+                                        ];
+                                    }
+                                }
+
+                                // 4. 批量插入新数据
+                                if (!empty($newData)) {
+                                    Db::name('task_customer')->insertAll($newData);
+                                }
+                            }
+                        }
+
+                    }
+                }
+
                 Db::commit();
                 
                 return ResponseHelper::success(['planId' => $planId], '添加计划任务成功');
diff --git a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
index 4b7499bb..b47c4faa 100644
--- a/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
+++ b/Server/application/cunkebao/controller/plan/PostUpdateAddFriendPlanV1Controller.php
@@ -65,6 +65,10 @@ class PostUpdateAddFriendPlanV1Controller extends Controller
             // 其余参数归为sceneConf
             $sceneConf = $params;
             unset(
+                $sceneConf['id'],
+                $sceneConf['apiKey'],
+                $sceneConf['userId'],
+                $sceneConf['status'],
                 $sceneConf['planId'],
                 $sceneConf['name'],
                 $sceneConf['sceneId'],
@@ -72,10 +76,14 @@ class PostUpdateAddFriendPlanV1Controller extends Controller
                 $sceneConf['scenarioTags'],
                 $sceneConf['customTags'],
                 $sceneConf['device'],
+                $sceneConf['orderTableFileName'],
+                $sceneConf['userInfo'],
+                $sceneConf['textUrl'],
                 $sceneConf['remarkType'],
                 $sceneConf['greeting'],
                 $sceneConf['addFriendInterval'],
                 $sceneConf['startTime'],
+                $sceneConf['orderTableFile'],
                 $sceneConf['endTime']
             );
 
@@ -90,8 +98,8 @@ class PostUpdateAddFriendPlanV1Controller extends Controller
                 'updateTime'=> time(),
             ];
 
-            // 开启事务
-            Db::startTrans();
+
+    
             try {
                 // 更新数据
                 $result = Db::name('customer_acquisition_task')
@@ -102,8 +110,132 @@ class PostUpdateAddFriendPlanV1Controller extends Controller
                     throw new \Exception('更新计划失败');
                 }
 
-                // 提交事务
-                Db::commit();
+                     //订单
+                     if($params['sceneId'] == 2){
+                        if(!empty($params['orderTableFile'])){
+                            // 先下载到本地临时文件，再分析，最后删除
+                            $originPath = $params['orderTableFile'];
+                            $tmpFile = tempnam(sys_get_temp_dir(), 'order_');
+                            // 判断是否为远程文件
+                            if (preg_match('/^https?:\/\//i', $originPath)) {
+                                // 远程URL，下载到本地
+                                $fileContent = file_get_contents($originPath);
+                                if ($fileContent === false) {
+                                    exit('远程文件下载失败: ' . $originPath);
+                                }
+                                file_put_contents($tmpFile, $fileContent);
+                            } else {
+                                // 本地文件，直接copy
+                                if (!file_exists($originPath)) {
+                                    exit('文件不存在: ' . $originPath);
+                                }
+                                copy($originPath, $tmpFile);
+                            }
+                            // 解析临时文件
+                            $ext = strtolower(pathinfo($originPath, PATHINFO_EXTENSION));
+                            $rows = [];
+                            if (in_array($ext, ['xls', 'xlsx'])) {
+                                // 直接用composer自动加载的PHPExcel
+                                $excel = \PHPExcel_IOFactory::load($tmpFile);
+                                $sheet = $excel->getActiveSheet();
+                                $data = $sheet->toArray();
+                                if (count($data) > 1) {
+                                    array_shift($data); // 去掉表头
+                                }
+
+                                foreach ($data as $cols) {
+                                    $rows[] = [
+                                        'name'        => isset($cols[0]) ? trim($cols[0]) : '',
+                                        'phone'       => isset($cols[1]) ? trim($cols[1]) : '',
+                                        'wechat'      => isset($cols[2]) ? trim($cols[2]) : '',
+                                        'source'      => isset($cols[3]) ? trim($cols[3]) : '',
+                                        'orderAmount' => isset($cols[4]) ? trim($cols[4]) : '',
+                                        'orderDate'   => isset($cols[5]) ? trim($cols[5]) : '',
+                                    ];
+                                }
+                            } elseif ($ext === 'csv') {
+                                $content = file_get_contents($tmpFile);
+                                $lines = preg_split('/\r\n|\r|\n/', $content);
+                                if (count($lines) > 1) {
+                                    array_shift($lines); // 去掉表头
+                                    foreach ($lines as $line) {
+                                        if (trim($line) === '') continue;
+                                        $cols = str_getcsv($line);
+                                        if (count($cols) >= 6) {
+                                            $rows[] = [
+                                                'name'        => isset($cols[0]) ? trim($cols[0]) : '',
+                                                'phone'       => isset($cols[1]) ? trim($cols[1]) : '',
+                                                'wechat'      => isset($cols[2]) ? trim($cols[2]) : '',
+                                                'source'      => isset($cols[3]) ? trim($cols[3]) : '',
+                                                'orderAmount' => isset($cols[4]) ? trim($cols[4]) : '',
+                                                'orderDate'   => isset($cols[5]) ? trim($cols[5]) : '',
+                                            ];
+                                        }
+                                    }
+                                }
+                            } else {
+                                unlink($tmpFile);
+                                exit('暂不支持的文件类型: ' . $ext);
+                            }
+                            // 删除临时文件
+                            unlink($tmpFile);
+
+                            // 1000条为一组进行批量处理
+                            $batchSize = 1000;
+                            $totalRows = count($rows);
+                            
+                            for ($i = 0; $i < $totalRows; $i += $batchSize) {
+                                $batchRows = array_slice($rows, $i, $batchSize);
+                                
+                                if (!empty($batchRows)) {
+                                    // 1. 提取当前批次的phone
+                                    $phones = [];
+                                    foreach ($batchRows as $row) {
+                                        $phone = !empty($row['phone']) ? $row['phone'] : $row['wechat'];
+                                        if (!empty($phone)) {
+                                            $phones[] = $phone;
+                                        }
+                                    }
+                                    
+                                    // 2. 批量查询已存在的phone
+                                    $existingPhones = [];
+                                    if (!empty($phones)) {
+                                        $existing = Db::name('task_customer')
+                                            ->where('task_id', $params['planId'])
+                                            ->where('phone', 'in', $phones)
+                                            ->field('phone')
+                                            ->select();
+                                        $existingPhones = array_column($existing, 'phone');
+                                    }
+                                    
+                                    // 3. 过滤出新数据，批量插入
+                                    $newData = [];
+                                    foreach ($batchRows as $row) {
+                                        $phone = !empty($row['phone']) ? $row['phone'] : $row['wechat'];
+                                        if (!empty($phone) && !in_array($phone, $existingPhones)) {
+                                            $newData[] = [
+                                                'task_id' => $params['planId'],
+                                                'name' => $row['name'] ?? '',
+                                                'source' => $row['source'] ?? '',
+                                                'phone' => $phone,
+                                                'tags' => json_encode([], JSON_UNESCAPED_UNICODE),
+                                                'siteTags' => json_encode([], JSON_UNESCAPED_UNICODE),
+                                                'created_at' => time(),
+                                            ];
+                                        }
+                                    }
+                                    
+                                    // 4. 批量插入新数据
+                                    if (!empty($newData)) {
+                                        Db::name('task_customer')->insertAll($newData);
+                                    }
+                                }
+                            }
+                           
+                        }
+                    }
+
+
                 
                 return ResponseHelper::success(['planId' => $params['planId']], '更新计划任务成功');
                 
diff --git a/Server/application/cunkebao/controller/wechat/GetWechatsRelatedDeviceV1Controller.php b/Server/application/cunkebao/controller/wechat/GetWechatsRelatedDeviceV1Controller.php
index 92d20ce6..0d8d4583 100644
--- a/Server/application/cunkebao/controller/wechat/GetWechatsRelatedDeviceV1Controller.php
+++ b/Server/application/cunkebao/controller/wechat/GetWechatsRelatedDeviceV1Controller.php
@@ -9,6 +9,7 @@ use app\common\model\WechatAccount as WechatAccountModel;
 use app\common\model\WechatFriendShip as WechatFriendShipModel;
 use app\cunkebao\controller\BaseController;
 use library\ResponseHelper;
+use think\Db;
 use think\model\Collection as ResultCollection;
 
 /**
@@ -100,9 +101,12 @@ class GetWechatsRelatedDeviceV1Controller extends BaseController
      * @param string $wechatId
      * @return string
      */
-    protected function getWechatAliveText(string $wechatId): string
+    protected function getWechatAlive(string $wechatId): string
     {
-        return 1 ? '正常' : '异常';
+        $wechat_account = Db::table('s2_wechat_account')
+            ->where('wechatId', $wechatId)
+            ->value('wechatAlive');
+        return !empty($wechat_account) ? $wechat_account : 0;
     }
 
     /**
@@ -140,7 +144,9 @@ class GetWechatsRelatedDeviceV1Controller extends BaseController
                 $account->lastActive = $this->getWechatLastActiveTime($account->wechatId);
                 $account->statusText = $this->getWechatStatusText($account->wechatId);
                 $account->totalFriend = $this->getCountFriend($account->wechatId);
-                $account->wechatAliveText = $this->getWechatAliveText($account->wechatId);
+                $getWechatAlive = $this->getWechatAlive($account->wechatId);
+                $account->wechatAlive = $getWechatAlive;
+                $account->wechatAliveText = !empty($getWechatAlive) ? '正常' : '异常';
             }
 
             return $collection->toArray();
diff --git a/Server/application/job/WechatMomentsJob.php b/Server/application/job/WechatMomentsJob.php
index 9042783b..88d380d2 100644
--- a/Server/application/job/WechatMomentsJob.php
+++ b/Server/application/job/WechatMomentsJob.php
@@ -24,7 +24,6 @@ class WechatMomentsJob
             $toAccountId = Db::name('users')->where('account',$username)->value('s2_accountId');
         }else{
             Log::error("没有账号配置");
-            Cache::rm($queueLockKey);
             return;
         }
 
@@ -53,10 +52,20 @@ class WechatMomentsJob
                     $webSocket->getMoments(['wechatFriendId' => $friend['friendId'], 'wechatAccountId' => $friend['wechatAccountId']]);
                     
                     // 处理完毕切换回原账号
-                    $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                    $res = $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                    $res = json_decode($res, true);
+                    if ($res == '无效路径或登录状态失效'){
+                        artificialAllotWechatFriend($friend);
+                    }
+
+
                 } catch (\Exception $e) {
                     // 发生异常时也要切换回原账号
-                    $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                    $res = $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                    $res = json_decode($res, true);
+                    if ($res == '无效路径或登录状态失效'){
+                        artificialAllotWechatFriend($friend);
+                    }
                     Log::error("采集好友 {$friend['id']} 的朋友圈失败：" . $e->getMessage());
                     continue;
                 }
diff --git a/Server/application/job/WorkbenchAutoLikeJob.php b/Server/application/job/WorkbenchAutoLikeJob.php
index 351b6b6b..b0f489de 100644
--- a/Server/application/job/WorkbenchAutoLikeJob.php
+++ b/Server/application/job/WorkbenchAutoLikeJob.php
@@ -219,7 +219,7 @@ class WorkbenchAutoLikeJob
             // 执行切换好友命令
             $automaticAssign = new AutomaticAssign();
             $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $toAccountId], true);
-            
+
             // 创建WebSocket链接
             $webSocket = new WebSocketController(['userName' => $username, 'password' => $password, 'accountId' => $toAccountId]);
             
@@ -234,7 +234,12 @@ class WorkbenchAutoLikeJob
             
             if (empty($moments) || count($moments) == 0) {
                  // 处理完毕切换回原账号
-                $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                $res = $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+                $res = json_decode($res, true);
+                if($res == '无效路径或登录状态失效'){
+                    artificialAllotWechatFriend($friend);
+                }
+
                 Log::info("好友 {$friend['friendId']} 没有需要点赞的朋友圈");
                 return;
             }
@@ -258,11 +263,19 @@ class WorkbenchAutoLikeJob
             }
 
             // 处理完毕切换回原账号
-            $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+            $res = $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+            $res = json_decode($res, true);
+            if($res == '无效路径或登录状态失效'){
+                artificialAllotWechatFriend($friend);
+            }
         } catch (\Exception $e) {
             // 异常情况下也要确保切换回原账号
             $automaticAssign = new AutomaticAssign();
-            $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+            $res = $automaticAssign->allotWechatFriend(['wechatFriendId' => $friend['friendId'], 'toAccountId' => $friend['accountId']], true);
+            $res = json_decode($res, true);
+            if($res == '无效路径或登录状态失效'){
+                artificialAllotWechatFriend($friend);
+            }
             Log::error("处理好友 {$friend['friendId']} 朋友圈失败异常: " . $e->getMessage());
         }
     }
diff --git a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
index e1cc561e..cd164828 100644
--- a/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
+++ b/Server/extend/WeChatDeviceApi/Adapters/ChuKeBao/Adapter.php
@@ -153,25 +153,37 @@ class Adapter implements WeChatServiceInterface
 
     public function handleCustomerTaskWithStatusIsNew(int $current_worker_id, int $process_count_for_status_0)
     {
-        $tasks = Db::name('task_customer')
-            ->where('status', 0)
-            ->whereRaw("id % $process_count_for_status_0 = {$current_worker_id}")
-            ->limit(50)
-            ->order('id DESC')
+
+        $task = Db::name('customer_acquisition_task')
+            ->where(['status' => 1,'deleteTime' => 0])
             ->select();
 
+        if (empty($task)) {
+            return false;
+        }
 
-        if ($tasks) {
+        $taskData = [];
+        foreach ($task as $item) {
+            $tasks = Db::name('task_customer')
+                ->where(['status'=> 0,'task_id'=>$item['id']])
+                ->whereRaw("id % $process_count_for_status_0 = {$current_worker_id}")
+                ->order('id DESC')
+                ->limit(5)
+                ->select();
+            $taskData = array_merge($taskData, $tasks);
+        }
 
-            foreach ($tasks as $task) {
 
+        if ($taskData) {
+
+            foreach ($taskData as $task) {
                 $task_id = $task['task_id'];
-
                 $task_info = $this->getCustomerAcquisitionTask($task_id);
+
                 if (empty($task_info['status']) || empty($task_info['reqConf']) || empty($task_info['reqConf']['device'])) {
                     continue;
                 }
-
+                //筛选出设备在线微信在线
                 $wechatIdAccountIdMap = $this->getWeChatIdsAccountIdsMapByDeviceIds($task_info['reqConf']['device']);
 
                 if (empty($wechatIdAccountIdMap)) {
@@ -235,8 +247,10 @@ class Adapter implements WeChatServiceInterface
     {
 
         $tasks = Db::name('task_customer')
-            ->whereIn('status', [1,3])
+            ->whereIn('status', [1,2])
+            ->where('updated_at', '>=', (time() - 86400 * 3))
             ->limit(50)
+            ->order('updated_at DESC')
             ->select();
 
         if (empty($tasks)) {
@@ -272,15 +286,14 @@ class Adapter implements WeChatServiceInterface
 
 
 
-
             if ($passedWeChatId && !empty($task_info['msgConf'])) {
+
                 Db::name('task_customer')
                     ->where('id', $task['id'])
                     ->update(['status' => 4, 'updated_at' => time()]);
 
                 $wechatFriendRecord = $this->getWeChatAccoutIdAndFriendIdByWeChatIdAndFriendPhone($passedWeChatId, $task['phone']);
                 $msgConf = is_string($task_info['msgConf']) ? json_decode($task_info['msgConf'], 1) : $task_info['msgConf'];
-
                 $wechatFriendRecord && $this->sendMsgToFriend($wechatFriendRecord['id'], $wechatFriendRecord['wechatAccountId'], $msgConf);
 
             } else {
@@ -451,6 +464,7 @@ class Adapter implements WeChatServiceInterface
         try {
             $id = Db::table('s2_wechat_friend')
                 ->where('ownerWechatId', $wxId)
+                ->where(['isPassed' => 1,'isDeleted' => 0])
                 ->where('phone|alias|wechatId', 'like', $phone . '%')
                 ->order('createTime', 'desc')
                 ->value('id');
@@ -598,6 +612,11 @@ class Adapter implements WeChatServiceInterface
         if (empty($wechatId)) {
             return false;
         }
+        //强制请求添加好友的列表
+        $friendController = new FriendTaskController();
+        $friendController->getlist(0,50);
+
+
 
         $record = $this->getLatestFriendTask($wechatId);
         if (empty($record)) {
@@ -676,6 +695,7 @@ class Adapter implements WeChatServiceInterface
         }
         $records = Db::table('s2_wechat_account')
             ->where('deviceAlive', 1)
+            ->where('wechatAlive', 1)
             ->where('currentDeviceId', 'in', $deviceIds)
             ->field('id,wechatId')
             ->column('id,wechatId');