--订单详情补贴与扣款--

app.js

@@ -1,7 +1,7 @@
 //app.js
 App({
   //----------------------------------------------globalData--------------------------------------
-  evn: 1,//0:开发环境，1：测试环境，2：生产环境
+  evn: 0,//0:开发环境，1：测试环境，2：生产环境
   tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
   agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
   version: 152,

pages/agent/detail/item-money-info/money-info.wxml

@@ -64,6 +64,12 @@
 			<text class="text-black">调节费</text>
 			<text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
 		</view>
+		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"
+			wx:if="{{item.adjustMoney && item.adjustMoney != 0}}">
+			<text class="text-black">补贴与扣款</text>
+			<text style="color:#F5222D">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+		</view>
+		
 		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
 			<text class="text-black text-bold">尾款实收金额：</text>
 			<text style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
@@ -105,6 +111,11 @@
 		<text class="text-black">调节费</text>
 		<text style="color:#F5222D">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
 	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
+		wx:if="{{item.adjustMoney && item.adjustMoney}}">
+		<text class="text-black">补贴与扣款</text>
+		<text style="color:#F5222D">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
 		<text class="text-black text-bold">总收款金额：</text>
 		<text style="color:#F5222D">{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元</text>

pages/agent/detail/pound-info/pound-info.json

@@ -2,6 +2,8 @@
   "component": true,
   "usingComponents": {
     "wux-image": "/components/image/index",
-    "sudoku-image": "/components/sudoku-image/index"
+    "sudoku-image": "/components/sudoku-image/index",
+    "wux-accordion-group": "/components/accordion-group/index",
+    "wux-accordion": "/components/accordion/index"
   }
 }

pages/agent/detail/pound-info/pound-info.wxml

@@ -24,6 +24,47 @@
     <text class="text-black">代卖费</text>
     <text class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}}</text>
   </view>
+  <!--补贴与扣款-->
+  <view class="" style="margin-top:20rpx;width:104%">
+    <wux-accordion-group style="padding:0rpx">
+      <wux-accordion>
+        <view slot="header" class="flex flex-justify" style="width: 100%">
+          <view class="flex">
+            <text class="text-sg text-black text-bold" style="margin-left: -32rpx">补贴与扣款</text>
+          </view>
+          <view class="text-df text-gray" style="padding-right:16rpx;">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</view>
+        </view>
+        <view class="flex flex-justify text-sg">
+          <text class="text-black">运费补贴</text>
+          <text class="text-gray">{{formate.formateAmount(item.freightSubsidies==null?0:item.freightSubsidies)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+          <text class="text-black">其他补贴</text>
+          <text class="text-gray">{{formate.formateAmount(item.otherSubsidies==null?0:item.otherSubsidies)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+          <text class="text-black" style="min-width:200rpx">违禁物品扣款</text>
+          <text class="text-gray">{{formate.formateAmount(item.contrabandPenalty==null?0:item.contrabandPenalty)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+          <text class="text-black" style="min-width:200rpx">装车不规范扣款</text>
+          <text class="text-gray">{{formate.formateAmount(item.nonStandardPenalty==null?0:item.nonStandardPenalty)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+          <text class="text-black" style="min-width:200rpx">其他扣款</text>
+          <text class="text-gray">{{formate.formateAmount(item.otherPenalty==null?0:item.otherPenalty)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+          <text class="text-black" style="min-width:200rpx">总计</text>
+          <text class="text-gray">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-end">
+          <text class="text-black" style="min-width:200rpx">备注</text>
+          <text class="text-gray">{{item.remark==null? '':item.remark}}</text>
+        </view>
+      </wux-accordion>
+    </wux-accordion-group>
+  </view>
   <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">调节费</text>
     <text class="text-gray">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>

pages/agent/detail/pound-info/pound-info.wxss

@@ -13,4 +13,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
+}
+.wux-accordion__hd{
+padding: 0px;
 }