From 33352da1064f88c56749a610832096cd36f8d31b Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Sat, 30 Aug 2025 18:03:45 +0800
Subject: [PATCH] =?UTF-8?q?circle-progress=E7=BB=84=E4=BB=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=92=8C=E6=9C=AA=E6=9D=A5=E8=A7=84=E5=88=92=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle-progress/circle-progress.vue       |  4 ++--
 pages/future/future.vue                       | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/components/circle-progress/circle-progress.vue b/components/circle-progress/circle-progress.vue
index 3fbff21..a950dc6 100644
--- a/components/circle-progress/circle-progress.vue
+++ b/components/circle-progress/circle-progress.vue
@@ -53,7 +53,7 @@ export default {
     },
     content: {
       type: String,
-      default: "进度",
+      default: "",
     },
   },
   mounted() {
@@ -121,7 +121,7 @@ export default {
 }
 
 .percent {
-  font-size: 36rpx;
+  font-size: 28rpx;
   font-weight: bold;
   color: #333;
   display: block;
diff --git a/pages/future/future.vue b/pages/future/future.vue
index 1f41795..de205c2 100644
--- a/pages/future/future.vue
+++ b/pages/future/future.vue
@@ -21,7 +21,14 @@
         <view class="donorContainer">
           <text>项目筹款情况</text>
           <view class="donorData">
-            <view class="CircleProgress"></view>
+            <view class="CircleProgress">
+              <circle-progress
+                :canvas-size="65"
+                :progress="getProgressPercentage"
+                progress-color="#A24242"
+                strokeWidth="5"
+              ></circle-progress>
+            </view>
 
             <view class="data-info">
               <view class="data-row">
@@ -39,10 +46,6 @@
             </view>
           </view>
 
-          <u-circle-progress :percent="getProgressPercentage">
-            <text class="u-progress-info">查找中</text>
-          </u-circle-progress>
-
           <view class="record" @click="goDonationRecord"
             >查看捐款记录
             <u-icon name="arrow-right"></u-icon>
@@ -250,7 +253,7 @@ export default {
       }
       const percentage =
         (this.projectDetails.amountSum / this.projectDetails.totalAmount) * 100;
-      return Math.min(Math.round(percentage), 100); // 确保不超过100%
+      return Math.min(parseFloat(percentage.toFixed(2)), 100); // 保留两位小数且不超过100%
     },
   },
 };
@@ -387,12 +390,12 @@ export default {
           margin-top: 30rpx;
           display: flex;
 
-          //.CircleProgress {
-          //  flex: 1;
-          //}
+          .CircleProgress {
+            flex: 1;
+          }
 
           .data-info {
-            flex: 9;
+            flex: 3;
 
             .data-row {
               display: flex;