no message

pages/agent/select-list/index.js

@@ -62,6 +62,7 @@ Scene({
     var orderItem = order.orderItems[e.currentTarget.dataset.oindex]
     var data = { millName: order.paperMillName, createTime: order.createTime }
     data.categoryName = orderItem.paperCategoryName
+    data.categoryId = orderItem.paperCategoryId
     data.plateNumber = orderItem.plateNumber
     data.id = orderItem.id
     const channel = this.getOpenerEventChannel()

pages/storage/order-info/index.wxml

@@ -158,22 +158,16 @@
         <view class="text-gray">{{ form.deductPercent || ''}}</view>
       </view>
     </van-cell>
-    <van-cell wx:if="{{form.otherFee}}">
-      <view slot="title" class="flex flex-justify">
-        <view class="text-black">其他费用(元)</view>
-        <view class="text-gray">{{ form.otherFee}}</view>
-      </view>
-    </van-cell>
     <van-cell>
       <view slot="title" class="flex flex-justify">
         <view class="text-black">结算金额(元)</view>
-        <view class="text-gray">{{ form.adjustedPrice}}</view>
+        <view class="text-gray">{{ form.settlePrice}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{form.proxyPaySurcharge}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">代卖费(元)</view>
-        <view class="text-gray">{{ form.settlePrice}}</view>
+        <view class="text-gray">{{ form.proxyPaySurcharge}}</view>
       </view>
     </van-cell>
     <van-cell wx:if="{{form.freight}}">
@@ -194,6 +188,12 @@
         <view class="text-gray">{{ form.subsidy}}</view>
       </view>
     </van-cell>
+    <van-cell wx:if="{{form.netIncome}}">
+      <view slot="title" class="flex flex-justify">
+        <view class="text-black">收入金额(元)</view>
+        <view class="text-gray">{{ form.netIncome}}</view>
+      </view>
+    </van-cell>
     <view class="bg-white" style="padding: 20rpx 32rpx" wx:if="{{fileList.length}}">
       <view class="flex flex-justify" style="padding-bottom: 20rpx">
         <text class="text-black">纸厂磅单</text>

pages/storage/order-settlement/index.js

@@ -286,6 +286,10 @@ Scene({
     }
     var params = { id: this.data.orderInfo.id, categoryId: this.data.form.categoryId }
     params.otherFee = this.data.form.otherFee
+    params.subsidy = this.data.form.subsidy
+    params.proxyPaySurcharge = this.data.form.proxyPaySurcharge
+    params.freight = this.data.form.freight
+    params.deductPercent = this.data.form.deductPercent
     params.unitPrice = this.data.form.unitPrice
     params.estimatedAmount = this.data.form.estimatedAmount
     params.deductPercent = this.data.form.deductPercent

pages/storage/order-settlement/index.wxml

@@ -31,7 +31,7 @@
   <van-field id="freight" value="{{ form.freight || '' }}" label="运费(元)" maxlength="8" type="digit" placeholder="请输入运费" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="otherFee" value="{{ form.otherFee || '' }}" label="其他费用(元)" maxlength="8" type="digit" placeholder="请输入其他费用" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="subsidy" value="{{ form.subsidy || '' }}" label="补贴(元)" maxlength="8" type="digit" placeholder="请输入补贴" clearable input-align="right" bind:change="bindInput"></van-field>
-  <van-field value="{{ amout || '- -' }}" label="结算金额(元)" type="digit" disabled input-align="right"></van-field>
+  <van-field value="{{ amout || '- -' }}" label="收入金额(元)" type="digit" disabled input-align="right"></van-field>
 
   <view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx">
     <view class="flex flex-justify" style="padding-bottom: 24rpx">