From 18ee76b8c6924ebc537630e2eae6041019f0a531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 15 Sep 2022 17:31:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/fixedAssets.vue     |  1 +
 src/views/sunVillage_info/information.vue     |  1 +
 .../sunVillage_info/list_finance_ranking.vue  | 31 ++++++++++++++-----
 src/views/sunVillage_info/passWord.vue        |  1 -
 src/views/sunVillage_info/user.vue            |  1 -
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/sunVillage_info/fixedAssets.vue b/src/views/sunVillage_info/fixedAssets.vue
index 7fc585af..d6563a56 100644
--- a/src/views/sunVillage_info/fixedAssets.vue
+++ b/src/views/sunVillage_info/fixedAssets.vue
@@ -181,6 +181,7 @@
            {
              message:'是否确认删除固定资产?',
              title:"警告",
+             showCancelButton:true,
              confirmButtonText: "确定",
              cancelButtonText: "取消",
            }
diff --git a/src/views/sunVillage_info/information.vue b/src/views/sunVillage_info/information.vue
index 8ed10fa9..4c8c4819 100644
--- a/src/views/sunVillage_info/information.vue
+++ b/src/views/sunVillage_info/information.vue
@@ -159,6 +159,7 @@
          {
            message:'是否确认删除合同信息?',
            title:"警告",
+           showCancelButton:true,
            confirmButtonText: "确定",
            cancelButtonText: "取消",
          }
diff --git a/src/views/sunVillage_info/list_finance_ranking.vue b/src/views/sunVillage_info/list_finance_ranking.vue
index 5d303eff..5b3f30aa 100644
--- a/src/views/sunVillage_info/list_finance_ranking.vue
+++ b/src/views/sunVillage_info/list_finance_ranking.vue
@@ -28,11 +28,15 @@
         <van-row v-for="(item,index) in applicationList" :key="index">
           <van-col :span="24">{{item.voucherSummary}}</van-col>
         </van-row>
+        <van-row>
+          <van-col :span="24"><p style="color: red;">本月合计：</p></van-col>
+        </van-row>
         <div class="name_bg"></div>
         <img src="../../assets/images/sunVillage_info/name_icon.png" class="name_icon"/>
       </div>
 
       <div class="right_box">
+        <div class="right_box_box">
           <van-row>
             <van-col :span="12">收入金额</van-col>
             <van-col :span="12">支出金额</van-col>
@@ -41,17 +45,22 @@
             <van-col :span="12"><template v-if="item.jieAmount">￥{{item.jieAmount}}</template></van-col>
             <van-col :span="12"><template v-if="item.daiAmount">￥{{item.daiAmount}}</template></van-col>
           </van-row>
+          <van-row>
+            <van-col :span="12"><p style="color: red;">￥{{applicationSummary.jie}}</p></van-col>
+            <van-col :span="12"><p style="color: red;">￥{{applicationSummary.dai}}</p></van-col>
+          </van-row>
+        </div>
       </div>
 
       <div class="clear"></div>
     </div>
-    <div class="bottom_box">
-      <p>本月合计：</p>
-      <van-row>
-        <van-col :span="12">￥{{applicationSummary.jie}}</van-col>
-        <van-col :span="12">￥{{applicationSummary.dai}}</van-col>
-      </van-row>
-    </div>
+<!--    <div class="bottom_box">-->
+<!--      <p>本月合计：</p>-->
+<!--      <van-row>-->
+<!--        <van-col :span="12">￥{{applicationSummary.jie}}</van-col>-->
+<!--        <van-col :span="12">￥{{applicationSummary.dai}}</van-col>-->
+<!--      </van-row>-->
+<!--    </div>-->
   </div>
 </template>
 
@@ -483,6 +492,14 @@
   .right_box{
     float: left;
     width: calc(100% - 180PX);
+    overflow:hidden;
+    overflow-x: scroll;
+    white-space:nowrap;
+    display: -webkit-box;
+    -webkit-overflow-scrolling: touch;
+    .right_box_box{
+      width: 300PX;
+    }
     .van-row:nth-child(odd){
       background-color: #ffffff;
     }
diff --git a/src/views/sunVillage_info/passWord.vue b/src/views/sunVillage_info/passWord.vue
index 9318ef93..a8ce0f94 100644
--- a/src/views/sunVillage_info/passWord.vue
+++ b/src/views/sunVillage_info/passWord.vue
@@ -86,7 +86,6 @@
         top: 36px;
       }
       .add_btn{
-        width: 56.4px;
         height: 40.8px;
         font-size: 14PX;
         position: absolute;
diff --git a/src/views/sunVillage_info/user.vue b/src/views/sunVillage_info/user.vue
index 40e58693..574f58ec 100644
--- a/src/views/sunVillage_info/user.vue
+++ b/src/views/sunVillage_info/user.vue
@@ -107,7 +107,6 @@
         top: 36px;
       }
       .add_btn{
-        width: 56.4px;
         height: 40.8px;
         font-size: 14PX;
         position: absolute;