Merge pull request 'Feature/0723/zr' (#12) from feature/0723/ZR into release/0.01

Reviewed-on: #12

package.json

@@ -54,7 +54,7 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-vue": "^9.0.0",
     "husky": "^9.1.7",
-    "jsdom": "^30.0.1",
+    "jsdom": "^19.0.0",
     "less": "^4.6.4",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",

src/pages/events/list/components/EventRegulationModal.module.less

@@ -25,6 +25,8 @@
     padding: 12px 16px;
     border-radius: 4px;
     border: 1px solid #f0f0f0;
+    max-height: 360px;
+    overflow-y: auto;
   }
 
   .imageGrid {

src/pages/events/list/index.tsx

@@ -89,7 +89,7 @@ export default defineComponent({
     const renderAction = (record: any) => {
       const status = record.status;
 
-      if (status === '0' || status === '1') {
+      if (['0', '1', '2'].includes(status)) {
         return (
           <Space>
             <Button type="link" size="small" onClick={() => openDetailModal(record)}>

src/pages/finance/reports/index.tsx

@@ -180,7 +180,7 @@ export default defineComponent({
         },
         {
           key: 'totalBalance',
-          label: '平台余额（所有用户余额总和）',
+          label: '平台余额（所有用户余额总和 = 总收入 - 提现金额）',
           value: s.totalBalance,
           bgColor: '#e6f4ff',
           accentColor: '#1677ff',
@@ -224,7 +224,11 @@ export default defineComponent({
                 <div class={styles.statValue} style={{ color: item.accentColor }}>
                   ¥{formatMoney(item.value)}
                 </div>
-                {/* 趋势文字暂时隐藏 */}
+                {/* {item.key === 'totalBalance' && (
+                  <div class={styles.statDesc} style={{ color: 'rgba(0, 0, 0, 0.45)' }}>
+                    = 总收入 - 提现金额
+                  </div>
+                )} */}
               </div>
             ))}
           </div>

src/pages/finance/reports/model/useReportsModel.ts

@@ -126,7 +126,9 @@ export function useReportsModel() {
   // ===== 图表数据 =====
   const chartData = computed(() => {
     const list = data.value?.monthList || [];
-    return list.map((item) => ({
+    // 按月份升序排列，确保图表 X 轴时间顺序正确
+    const sorted = [...list].sort((a, b) => a.month.localeCompare(b.month));
+    return sorted.map((item) => ({
       month: dayjs(item.month).format('MM月'),
       order: toNumber(item.orderAmount),
       refund: toNumber(item.refundAmount),

src/types/china-area-data.d.ts

@@ -1,4 +1,4 @@
-declare module 'china-area-data' {
+declare module 'china-area-data/data.json' {
   const data: Record<string, Record<string, string>>;
   export default data;
 }

src/utils/areaData.ts

@@ -1,4 +1,4 @@
-import areaData from 'china-area-data';
+import areaData from 'china-area-data/data.json';
 
 export interface CascadeOption {
   value: string;