From e8527e739865d75e3007c38654899088cff8a95e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 16 Jun 2025 11:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 4 ++--
 vue.config.js                 | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5d1abb7..de7df73 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -597,7 +597,7 @@ export default {
         return {
           value:Number(money_total_2) ? ((( curPlan_total / Number(money_total_2 ||0)) * 10000) / 100).toFixed(2) :
         ((( curPlan_total / Number(money_total_1 ||0)) * 10000) / 100).toFixed(2),
-          money:paid_plan_total
+          money:curPlan_total
         }
       });
 
@@ -619,7 +619,7 @@ export default {
         return {
           value:Number(money_total_2) ? (((nextPlan_total / Number(money_total_2||0)) * 10000) / 100).toFixed(2) :
          (((nextPlan_total / Number(money_total_1||0)) * 10000) / 100).toFixed(2),
-         money:paid_plan_total_next
+         money:nextPlan_total
         }
       });
 
diff --git a/vue.config.js b/vue.config.js
index 9dac60b..4fb94a6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,7 +27,8 @@ module.exports = {
    */
   publicPath:  process.env.ENV === 'staging' ? '/admin_test' : '/admin',
   // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
-  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
+  outputDir: process.env.ENV === 'staging' ? '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin'
+  :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
   // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public
   assetsDir: 'static',
   lintOnSave: false,