From e4f794e666843556c8b8c07cf99ead5a63c3b942 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Tue, 16 Jan 2024 14:17:17 +0800
Subject: [PATCH] update

---
 pages/index/index.vue            |  2 +-
 pages/merchantAccount/detail.vue | 36 ++++++++++++++++----------------
 pages/merchantAccount/index.vue  | 25 +++++++++++-----------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 52b29fe..b24cd84 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3249,7 +3249,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                             font-weight: bold;
                             color: #E83944;
                             line-height: 32rpx
-                          }
+                          } 
                           .addType{
                             font-size: 28rpx;
                             font-family: PingFangSC-Regular, PingFang SC;
diff --git a/pages/merchantAccount/detail.vue b/pages/merchantAccount/detail.vue
index df85699..6b4ab35 100644
--- a/pages/merchantAccount/detail.vue
+++ b/pages/merchantAccount/detail.vue
@@ -43,8 +43,8 @@
                       <image class="moneyItemIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/accountIcon.svg"/>
                     </view>
                     <view class="moneyDetail">
-                      <text class="itemLabel">到账 /元</text>
-                      <text class="itemValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
+                      <text class="itemLabel">到账 /万元</text>
+                      <text class="itemValue">{{item.SubRoyaltyPrice?$util.getMoney(item.SubRoyaltyPrice/10000):'-'}}</text>
                     </view>
                   </view>
 
@@ -53,8 +53,8 @@
                       <image class="moneyItemIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/entryIcon.svg"/>
                     </view>
                     <view class="moneyDetail">
-                      <text class="itemLabel">入账 /元</text>
-                      <text class="itemValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
+                      <text class="itemLabel">入账 /万元</text>
+                      <text class="itemValue">{{item.SubRoyaltyTheory?$util.getMoney(item.SubRoyaltyTheory/10000):'-'}}</text>
                     </view>
                   </view>
 
@@ -63,8 +63,8 @@
                       <image class="moneyItemIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/payIcon.svg"/>
                     </view>
                     <view class="moneyDetail">
-                      <text class="itemLabel">应缴 /元</text>
-                      <text class="itemValue">{{item.ReceivableAmount?$util.fmoney(item.ReceivableAmount,2):'-'}}</text>
+                      <text class="itemLabel">应缴 /万元</text>
+                      <text class="itemValue">{{item.ReceivableAmount?$util.getMoney(item.ReceivableAmount/10000):'-'}}</text>
                     </view>
                   </view>
                 </view>
@@ -134,18 +134,18 @@
 
               <view class="itemRightBottom">
                 <view class="bottomItem">
-                  <text class="bottomLabel">到账<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
+                  <text class="bottomLabel">到账<text class="bottomUnit">/万元</text></text>
+                  <text class="bottomValue">{{item.SubRoyaltyPrice?$util.getMoney(item.SubRoyaltyPrice/10000):'-'}}</text>
                 </view>
 
                 <view class="bottomItem">
-                  <text class="bottomLabel">入账<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
+                  <text class="bottomLabel">入账<text class="bottomUnit">/万元</text></text>
+                  <text class="bottomValue">{{item.SubRoyaltyTheory?$util.getMoney(item.SubRoyaltyTheory/10000):'-'}}</text>
                 </view>
 
                 <view class="bottomItem">
-                  <text class="bottomLabel">应缴<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">{{item.ReceivableAmount ?$util.fmoney(item.ReceivableAmount ,2):'-'}}</text>
+                  <text class="bottomLabel">应缴<text class="bottomUnit">/万元</text></text>
+                  <text class="bottomValue">{{item.ReceivableAmount ?$util.getMoney(item.ReceivableAmount/10000):'-'}}</text>
                 </view>
               </view>
             </view>
@@ -175,15 +175,15 @@
               <view class="otherBox">
                 <view class="otherItem">
                   <text class="otherLabel">到账<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">{{subItem.SubRoyaltyPrice?$util.fmoney(subItem.SubRoyaltyPrice,2):'-'}}</text>
+                  <text class="otherValue">{{subItem.SubRoyaltyPrice?$util.getMoney(subItem.SubRoyaltyPrice):'-'}}</text>
                 </view>
                 <view class="otherItem">
                   <text class="otherLabel">入账<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">{{subItem.SubRoyaltyTheory?$util.fmoney(subItem.SubRoyaltyTheory,2):'-'}}</text>
+                  <text class="otherValue">{{subItem.SubRoyaltyTheory?$util.getMoney(subItem.SubRoyaltyTheory):'-'}}</text>
                 </view>
                 <view class="otherItem">
                   <text class="otherLabel">应缴<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">{{subItem.ReceivableAmount ?$util.fmoney(subItem.ReceivableAmount ,2):'-'}}</text>
+                  <text class="otherValue">{{subItem.ReceivableAmount ?$util.getMoney(subItem.ReceivableAmount):'-'}}</text>
                 </view>
               </view>
             </view>
@@ -522,7 +522,7 @@ export default {
                 line-height: 36rpx;
               }
               .itemValue{
-                font-size: 24rpx;
+                font-size: 28rpx;
                 font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
                 color: #160002;
@@ -747,7 +747,7 @@ export default {
                   }
                 }
                 .bottomValue{
-                  font-size: 24rpx;
+                  font-size: 28rpx;
                   font-family: DINAlternate, DINAlternate;
                   font-weight: bold;
                   color: #160002;
@@ -843,7 +843,7 @@ export default {
                   }
                 }
                 .otherValue{
-                  font-size: 24rpx;
+                  font-size: 28rpx;
                   font-family: DINAlternate, DINAlternate;
                   font-weight: bold;
                   color: #160002;
diff --git a/pages/merchantAccount/index.vue b/pages/merchantAccount/index.vue
index f107a0c..a77a075 100644
--- a/pages/merchantAccount/index.vue
+++ b/pages/merchantAccount/index.vue
@@ -25,7 +25,7 @@
               <text class="itemTitle">商家到账<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">{{pageData && pageData.SubRoyaltyPrice?$util.fmoney(pageData.SubRoyaltyPrice,2):'-'}}</text>
+            <text class="itemRight">{{pageData && pageData.SubRoyaltyPrice?$util.getMoney(pageData.SubRoyaltyPrice):'-'}}</text>
           </view>
 
           <view class="entryItem">
@@ -34,7 +34,7 @@
               <text class="itemTitle">商家入账<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">{{pageData && pageData.SubRoyaltyTheory?$util.fmoney(pageData.SubRoyaltyTheory,2):'-'}}</text>
+            <text class="itemRight">{{pageData && pageData.SubRoyaltyTheory?$util.getMoney(pageData.SubRoyaltyTheory):'-'}}</text>
           </view>
 
           <view class="entryItem">
@@ -43,7 +43,7 @@
               <text class="itemTitle">商家应缴<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">{{pageData && pageData.ReceivableAmount?$util.fmoney(pageData.ReceivableAmount,2):'-'}}</text>
+            <text class="itemRight">{{pageData && pageData.ReceivableAmount?$util.getMoney(pageData.ReceivableAmount):'-'}}</text>
           </view>
         </view>
       </view>
@@ -100,18 +100,17 @@
 
           <view class="moneyBox">
               <view class="moneyItem">
-                <text class="itemLabel">到账 /元</text>
-                <text class="itemValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
+                <text class="itemLabel">到账 /万元</text>
+                <text class="itemValue">{{item.SubRoyaltyPrice?$util.getMoney(item.SubRoyaltyPrice/10000):'-'}}</text>
+              </view>
+              <view class="moneyItem">
+                <text class="itemLabel">入账 /万元</text>
+                <text class="itemValue">{{item.SubRoyaltyTheory?$util.getMoney(item.SubRoyaltyTheory/10000):'-'}}</text>
               </view>
 
               <view class="moneyItem">
-                <text class="itemLabel">入账 /元</text>
-                <text class="itemValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
-              </view>
-
-              <view class="moneyItem">
-                <text class="itemLabel">应缴 /元</text>
-                <text class="itemValue">{{item.ReceivableAmount ?$util.fmoney(item.ReceivableAmount ,2):'-'}}</text>
+                <text class="itemLabel">应缴 /万元</text>
+                <text class="itemValue">{{item.ReceivableAmount ?$util.getMoney(item.ReceivableAmount/10000):'-'}}</text>
               </view>
             </view>
         </view>
@@ -481,7 +480,7 @@ export default {
               margin-bottom: 4rpx;
             }
             .itemValue{
-              font-size: 24rpx;
+              font-size: 28rpx;
               font-family: DINAlternate, DINAlternate;
               font-weight: bold;
               color: #160002;