ソースを参照

fix: 走势图总金额改为订单实收金额,月统计隐藏汇总卡片

Co-Authored-By: Claude <noreply@anthropic.com>
skyline 1 ヶ月 前
コミット
d39420198a

+ 3 - 3
admin-h5/src/pages/statistics/index.vue

@@ -38,11 +38,11 @@
       <button class="search-btn" @click="handleSearch">查询</button>
     </view>
 
-    <!-- 汇总卡片 -->
-    <view class="summary-range" v-if="list.length > 0">
+    <!-- 汇总卡片(仅日统计) -->
+    <view class="summary-range" v-if="activeTab === 0 && list.length > 0">
       <text class="range-text">统计范围:{{ summaryDateRange }}</text>
     </view>
-    <view class="summary-section" v-if="list.length > 0">
+    <view class="summary-section" v-if="activeTab === 0 && list.length > 0">
       <view class="summary-card">
         <text class="summary-label">总收入</text>
         <text class="summary-value highlight">¥{{ formatAmount(summary.totalIncome) }}</text>

+ 5 - 5
admin-web/src/views/admin/index.vue

@@ -45,7 +45,7 @@
 
 
             <div class="trend-summary">
-              总收金额:
+              总订单实收金额:
               <el-tag type="success">{{ u.fmt.fmtMoney(state.homeOneExtra.totalIncome||0) }}元</el-tag>
               总订单数量:
               <el-tag type="danger">{{ state.homeOneExtra.totalWashOrders||0 }}笔</el-tag>
@@ -228,13 +228,13 @@ const initLineChart = (dataList: Array<any>) => {
       trigger: 'axis',
       formatter: (params: any) => {
         const bar = params.find((p: any) => p.seriesName === '洗车量');
-        const line = params.find((p: any) => p.seriesName === '金额');
+        const line = params.find((p: any) => p.seriesName === '订单实收金额');
         const barVal = bar ? `${bar.value} 次` : '';
         const lineVal = line ? `¥${line.value}` : '';
         return `${params[0].axisValue}<br/>${barVal}<br/>${lineVal}`;
       }
     },
-    legend: {data: ['洗车量','金额',], right: 20},
+    legend: {data: ['洗车量','订单实收金额',], right: 20},
     xAxis: {
       data: xAxis,
       // data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
@@ -271,13 +271,13 @@ const initLineChart = (dataList: Array<any>) => {
         },
       },
       {
-        name: '金额',
+        name: '订单实收金额',
         type: 'line',
         symbolSize: 6,
         symbol: 'circle',
         smooth: true,
         yAxisIndex: 1,
-        data: dataList.map(k => (k.totalAmount / 100).toFixed(2)),
+        data: dataList.map(k => (k.amountReceived / 100).toFixed(2)),
         lineStyle: {color: '#3770ff'},
         itemStyle: {color: '#3770ff', borderColor: '#3770ff'},
         areaStyle: {