From f8ac704956553834d1e050da98c872acfa2b0985 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Fri, 19 Sep 2025 18:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A9canvas=E5=9C=A8=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8-=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=B0=9D?=
 =?UTF-8?q?=E8=AF=95-defeated?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/circle-progress/circle-progress.vue  | 16 +++++++++++-----
 pages/future/future.vue                         |  1 +
 pages/institutionalStructure/donationRecord.vue |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/components/circle-progress/circle-progress.vue b/components/circle-progress/circle-progress.vue
index a950dc6..c464d8b 100644
--- a/components/circle-progress/circle-progress.vue
+++ b/components/circle-progress/circle-progress.vue
@@ -11,11 +11,14 @@
     :style="{ width: canvasSize + 'px', height: canvasSize + 'px' }"
     class="progress-container"
   >
-    <canvas
-      :style="{ width: canvasSize + 'px', height: canvasSize + 'px' }"
-      canvas-id="progressCanvas"
-      class="progress-canvas"
-    ></canvas>
+    <cover-view z-index="0">
+      <canvas
+        :style="{ width: canvasSize + 'px', height: canvasSize + 'px' }"
+        canvas-id="progressCanvas"
+        class="progress-canvas"
+      ></canvas>
+    </cover-view>
+
     <view class="progress-text">
       <text class="percent">{{ progress }}%</text>
       <text class="label">{{ content }}</text>
@@ -105,9 +108,12 @@ export default {
 <style scoped>
 .progress-container {
   position: relative;
+  z-index: 0;
 }
 
 .progress-canvas {
+  z-index: 0;
+  position: relative;
   border-radius: 50%;
   box-shadow: 0 8rpx 25rpx rgba(0, 0, 0, 0.1);
 }
diff --git a/pages/future/future.vue b/pages/future/future.vue
index 162cd57..37d5ac5 100644
--- a/pages/future/future.vue
+++ b/pages/future/future.vue
@@ -754,6 +754,7 @@ button {
 .donation {
   background: #ffffff;
   padding: 32rpx;
+  z-index: 9999;
 }
 
 .title-row {
diff --git a/pages/institutionalStructure/donationRecord.vue b/pages/institutionalStructure/donationRecord.vue
index 2b4dbb4..a0887da 100644
--- a/pages/institutionalStructure/donationRecord.vue
+++ b/pages/institutionalStructure/donationRecord.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <custom-navbar title="捐款记录" />
+    <custom-navbar ref="customNavbar" title="捐款记录" />
     <tile-grid />
     <view :style="{ backgroundColor: CommonEnum.BASE_COLOR }" class="header">
       <view class="search-filter-row">
@@ -45,6 +45,7 @@
       height="880rpx"
       mode="bottom"
       width="750rpx"
+      z-index="9999"
     >
       <view class="filterBox">
         <view class="filterAll">全部筛选</view>