From 90f2926d5c64e8e5e63fb8c5ddcd9940150ecbea Mon Sep 17 00:00:00 2001
From: mike <esseak@gmail.com>
Date: Fri, 17 Jun 2022 17:05:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/sonpingDetail/expenseDetail.vue | 35 +++++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/packages/sonpingDetail/expenseDetail.vue b/packages/sonpingDetail/expenseDetail.vue
index 684b8e3..e5a9d7e 100644
--- a/packages/sonpingDetail/expenseDetail.vue
+++ b/packages/sonpingDetail/expenseDetail.vue
@@ -4,23 +4,29 @@
       <view class="flex-col">
         <view class="flex-col section_2">
           <view class="justify-between">
-            <text class="text_2">费用合计</text>
-            <text class="text_3">¥{{ details.total }}</text>
+            <text class="text_2">订单费用</text>
+            <text class="text_3">¥{{ Number.parseFloat(details.total) + details.discount }}</text>
           </view>
           <view class="justify-between group_7">
             <text class="text_4">订单折扣</text>
-            <text class="text_5">{{ details.discount && details.discount > 0 ? details.discount +'折' : '无'  }}</text>
+            <text class="text_5" :class="details.discount && details.discount > 0 ? 'text_5_red':''">{{ details.discount && details.discount > 0 ? '- ¥' : ''  }}{{ details.discount && details.discount > 0 ? details.discount +'' : '无'  }}</text>
           </view>
+		  <view class="justify-between group_7">
+		    <text class="text_2">费用合计</text>
+		    <text class="text_3">¥{{ details.total }}</text>
+		  </view>
         </view>
 		
 		<view class="card">
 			<!-- <u-collapse @change="change" @close="close" @open="open" ref="myCollapse" > -->
 			<u-collapse :border="false" ref="myCollapse" :value="['Rating fee']">
 			    <u-collapse-item title="评级费用" :value="ratingFeeTotal" name="Rating fee" >
-			      <view class="u-collapse-content lf-row-between collapse-item-content" v-for="(item, index) in details.grading_cost" :key="index">
+<!-- 			      <view class="u-collapse-content lf-row-between collapse-item-content" v-for="(item, index) in details.grading_cost" :key="index">
 					  <view>{{ item.title }}</view>
 					  <view>¥{{ item.amount }}</view>
-				  </view>
+				  </view> -->
+				  <lf-table :Header="header" :Content="details.grading_cost" height="auto" width="100%" :showNumber="false" :border="false" headBgColor="transparent" v-if="$isRight(details.other)"></lf-table>
+				  
 			    </u-collapse-item>
 			</u-collapse>
 		</view>
@@ -54,7 +60,7 @@
 			  width: 171,
 			  key: 'title'
 		  },{
-			  text: '价格',
+			  text: '单价',
 			  width: 171,
 			  key: 'amount'
 		  },{
@@ -107,11 +113,17 @@
 			details.other.forEach(item => {
 				item.total = new Bigc(item.num).times(item.amount).round(2, 0);
 			})
+			details.grading_cost.forEach(item => {
+				item.total = new Bigc(item.num).times(item.amount).round(2, 0);
+			})
 			this.details = details;
-			this.$nextTick(()=>{
-				this.$refs.myCollapse.init();
-				this.$refs.myCollapse2.init();
-			});
+			setTimeout(()=>{
+				this.$nextTick(()=>{
+					this.$refs.myCollapse.init();
+					this.$refs.myCollapse2.init();
+				});
+			},200)
+			
 			
 		}
 	}
@@ -215,6 +227,9 @@
     line-height: 44rpx;
     white-space: nowrap;
   }
+  .text_5_red{
+	  color: red;
+  }
   .text_18 {
     margin-left: 116rpx;
   }