更新 dashboard

src/api/dashboard.js

@@ -0,0 +1,31 @@
+import request from '../utils/request';
+
+/**
+ * 获取运营商汇总信息
+ * @returns {Promise} - 返回汇总数据
+ */
+export function getPartnerSummary() {
+  return request({
+    url: '/api/partner/summary',
+    method: 'get'
+  });
+}
+
+/**
+ * 获取运营商管理的小区列表
+ * @param {Object} params - 查询参数
+ * @param {number} params.page - 页码
+ * @param {number} params.pageSize - 每页条数
+ * @returns {Promise} - 返回小区列表数据
+ */
+export function getPartnerCommunityList(params) {
+  return request({
+    url: '/api/partner/community_list',
+    method: 'get',
+    params: {
+      skip: (params.page - 1) * params.pageSize,
+      limit: params.pageSize,
+      ...params
+    }
+  });
+} 

src/views/Dashboard.vue

@@ -7,148 +7,128 @@
           <template #title>
             <span><home-outlined /> 运营小区数</span>
           </template>
-          <div class="card-content">
+          <div class="card-content community-content">
-            <h2>{{ dashboardData.communityCount }}</h2>
+            <h2 class="community-data">{{ summaryData.community_count || 0 }}</h2>
-            <p>本月新增 <a-tag color="success">+{{ dashboardData.newCommunityCount }}</a-tag></p>
           </div>
         </a-card>
       </a-col>
       <a-col :span="8" :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
         <a-card class="card-orders">
           <template #title>
-            <span><shopping-outlined /> 总配送订单数</span>
+            <span><shopping-outlined /> 今日订单数</span>
           </template>
           <div class="card-content">
-            <h2>{{ dashboardData.totalOrders.toLocaleString() }}</h2>
+            <h2 class="orders-data">{{ summaryData.today_order_count || 0 }}</h2>
+            <p v-if="summaryData.yesterday_order_count > 0" class="comparison-rate">
+              同比昨日
+              <a-tag :color="getComparisonColor(summaryData.today_order_count, summaryData.yesterday_order_count)">
+                {{ getComparisonText(summaryData.today_order_count, summaryData.yesterday_order_count) }}
+              </a-tag>
+            </p>
             <div class="comparison-data">
-              <div>
-                <span>今日：</span>
-                <span class="highlight">{{ dashboardData.todayOrders }}</span>
-              </div>
               <div>
                 <span>昨日：</span>
-                <span>{{ dashboardData.yesterdayOrders }}</span>
+                <span>{{ summaryData.yesterday_order_count || 0 }}</span>
+              </div>
+              <div>
+                <span>总计：</span>
+                <span>{{ summaryData.total_order_count || 0 }}</span>
               </div>
             </div>
           </div>
         </a-card>
       </a-col>
-      <a-col :span="8" :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
-        <a-card class="card-users">
-          <template #title>
-            <span><user-outlined /> 总用户数</span>
-          </template>
-          <div class="card-content">
-            <h2>{{ dashboardData.totalUsers.toLocaleString() }}</h2>
-            <div class="comparison-data">
-              <div>
-                <span>今日新增：</span>
-                <span class="highlight">{{ dashboardData.todayNewUsers }}</span>
-              </div>
-              <div>
-                <span>昨日新增：</span>
-                <span>{{ dashboardData.yesterdayNewUsers }}</span>
-              </div>
-            </div>
-          </div>
-        </a-card>
-      </a-col>
-    </a-row>
-
-    <a-row :gutter="16" style="margin-top: 16px">
       <a-col :span="8" :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
         <a-card class="card-sales">
           <template #title>
-            <span><dollar-outlined /> 累计销售金额</span>
+            <span><dollar-outlined /> 今日销售金额</span>
           </template>
           <div class="card-content">
-            <h2>¥ {{ dashboardData.totalSales.toLocaleString() }}</h2>
+            <h2 class="sales-data">¥ {{ formatAmount(summaryData.today_order_amount) }}</h2>
+            <p v-if="summaryData.yesterday_order_amount > 0" class="comparison-rate">
+              同比昨日
+              <a-tag :color="getComparisonColor(summaryData.today_order_amount, summaryData.yesterday_order_amount)">
+                {{ getComparisonText(summaryData.today_order_amount, summaryData.yesterday_order_amount) }}
+              </a-tag>
+            </p>
             <div class="comparison-data">
-              <div>
-                <span>今日：</span>
-                <span class="highlight">¥ {{ dashboardData.todaySales.toLocaleString() }}</span>
-              </div>
               <div>
                 <span>昨日：</span>
-                <span>¥ {{ dashboardData.yesterdaySales.toLocaleString() }}</span>
+                <span>¥ {{ formatAmount(summaryData.yesterday_order_amount) }}</span>
-              </div>
-            </div>
-          </div>
-        </a-card>
-      </a-col>
-      <a-col :span="8" :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
-        <a-card class="card-profit">
-          <template #title>
-            <span><wallet-outlined /> 累计分润金额</span>
-          </template>
-          <div class="card-content">
-            <h2>¥ {{ dashboardData.totalProfit.toLocaleString() }}</h2>
-            <div class="comparison-data">
-              <div>
-                <span>今日：</span>
-                <span class="highlight">¥ {{ dashboardData.todayProfit.toLocaleString() }}</span>
               </div>
               <div>
-                <span>昨日：</span>
+                <span>总计：</span>
-                <span>¥ {{ dashboardData.yesterdayProfit.toLocaleString() }}</span>
+                <span>¥ {{ formatAmount(summaryData.total_order_amount) }}</span>
-              </div>
-            </div>
-          </div>
-        </a-card>
-      </a-col>
-      <a-col :span="8" :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
-        <a-card class="card-conversion">
-          <template #title>
-            <span><rise-outlined /> 订单转化率</span>
-          </template>
-          <div class="card-content">
-            <h2>{{ dashboardData.conversionRate }}%</h2>
-            <p>较上周 <a-tag :color="dashboardData.conversionRateChange > 0 ? 'success' : 'error'">{{ dashboardData.conversionRateChange > 0 ? '+' : '' }}{{ dashboardData.conversionRateChange }}%</a-tag></p>
-          </div>
-        </a-card>
-      </a-col>
-    </a-row>
-
-    <a-row :gutter="16" style="margin-top: 16px">
-      <a-col :span="24">
-        <a-card title="每日分润趋势" class="card-chart">
-          <div style="height: 350px; padding: 0 20px;">
-            <a-row style="margin-bottom: 20px;">
-              <a-col :span="24">
-                <div class="chart-legend">
-                  <div class="chart-legend-item">
-                    <div class="chart-legend-color" style="background-color: #1890ff;"></div>
-                    <span>分润金额</span>
-                  </div>
-                </div>
-              </a-col>
-            </a-row>
-            <div class="chart-container">
-              <div v-for="(item, index) in dashboardData.dailyProfitData" :key="index" class="chart-bar-item">
-                <div class="chart-bar-value">¥{{ item.value }}</div>
-                <div class="chart-bar">
-                  <div class="chart-bar-inner" :style="{ height: (item.value / maxProfitValue * 100) + '%' }"></div>
-                </div>
-                <div class="chart-bar-label">{{ item.date }}</div>
               </div>
             </div>
           </div>
         </a-card>
       </a-col>
     </a-row>
+
+    <!-- 小区列表 -->
+    <a-card title="管理小区列表" style="margin-top: 16px">
+      <template #extra>
+        <a-button type="primary" @click="refreshData">
+          <reload-outlined style="color: #fff;" />
+          刷新
+        </a-button>
+      </template>
+      <a-table
+        :dataSource="communityList"
+        :loading="loading"
+        :pagination="{
+          total: total,
+          current: currentPage,
+          pageSize: pageSize,
+          showTotal: total => `共 ${total} 条记录`,
+          showSizeChanger: true,
+          pageSizeOptions: ['10', '20', '50'],
+          onChange: handlePageChange,
+          onShowSizeChange: handlePageSizeChange
+        }"
+        rowKey="community_id"
+      >
+        <a-table-column title="小区ID" dataIndex="community_id" key="community_id" width="100px" />
+        <a-table-column title="小区名称" dataIndex="community_name" key="community_name" />
+        <a-table-column title="今日订单数" key="today_order_count">
+          <template #default="{ text, record }">
+            {{ record.today_order_count || 0 }}
+          </template>
+        </a-table-column>
+        <a-table-column title="昨日订单数" key="yesterday_order_count">
+          <template #default="{ text, record }">
+            {{ record.yesterday_order_count || 0 }}
+          </template>
+        </a-table-column>
+        <a-table-column title="今日收入" key="today_income">
+          <template #default="{ text, record }">
+            ¥ {{ formatAmount(record.today_income) }}
+          </template>
+        </a-table-column>
+        <a-table-column title="昨日收入" key="yesterday_income">
+          <template #default="{ text, record }">
+            ¥ {{ formatAmount(record.yesterday_income) }}
+          </template>
+        </a-table-column>
+      </a-table>
+    </a-card>
   </div>
 </template>
 
 <script>
-import { ref, reactive, onMounted, computed } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
+import { message } from 'ant-design-vue';
 import { 
   UserOutlined, 
   ShoppingOutlined, 
   DollarOutlined, 
   HomeOutlined,
   WalletOutlined,
-  RiseOutlined
+  RiseOutlined,
+  ReloadOutlined
 } from '@ant-design/icons-vue';
+import { getPartnerSummary, getPartnerCommunityList } from '../api/dashboard';
 
 export default {
   name: 'Dashboard',
@@ -158,66 +138,106 @@ export default {
     DollarOutlined,
     HomeOutlined,
     WalletOutlined,
-    RiseOutlined
+    RiseOutlined,
+    ReloadOutlined
   },
   setup() {
-    // 仪表盘数据
+    // 汇总数据
-    const dashboardData = reactive({
+    const summaryData = ref({});
-      // 运营小区数
+    // 小区列表
-      communityCount: 68,
+    const communityList = ref([]);
-      newCommunityCount: 5,
+    // 加载状态
-      
+    const loading = ref(false);
-      // 总配送订单数
+    // 分页数据
-      totalOrders: 24689,
+    const currentPage = ref(1);
-      todayOrders: 386,
+    const pageSize = ref(10);
-      yesterdayOrders: 412,
+    const total = ref(0);
-      
-      // 总用户数
-      totalUsers: 8756,
-      todayNewUsers: 42,
-      yesterdayNewUsers: 38,
-      
-      // 累计销售金额
-      totalSales: 1268950,
-      todaySales: 28650,
-      yesterdaySales: 31280,
-      
-      // 累计分润金额
-      totalProfit: 253790,
-      todayProfit: 5730,
-      yesterdayProfit: 6256,
-      
-      // 订单转化率
-      conversionRate: 32.6,
-      conversionRateChange: 2.8,
-      
-      // 每日分润数据
-      dailyProfitData: [
-        { date: '6/1', value: 4280 },
-        { date: '6/2', value: 5120 },
-        { date: '6/3', value: 4830 },
-        { date: '6/4', value: 5680 },
-        { date: '6/5', value: 6120 },
-        { date: '6/6', value: 5890 },
-        { date: '6/7', value: 4950 },
-        { date: '6/8', value: 5230 },
-        { date: '6/9', value: 5780 },
-        { date: '6/10', value: 6050 },
-        { date: '6/11', value: 5840 },
-        { date: '6/12', value: 5320 },
-        { date: '6/13', value: 6256 },
-        { date: '6/14', value: 5730 }
-      ]
-    });
 
-    // 计算最大分润值，用于图表显示
+    // 获取汇总数据
-    const maxProfitValue = computed(() => {
+    const fetchSummaryData = async () => {
-      return Math.max(...dashboardData.dailyProfitData.map(item => item.value)) * 1.1;
+      try {
+        const data = await getPartnerSummary();
+        summaryData.value = data || {};
+      } catch (error) {
+        console.error('获取汇总数据失败:', error);
+        message.error('获取汇总数据失败');
+      }
+    };
+
+    // 获取小区列表
+    const fetchCommunityList = async () => {
+      loading.value = true;
+      try {
+        const params = {
+          page: currentPage.value,
+          pageSize: pageSize.value
+        };
+        const response = await getPartnerCommunityList(params);
+        communityList.value = response.items || [];
+        total.value = response.total || 0;
+      } catch (error) {
+        console.error('获取小区列表失败:', error);
+        message.error('获取小区列表失败');
+      } finally {
+        loading.value = false;
+      }
+    };
+
+    // 处理页码变化
+    const handlePageChange = (page, size) => {
+      currentPage.value = page;
+      fetchCommunityList();
+    };
+
+    // 处理每页条数变化
+    const handlePageSizeChange = (current, size) => {
+      currentPage.value = 1;
+      pageSize.value = size;
+      fetchCommunityList();
+    };
+
+    // 刷新数据
+    const refreshData = () => {
+      fetchSummaryData();
+      fetchCommunityList();
+    };
+
+    // 计算同比增长率
+    const getComparisonText = (today, yesterday) => {
+      if (!yesterday) return '0%';
+      const rate = ((today - yesterday) / yesterday * 100).toFixed(1);
+      return rate > 0 ? `+${rate}%` : `${rate}%`;
+    };
+
+    // 获取同比增长率的颜色
+    const getComparisonColor = (today, yesterday) => {
+      if (!yesterday) return 'default';
+      return today >= yesterday ? 'success' : 'error';
+    };
+
+    // 格式化金额，保留2位小数
+    const formatAmount = (amount) => {
+      if (amount === undefined || amount === null) return '0.00';
+      return Number(amount).toFixed(2);
+    };
+
+    onMounted(() => {
+      refreshData();
     });
 
     return {
-      dashboardData,
+      summaryData,
-      maxProfitValue
+      communityList,
+      loading,
+      currentPage,
+      pageSize,
+      total,
+      refreshData,
+      handlePageChange,
+      handlePageSizeChange,
+      getComparisonText,
+      getComparisonColor,
+      formatAmount
     };
   }
 };
@@ -230,6 +250,9 @@ export default {
 
 .card-content {
   text-align: center;
+  min-height: 100px;
+  display: flex;
+  flex-direction: column;
 }
 
 .card-content h2 {
@@ -251,161 +274,58 @@ export default {
 }
 
 .comparison-data .highlight {
+  color: #1890ff;
   font-weight: 500;
 }
 
-:deep(.ant-card) {
+.card-community, .card-orders, .card-sales {
-  border-radius: 8px;
+  height: 100%;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-  transition: all 0.3s;
-  margin-bottom: 16px;
 }
 
-:deep(.ant-card:hover) {
-  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.1);
-  transform: translateY(-2px);
-}
-
-:deep(.ant-card-head) {
-  border-bottom: 1px solid #f0f0f0;
-}
-
-:deep(.ant-card-head-title) {
-  font-weight: 600;
-}
-
-/* 卡片颜色主题 */
 .card-community {
-  border-top: 3px solid #722ed1;
+  border-top: 3px solid #52c41a;
-}
-.card-community h2, .card-community :deep(.anticon) {
-  color: #722ed1;
 }
 
 .card-orders {
   border-top: 3px solid #1890ff;
 }
-.card-orders h2, .card-orders :deep(.anticon) {
-  color: #1890ff;
-}
-
-.card-users {
-  border-top: 3px solid #52c41a;
-}
-.card-users h2, .card-users :deep(.anticon) {
-  color: #52c41a;
-}
 
 .card-sales {
   border-top: 3px solid #fa8c16;
 }
-.card-sales h2, .card-sales :deep(.anticon) {
-  color: #fa8c16;
-}
 
-.card-profit {
+.today-data {
-  border-top: 3px solid #eb2f96;
+  font-size: 32px;
-}
-.card-profit h2, .card-profit :deep(.anticon) {
-  color: #eb2f96;
-}
-
-.card-conversion {
-  border-top: 3px solid #13c2c2;
-}
-.card-conversion h2, .card-conversion :deep(.anticon) {
-  color: #13c2c2;
-}
-
-.card-chart {
-  border-top: 3px solid #1890ff;
-}
-.card-chart :deep(.ant-card-head-title) {
-  color: #1890ff;
-}
-
-/* 图表样式 */
-.chart-container {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-end;
-  height: 250px;
-}
-
-.chart-bar-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 100%;
-}
-
-.chart-bar-value {
-  font-size: 12px;
-  color: #666;
   margin-bottom: 4px;
-  height: 20px;
 }
 
-.chart-bar {
+.orders-data {
-  width: 24px;
+  font-size: 32px;
-  height: 200px;
+  color: #1890ff;
-  background-color: #f5f5f5;
+  margin-bottom: 4px;
-  border-radius: 4px;
-  position: relative;
-  overflow: hidden;
 }
 
-.chart-bar-inner {
+.sales-data {
-  position: absolute;
+  font-size: 32px;
-  bottom: 0;
+  color: #fa8c16;
-  left: 0;
+  margin-bottom: 4px;
-  width: 100%;
-  background-color: #1890ff;
-  border-radius: 4px;
-  transition: height 0.3s ease;
 }
 
-.chart-bar-label {
+.comparison-rate {
-  margin-top: 8px;
+  margin-bottom: 12px;
-  font-size: 12px;
+  font-size: 14px;
-  color: #666;
+  color: rgba(0, 0, 0, 0.65);
 }
 
-.chart-legend {
+.community-content {
-  display: flex;
+  justify-content: center;
-  justify-content: flex-end;
-}
-
-.chart-legend-item {
-  display: flex;
   align-items: center;
-  margin-left: 16px;
+  flex-grow: 1;
 }
 
-.chart-legend-color {
+.community-data {
-  width: 12px;
+  font-size: 48px;
-  height: 12px;
+  color: #52c41a;
-  margin-right: 8px;
+  margin: 0;
-  border-radius: 2px;
-}
-
-@media (max-width: 768px) {
-  .comparison-data {
-    flex-direction: column;
-    align-items: center;
-  }
-  
-  .comparison-data div {
-    margin-bottom: 4px;
-  }
-  
-  .chart-container {
-    overflow-x: auto;
-    padding-bottom: 10px;
-  }
-  
-  .chart-bar-item {
-    min-width: 40px;
-  }
 }
 </style>