From 2ee6e3f24ce50efbe7302b2f1358eacfc718cbbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=B0=B8=E5=B9=B3?= <xuyongping@szwycity.cn>
Date: Thu, 3 Jul 2025 17:11:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E4=BC=98=E5=8C=96=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cunkebao/app/scenarios/[channel]/devices/page.tsx     |  2 +-
 Cunkebao/app/scenarios/douyin/page.tsx                |  2 +-
 Cunkebao/app/scenarios/haibao/edit/[id]/page.tsx      |  8 ++++----
 Cunkebao/app/scenarios/payment/[id]/payments/page.tsx |  4 ++--
 Cunkebao/app/scenarios/payment/stats/page.tsx         | 10 +++++-----
 Cunkebao/app/scenarios/phone/page.tsx                 |  2 +-
 Cunkebao/app/workspace/ai-analyzer/create/page.tsx    |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cunkebao/app/scenarios/[channel]/devices/page.tsx b/Cunkebao/app/scenarios/[channel]/devices/page.tsx
index 735bce48..cc0bcf43 100644
--- a/Cunkebao/app/scenarios/[channel]/devices/page.tsx
+++ b/Cunkebao/app/scenarios/[channel]/devices/page.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from "react"
 import { useRouter } from "next/navigation"
-import { DeviceSelector } from "@/app/components/common/DeviceSelector"
+import { DeviceSelector } from "@/app/components/DeviceSelector"
 import { Button } from "@/components/ui/button"
 import { ChevronLeft } from "lucide-react"
 
diff --git a/Cunkebao/app/scenarios/douyin/page.tsx b/Cunkebao/app/scenarios/douyin/page.tsx
index 36c77575..51759694 100644
--- a/Cunkebao/app/scenarios/douyin/page.tsx
+++ b/Cunkebao/app/scenarios/douyin/page.tsx
@@ -5,7 +5,7 @@ import { ChevronLeft, Plus } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { useRouter } from "next/navigation"
 import { toast } from "@/components/ui/use-toast"
-import { ExpandableAcquisitionCard } from "@/components/acquisition/ExpandableAcquisitionCard"
+import { ExpandableAcquisitionCard } from "@/app/components/acquisition/ExpandableAcquisitionCard"
 import Link from "next/link"
 import { DeviceTreeChart } from "@/app/components/acquisition/DeviceTreeChart"
 
diff --git a/Cunkebao/app/scenarios/haibao/edit/[id]/page.tsx b/Cunkebao/app/scenarios/haibao/edit/[id]/page.tsx
index 70ff8955..c7fd1db6 100644
--- a/Cunkebao/app/scenarios/haibao/edit/[id]/page.tsx
+++ b/Cunkebao/app/scenarios/haibao/edit/[id]/page.tsx
@@ -7,9 +7,9 @@ import { Button } from "@/components/ui/button"
 import { Card } from "@/components/ui/card"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import { toast } from "@/components/ui/use-toast"
-import BasicSettings from "@/app/scenarios/new/steps/BasicSettings"
-import DeviceSelection from "@/app/scenarios/new/steps/DeviceSelection"
-import MessageSettings from "@/app/scenarios/new/steps/MessageSettings"
+import { BasicSettings } from "@/app/scenarios/new/steps/BasicSettings"
+import { DeviceSelector } from "@/app/components/DeviceSelector"
+import { MessageSettings } from "@/app/scenarios/new/steps/MessageSettings"
 import BottomNav from "@/app/components/BottomNav"
 
 export default function EditScenarioPage({ params }: { params: { id: string } }) {
@@ -103,7 +103,7 @@ export default function EditScenarioPage({ params }: { params: { id: string } })
             </TabsContent>
 
             <TabsContent value="device">
-              <DeviceSelection
+              <DeviceSelector
                 formData={formData}
                 updateFormData={updateFormData}
                 onNext={() => setActiveTab("message")}
diff --git a/Cunkebao/app/scenarios/payment/[id]/payments/page.tsx b/Cunkebao/app/scenarios/payment/[id]/payments/page.tsx
index dc7c5748..432613a3 100644
--- a/Cunkebao/app/scenarios/payment/[id]/payments/page.tsx
+++ b/Cunkebao/app/scenarios/payment/[id]/payments/page.tsx
@@ -8,7 +8,7 @@ import { Card, CardContent } from "@/components/ui/card"
 import { Input } from "@/components/ui/input"
 import { Badge } from "@/components/ui/badge"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
-import { DatePickerWithRange } from "@/components/ui/date-picker"
+import { DateRangePicker } from "@/components/ui/date-range-picker"
 import {
   Pagination,
   PaginationContent,
@@ -131,7 +131,7 @@ export default function PaymentRecordsPage({ params }: { params: { id: string }
 
               <div>
                 <label className="text-sm font-medium mb-1.5 block">支付时间</label>
-                <DatePickerWithRange />
+                <DateRangePicker />
               </div>
 
               <div className="flex gap-2">
diff --git a/Cunkebao/app/scenarios/payment/stats/page.tsx b/Cunkebao/app/scenarios/payment/stats/page.tsx
index 23763d5d..b0f6fcc6 100644
--- a/Cunkebao/app/scenarios/payment/stats/page.tsx
+++ b/Cunkebao/app/scenarios/payment/stats/page.tsx
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button"
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs"
-import { LineChartComponent, BarChartComponent, PieChartComponent } from "@/app/components/common/Charts"
+import { LineChart, BarChart, TrendChart } from "@/app/components/Charts"
 import { toast } from "@/components/ui/use-toast"
 
 export default function PaymentStatsPage() {
@@ -153,7 +153,7 @@ export default function PaymentStatsPage() {
           </TabsList>
 
           <TabsContent value="overview" className="space-y-4">
-            <LineChartComponent
+            <LineChart
               title="支付趋势"
               description="本周支付笔数和金额趋势"
               data={lineChartData}
@@ -161,7 +161,7 @@ export default function PaymentStatsPage() {
               height={250}
             />
 
-            <BarChartComponent
+            <BarChart
               title="付款码对比"
               description="各付款码支付情况对比"
               data={barChartData}
@@ -176,7 +176,7 @@ export default function PaymentStatsPage() {
                 <CardTitle>支付趋势分析</CardTitle>
               </CardHeader>
               <CardContent>
-                <LineChartComponent data={lineChartData} config={lineChartConfig} height={300} />
+                <LineChart data={lineChartData} config={lineChartConfig} height={300} />
               </CardContent>
             </Card>
 
@@ -194,7 +194,7 @@ export default function PaymentStatsPage() {
           </TabsContent>
 
           <TabsContent value="distribution" className="space-y-4">
-            <PieChartComponent
+            <LineChart
               title="支付方式分布"
               description="各支付方式占比"
               data={pieChartData}
diff --git a/Cunkebao/app/scenarios/phone/page.tsx b/Cunkebao/app/scenarios/phone/page.tsx
index f31fb323..5100488d 100644
--- a/Cunkebao/app/scenarios/phone/page.tsx
+++ b/Cunkebao/app/scenarios/phone/page.tsx
@@ -5,7 +5,7 @@ import { ChevronLeft, Plus } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { useRouter } from "next/navigation"
 import { toast } from "@/components/ui/use-toast"
-import { ExpandableAcquisitionCard } from "@/components/acquisition/ExpandableAcquisitionCard"
+import { ExpandableAcquisitionCard } from "@/app/components/acquisition/ExpandableAcquisitionCard"
 import Link from "next/link"
 import { DeviceTreeChart } from "@/app/components/acquisition/DeviceTreeChart"
 
diff --git a/Cunkebao/app/workspace/ai-analyzer/create/page.tsx b/Cunkebao/app/workspace/ai-analyzer/create/page.tsx
index 59836824..c7229c05 100644
--- a/Cunkebao/app/workspace/ai-analyzer/create/page.tsx
+++ b/Cunkebao/app/workspace/ai-analyzer/create/page.tsx
@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation"
 import { BasicSettings } from "./components/basic-settings"
 import { TargetSelection } from "./components/target-selection"
 import { Card, CardContent } from "@/components/ui/card"
-import { Steps, Step } from "@/components/ui/steps"
+import { Steps, Step } from "@/app/components/ui/steps"
 import { useToast } from "@/components/ui/use-toast"
 
 export default function CreateAnalyzerPage() {