diff --git a/pages/agent/order-detail/item-money-info/index.js b/pages/agent/order-detail/item-money-info/index.js
index 0e26a7a..2f6d78e 100644
--- a/pages/agent/order-detail/item-money-info/index.js
+++ b/pages/agent/order-detail/item-money-info/index.js
@@ -31,7 +31,7 @@ Component({
   lifetimes: {
     attached: function () {
       // 在组件实例进入页面节点树时执行
-      if (this.data.item.otherAmountDtoList.length) {
+      if (this.data.item.otherAmountDtoList && this.data.item.otherAmountDtoList.length) {
         this.data.item.otherAmountDtoList.forEach(element => {
           if (element.amount != null && element.amount != 0) {
             this.setData({
@@ -46,12 +46,17 @@ Component({
 
       var rightFkbl = (this.data.item.activitySettleType == 0 ? '70%' : (this.data.item.activitySettleType == 1 ? '85%' : '100%'))
       var rightJsdj = (math.times(this.data.item.unitPrice, 1000) + '元/吨')
-      var rightJsjz = (math.divide(this.data.item.weightnoteInfo.netWeight, 1000) + '吨')
+      var rightJsjz = 0
+      if (this.data.item.weightnoteInfo && this.data.item.weightnoteInfo.netWeight) {
+        rightJsjz = (math.divide(this.data.item.weightnoteInfo.netWeight, 1000) + '吨')
+      }
       var rightDmf = this.data.item.unitSurcharge > 0 ? ('-' + math.times(this.data.item.unitSurcharge, 1000) + '元/吨') : (this.data.item.unitSurcharge < 0 ? math.times(this.data.item.unitSurcharge, 1000) + '元/吨' : '')
-      var rightJz = math.times(this.data.item.unitSurcharge, 1000) + '吨'
-      this.setData({
-        firstMoneyStringTip: firstLeft + '=' + rightJsdj + '×' + rightJsjz + '×' + rightFkbl + rightDmf + '×' + rightJz
-      })
+      if(this.data.item.unitSurcharge){
+        var rightJz = math.times(this.data.item.unitSurcharge, 1000) + '吨'
+        this.setData({
+          firstMoneyStringTip: firstLeft + '=' + rightJsdj + '×' + rightJsjz + '×' + rightFkbl + rightDmf + '×' + rightJz
+        })
+      }
       //尾款金额toptip提示
       var secondLeft = '结算单价x结算重量-首笔货款金额' + firstFkbl + '+' + (this.data.isShowtotalOtherAmount == false ? '纸厂补贴与扣款' : '') + '+返还补贴+调节费'
       if (this.data.item.unitPrice) {
@@ -59,12 +64,12 @@ Component({
       } else {
         var secondJsdj = '0'
       }
-      if (this.data.item.weightnoteInfo.settleWeight) {
+      if (this.data.item.weightnoteInfo && this.data.item.weightnoteInfo.settleWeight) {
         var secondJszl = (math.divide(this.data.item.weightnoteInfo.settleWeight, 1000) + '吨')
       } else {
         var secondJszl = '0'
       }
-      if (this.data.item.weightnoteInfo.netWeight) {
+      if (this.data.item.weightnoteInfo && this.data.item.weightnoteInfo.netWeight) {
         var secondJsjz = (math.divide(this.data.item.weightnoteInfo.netWeight, 1000) + '吨')
       } else {
         var secondJsjz = '0'
diff --git a/pages/agent/order-detail/item-money-info/index.wxml b/pages/agent/order-detail/item-money-info/index.wxml
index 38e5a15..f785f8e 100644
--- a/pages/agent/order-detail/item-money-info/index.wxml
+++ b/pages/agent/order-detail/item-money-info/index.wxml
@@ -5,10 +5,10 @@
 <!-- 预付款 -->
 <view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx"
 	wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
-	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view>
+	<view class="text-df text-gray" style="border-bottom: 1rpx solid #f3f3f3;padding-bottom:24rpx">首款信息</view>
 	<view class="flex flex-justify text-sg">
 		<text class="text-black">预计总金额</text>
-		<text style="">{{formate.formateAmount(item.preTotalMoney)}}元</text>
+		<text>{{formate.formateAmount(item.preTotalMoney)}}元</text>
 	</view>
 	<view class="flex flex-justify text-sm" style="margin-top:2rpx">
 		<text class="text-gray">结算单价 x 净重</text>
@@ -17,7 +17,7 @@
 	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
 		<text class="text-black">首笔应收金额</text>
-		<text style="">{{formate.formateAmount(item.prepayMoney)}}元</text>
+		<text>{{formate.formateAmount(item.prepayMoney)}}元</text>
 	</view>
 	<view class="flex flex-justify text-sm" style="margin-top:2rpx">
 		<text class="text-gray">预估总金额 x {{agent.getActivitySettleType(orderInfo.activitySettleType)}}</text>
@@ -26,7 +26,7 @@
 	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
 		<text class="text-black">代卖费总额</text>
-		<text style="">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
+		<text>{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
 	</view>
 	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}">
 		<text class="text-gray">代卖费单价 x 净重</text>
@@ -36,7 +36,7 @@
 	<view class="flex text-sg" style="justify-content: flex-end;margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
 		<text class="text-black text-bold">首笔货款金额：</text>
 		<van-popover placement="topRight" content="{{firstMoneyStringTip}}" body-style="width: 684rpx;">
-			<view style="flex flex-center">
+			<view class="flex flex-center">
 				<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.preSettleMoney)}}元</text>
 				<text class="cuIcon-question text-gray" style="font-size:36rpx"></text>
 			</view>
@@ -46,10 +46,10 @@
 <!-- 尾款 只有活动订单才会有这个字段,并且这个字段=2表示第二次审核了 -->
 <view wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 2}}">
 	<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
-		<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
+		<view class="text-df text-gray" style="border-bottom: 1rpx solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
 		<view class="flex flex-justify text-sg">
 			<text class="text-black">未结算金额</text>
-			<text style="">{{formate.formateAmount(item.unSettleMoney)}}元</text>
+			<text>{{formate.formateAmount(item.unSettleMoney)}}元</text>
 		</view>
 		<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
 			<text class="text-gray">单价 x 结算重量 - 首笔应收金额</text>
@@ -71,17 +71,17 @@
 		<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
 		wx:if="{{item.refundSubsidy!=null&&item.refundSubsidy!=0}}">
 			<text class="text-black">返还补贴</text>
-			<text style="">{{formate.formateAmount(item.refundSubsidy==null?0:item.refundSubsidy)}}元</text>
+			<text>{{formate.formateAmount(item.refundSubsidy==null?0:item.refundSubsidy)}}元</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}}">
 			<text class="text-black">调节费</text>
-			<text style="">{{formate.formateAmount(item.adjustMoney==null?0:item.adjustMoney)}}元</text>
+			<text>{{formate.formateAmount(item.adjustMoney==null?0:item.adjustMoney)}}元</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>
 			<van-popover placement="topRight" content="{{secondMoneyStringTip}}" body-style="width: 684rpx;">
-				<view style="flex flex-center">
+				<view class="flex flex-center">
 					<text class="text-gray" style="color:#F5222D">{{formate.formateAmount(item.finalPayMoney)}}元</text>
 					<text class="cuIcon-question text-gray" style="font-size:36rpx"></text>
 				</view>
@@ -107,7 +107,7 @@
 	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
 		<text class="text-black">代卖费总额</text>
-		<text style="">{{formate.formateAmount(item.surcharge) || 0}}元</text>
+		<text>{{formate.formateAmount(item.surcharge) || 0}}元</text>
 	</view>
 	<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
 		<text class="text-gray">代卖费单价 x 结算重量</text>
@@ -123,12 +123,12 @@
 	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
 		wx:if="{{isShowtotalOtherAmount==false}}">
 		<text class="text-black">纸厂补贴与扣款</text>
-		<text style="">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+		<text>{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
 	</view>
 
 	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx" wx:if="{{item.refundSubsidy!=null&&item.refundSubsidy!=0}}">
 		<text class="text-black">返还补贴</text>
-		<text style="">{{formate.formateAmount(item.refundSubsidy==null?0:item.refundSubsidy)}}元</text>
+		<text>{{formate.formateAmount(item.refundSubsidy==null?0:item.refundSubsidy)}}元</text>
 	</view>
 	<view class="flex flex-justify text-xs" style="margin-top:2rpx">
 		<text class="text-gray">补贴单价单价 x 结算重量</text>
@@ -138,7 +138,7 @@
 	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
 		wx:if="{{item.adjustMoney}}">
 		<text class="text-black">调节费</text>
-		<text style="">{{formate.formateAmount(item.adjustMoney==null?0:item.adjustMoney)}}元</text>
+		<text>{{formate.formateAmount(item.adjustMoney==null?0:item.adjustMoney)}}元</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>
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index a2e3a52..54b2e68 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -6,7 +6,7 @@
 </cu-custom>
 
 <view wx:if="{{form}}">
-  <view class="flex flex-justify info_status" bindtap="orderLogger">
+  <view class="flex flex-justify info_status">
     <view class="flex" wx:if="{{form.status == 2}}">
       <image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
       <view class="text-white text-sg" style="margin-left:12rpx">待过皮重</view>
@@ -35,8 +35,8 @@
       <image style="height:42rpx;width:42rpx" src="/assets/image/icon_close.png"></image>
       <view class="text-white text-sg" style="margin-left:12rpx">已关闭</view>
     </view>
-    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="priceOrder" wx:if="{{form.status == 3}}">重新定价</view>
-    <view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx" wx:else>
+    <view class="text-white text-cancel" bindtap="cancelOrder" wx:if="{{form.status == 2 || form.status == 3 || form.status == 4}}">取消订单</view>
+    <view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="orderLogger" wx:else>
       <view class="text-white text-sm" style="margin-right:8rpx">查看订单日志</view>
       <van-icon name="arrow" color="white"/>
     </view>
@@ -178,21 +178,21 @@
 </view>
 
 <view style="height:16rpx"></view>
-<submit-layout wx:if="{{form && form.status == 2 }}">
+<!-- <submit-layout wx:if="{{form && form.status == 2 }}">
   <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
-</submit-layout>
+</submit-layout> -->
 <submit-layout wx:if="{{form && form.status == 3 && !agent && form.isHandworkOrder != 1 }}">
-  <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelOrder">取消订单</van-button>
-  <van-button type="warning" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="repeatOrder">重新过皮重</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="checkOrder">通过审核</van-button>
+  <!-- <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelOrder">取消订单</van-button> -->
+  <van-button type="warning" custom-style="margin-left:32rpx;height:88rpx;width:254rpx" bind:click="repeatOrder">重新过皮重</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder">通过审核</van-button>
 </submit-layout>
 <submit-layout wx:elif="{{form && form.status == 3 && !agent && form.isHandworkOrder == 1}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
+  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="priceOrder">重新定价</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="checkOrder">通过审核</van-button>
 </submit-layout>
 <submit-layout wx:elif="{{form && form.status == 4 && !agent && admin }}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="paymentOrder">进行支付</van-button>
+  <!-- <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrder">取消订单</van-button> -->
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:686rpx" bind:click="paymentOrder">进行支付</van-button>
 </submit-layout>
 <submit-layout wx:elif="{{form && form.status == 42 && !agent && admin }}">
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder">客户结算</van-button>
diff --git a/pages/process/order-info/index.wxss b/pages/process/order-info/index.wxss
index 02075b2..cec867d 100644
--- a/pages/process/order-info/index.wxss
+++ b/pages/process/order-info/index.wxss
@@ -3,6 +3,9 @@
   margin-right: 24rpx;
 }
 
+.text-cancel{
+  padding: 12rpx 0rpx 12rpx 12rpx
+}
 
 .info_status{
   background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index dbd2500..caf5127 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -6,7 +6,7 @@
 </cu-custom>
 
 <view wx:if="{{form}}">
-  <view class="flex flex-justify info_status" bindtap="orderLogger">
+  <view class="flex flex-justify info_status">
     <view class="flex flex-center" wx:if="{{form.orderStatus == 4}}">
       <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
       <view class="text-white text-sg" style="margin-left:12rpx">待付款</view>
@@ -30,7 +30,10 @@
     <view class="flex flex-center" wx:elif="{{form.orderStatus == 6}}">
       <view class="text-white text-sg" style="margin-left:12rpx">已取消</view>
     </view>
-    <view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx">
+    <view class="flex flex-center text-cancel" bindtap="cancelOrderInfo" wx:if="{{admin && (form.orderStatus == 3 || form.orderStatus == 4)}}">
+      <view class="text-white">取消订单</view>
+    </view>
+    <view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="orderLogger" wx:else>
       <view class="text-white text-sm" style="margin-right:8rpx">查看订单日志</view>
       <van-icon name="arrow" color="white"/>
     </view>
@@ -218,13 +221,11 @@
 </view>
 
 <submit-layout wx:if="{{form && admin && form.orderStatus == 3}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelOrderInfo">取消订单</van-button>
-  <van-button type="warning" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="repeatOrder">重新定价</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="submitForm">通过审核</van-button>
+  <van-button type="warning" custom-style="height:88rpx;width:254rpx" bind:click="repeatOrder">重新定价</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">通过审核</van-button>
 </submit-layout>
 <submit-layout wx:if="{{form && admin && form.orderStatus == 4}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelOrderInfo">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="paymentOrder">进行支付</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:686rpx" bind:click="paymentOrder">进行支付</van-button>
 </submit-layout>
 <submit-layout wx:if="{{form && admin && form.orderStatus == 42}}">
   <view class="flex flex-center" style="flex:1;justify-content: flex-start">
diff --git a/pages/process/outside-info/index.wxss b/pages/process/outside-info/index.wxss
index 319ec01..93b3df7 100644
--- a/pages/process/outside-info/index.wxss
+++ b/pages/process/outside-info/index.wxss
@@ -5,6 +5,10 @@
   padding: 0rpx 32rpx;
 }
 
+.text-cancel{
+  padding:4rpx 0rpx 4rpx 4rpx
+}
+
 .cate-list {
   margin: 24rpx 30rpx;
   border: 1rpx solid #dcdcdc;
diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js
index 7fc50ed..23cdb38 100644
--- a/pages/process/outside-price/index.js
+++ b/pages/process/outside-price/index.js
@@ -105,7 +105,7 @@ Scene({
       })
     })
   },
-  eidtForm: function(){
+  editForm: function(){
     wx.redirectTo({url: `/pages/process/outside-add/index?id=${this.data.id}` })
   },
   saveForm: function(){
diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml
index 023552d..e0404ab 100644
--- a/pages/process/outside-price/index.wxml
+++ b/pages/process/outside-price/index.wxml
@@ -9,18 +9,22 @@
       <image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
       <view class="text-white text-sg" style="margin-left:12rpx">待收货</view>
     </view>
-    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="eidtForm" wx:if="{{admin}}">修改订单</view>
+    <!-- <van-button type="danger" round custom-style="width:120rpx" size="mini" bind:click="cancelForm">关闭订单</van-button> -->
+    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="cancelForm">取消订单</view>
   </view>
-  <view class="flex flex-center info_status" style="justify-content: flex-start;"  bindtap="orderLogger" wx:elif="{{form.orderStatus == 1}}">
-    <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
-    <view class="text-white text-sg" style="margin-left:12rpx">待定价</view>
+  <view class="flex flex-justify info_status" wx:elif="{{form.orderStatus == 1}}">
+    <view class="flex">
+      <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
+      <view class="text-white text-sg" style="margin-left:12rpx">待定价</view>
+    </view>
+    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="cancelForm">取消订单</view>
   </view>
   <view class="flex flex-justify info_status" wx:elif="{{form.orderStatus == 3}}" bindtap="orderLogger">
     <view class="flex">
       <image style="height:42rpx;width:42rpx" src="/assets/image/icon_uncheck.png"></image>
       <view class="text-white text-sg" style="margin-left:12rpx">待过磅审核</view>
     </view>
-    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="repeatForm">重新定价</view>
+    <view class="text-white" style="padding: 12rpx 0rpx 12rpx 12rpx" bindtap="cancelForm">取消订单</view>
   </view>
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
     <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
@@ -146,8 +150,8 @@
 </scroll-view>
 
 <submit-layout wx:if="{{admin && form && form.orderStatus == 0}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:186rpx" bind:click="cancelForm">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="saveForm">保存订单</van-button>
+  <van-button type="warning" custom-style="height:88rpx;width:186rpx" bind:click="editForm">修改订单</van-button>
+  <van-button type="default" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="saveForm">保存订单</van-button>
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx;" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 <submit-layout wx:elif="{{form && form.orderStatus == 0}}">
@@ -155,8 +159,7 @@
   <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="submitForm">提交订单</van-button>
 </submit-layout>
 <submit-layout wx:if="{{admin && form && form.orderStatus == 1}}">
-  <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="cancelForm">取消订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="priceForm">确认定价</van-button>
+  <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="priceForm">确认定价</van-button>
 </submit-layout>
 <submit-layout wx:if="{{admin && form && form.orderStatus == 3}}">
   <van-button plain type="default" custom-style="height:88rpx;width:254rpx" bind:click="repeatForm">重新定价</van-button>
diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index 77ce084..8bf232d 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -197,7 +197,7 @@ Scene({
       createOutOrder(this.data.form).then(result => {
         wx.hideLoading()
         util.showBackToast('处理成功')
-        event.emit('OrderMessage', {  what: 20, desc: 'createOutOrder' })
+        event.emit('OrderMessage', {  what: 21, desc: 'createOutOrder' })
       }).catch(err => {
         wx.hideLoading()
         util.showToast(err)
@@ -207,7 +207,7 @@ Scene({
       recordOutOrder(this.data.form).then(result => {
         wx.hideLoading()
         util.showBackToast('处理成功')
-        event.emit('OrderMessage', {  what: 20, desc: 'recordOutOrder' })
+        event.emit('OrderMessage', {  what: 21, desc: 'recordOutOrder' })
       }).catch(err => {
         wx.hideLoading()
         util.showToast(err)
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index bd828f8..b8eb24e 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -98,7 +98,7 @@
           </view>
         </van-image>
       </view>
-      <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
+      <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"></view>
       <van-cell wx:if="{{poundInfo.netWeight}}">
         <view slot="title" class="flex flex-justify">
           <view class="text-black">净重（公斤）</view>
@@ -111,6 +111,12 @@
           <view class="text-gray">{{poundInfo.operaterName}}</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>
+        </view>
+        <van-uploader file-list="{{ fileList }}" deletable="{{false}}" show-upload="{{false}}" />
+      </view>
     </van-collapse-item>
   </van-collapse>
 </view>
diff --git a/pages/storage/order-list/index.wxml b/pages/storage/order-list/index.wxml
index 8c89842..1497d49 100644
--- a/pages/storage/order-list/index.wxml
+++ b/pages/storage/order-list/index.wxml
@@ -53,8 +53,8 @@
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx" data-page="{{pageIndex}}" data-index="{{index}}"
             bind:click="lookItem" wx:if="{{item.status == 0}}">去审核</van-button>
-          <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
-            bind:click="lookItem" wx:if="{{item.status == 0}}">去收款</van-button>
+          <!-- <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;" data-page="{{pageIndex}}" data-index="{{index}}"
+            bind:click="lookItem" wx:if="{{item.status == 0}}">去收款</van-button> -->
         </view>
       </view>
     </view>
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index ccc36b2..a13989e 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -51,11 +51,24 @@ Scene({
         }
         if(result.data.outboundDeliveryOrderSettlementInfo.id){
           result.data.outboundDeliveryOrderSettlementInfo.netWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.netWeight, 1000)
+          this.data.imageList = []
+          if(result.data.outboundDeliveryOrderSettlementInfo.weightNoteImageUrlsArr){
+            for (let index = 0; index < result.data.outboundDeliveryOrderSettlementInfo.weightNoteImageUrlsArr.length; index++) {
+              const element = result.data.outboundDeliveryOrderSettlementInfo.weightNoteImageUrlsArr[index]
+              if(!util.isEmpty(element)){
+                this.data.imageList.push({ url: element})
+              }
+            }
+          }
+          if(!result.data.outboundDeliveryOrderSettlementInfo.categoryId){
+            result.data.outboundDeliveryOrderSettlementInfo.categoryId = result.data.outboundDeliveryOrder.productId
+          }
           this.setData({ 
             safeBottom: app.globalData.safeBottom, 
             poundInfo: result.data.weightNote, 
             orderInfo: result.data.outboundDeliveryOrder,
-            form: result.data.outboundDeliveryOrderSettlementInfo
+            form: result.data.outboundDeliveryOrderSettlementInfo,
+            imageList: this.data.imageList
           })
         } else {
           this.data.form.id = result.data.outboundDeliveryOrder.id
@@ -68,7 +81,6 @@ Scene({
         wx.hideLoading()
       }).catch(err => {
         wx.hideLoading()
-        console.log(err)
         util.showToast(err)
       })
     }
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index c8d8b91..1c1c6a4 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -6,34 +6,27 @@
 
 <view wx:if="{{orderInfo}}">
   <view class="flex flex-center bg-white" style="justify-content: flex-start;padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
-    <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
-    <view class="text-black text-sg text-bold" style="margin-left: 12rpx">结算信息</view>
+    <view class="flex flex-center" style="flex: 1;justify-content: flex-start">
+      <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
+      <view class="text-black text-sg text-bold" style="margin-left: 12rpx">结算信息</view>
+    </view>
+    <!-- <view class="text-red text-cancel" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="closeForm">关闭订单</view> -->
+    <van-button type="danger" round custom-style="width:120rpx" size="mini" bind:click="closeForm">关闭订单</van-button>
   </view>
-  <van-cell center clickable is-link arrow-direction="down" bind:click="showCategory">
+  <van-cell center required clickable is-link arrow-direction="down" bind:click="showCategory">
     <view slot="title" class="flex flex-justify">
       <view class="flex flex-center text-black">
-        <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>废纸品类</text>
       </view>
       <view class="{{form.categoryName ? 'text-black' : 'text-gray'}}">{{form.categoryName || '请选择废纸品类'}}</view>
     </view>
   </van-cell>
-  <van-field id="settleUnitPrice" value="{{ form.settleUnitPrice || '' }}" type="digit" placeholder="{{form.konePrice || '请输入结算单价'}}" clearable input-align="right" bind:change="bindInput">
-    <view slot="label" class="flex text-black" style="width:240rpx">
-      <view class="text-red text-xl" style="line-height: 10px; padding-top: 12px">*</view>
-      <text>结算单价(元/吨)</text>
-    </view>
-  </van-field>
-  <van-field id="netWeight" value="{{ form.netWeight || '' }}" type="digit" placeholder="请输入净重" clearable input-align="right" bind:change="bindInput">
-    <view slot="label" class="flex text-black" style="width:200rpx">
-      <view class="text-red text-xl" style="line-height: 10px; padding-top: 12px">*</view>
-      <text>净重(吨)</text>
-    </view>
-  </van-field>
+  <van-field id="settleUnitPrice" required value="{{ form.settleUnitPrice || '' }}" type="digit" label="结算单价(元/吨)" title-width="240rpx" placeholder="{{form.konePrice || '请输入结算单价'}}" clearable input-align="right" bind:change="bindInput"></van-field>
+  <van-field id="netWeight" required value="{{ form.netWeight || '' }}" type="digit" label="净重(吨)" placeholder="请输入净重" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="deductPercent" value="{{ form.deductPercent || '' }}" label="扣点(%)" maxlength="4" type="digit" placeholder="请输入扣点" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="settleWeight" value="{{ form.settleWeight || '' }}" 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="settlePrice" value="{{ form.settlePrice || '' }}" label="结算金额(元)" maxlength="8" type="digit" placeholder="请输入结算金额" clearable input-align="right" bind:change="bindInput"></van-field>
+  <van-field id="settlePrice" value="{{ form.settlePrice || '' }}" title-width="240rpx" label="纸厂结算金额(元)" maxlength="8" type="digit" placeholder="请输入结算金额" clearable input-align="right" bind:change="bindInput"></van-field>
   <van-field id="proxyPaySurcharge" value="{{ form.proxyPaySurcharge || '' }}" label="代卖费(元)" maxlength="8" type="digit" placeholder="请输入代卖费" clearable input-align="right" bind:change="bindInput"></van-field>
   <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>
@@ -136,7 +129,7 @@
         </view>
       </van-image>
     </view>
-    <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx"></view>
+    <view class="van-hairline--top" style="height:1px;margin-top: 24rpx;margin-left: 24rpx" wx:if="{{poundInfo.totalWeighingPicture.length}}"></view>
     <van-cell wx:if="{{poundInfo.netWeight}}">
       <view slot="title" class="flex flex-justify">
         <view class="text-black">净重（公斤）</view>
@@ -149,6 +142,12 @@
         <view class="text-gray">{{poundInfo.operaterName}}</view>
       </view>
     </van-cell>
+    <view class="bg-white" style="padding: 20rpx 32rpx" wx:if="{{imageList && imageList.length}}">
+      <view class="flex flex-justify" style="padding-bottom: 20rpx">
+        <text class="text-black">出货凭证</text>
+      </view>
+      <van-uploader file-list="{{ imageList }}" deletable="{{false}}" show-upload="{{false}}" />
+    </view>
   </van-collapse-item>
 </van-collapse>
 
@@ -160,9 +159,8 @@
 
 <view style="height:16rpx" wx:if="{{orderInfo && orderInfo.status == 1}}"></view>
 <submit-layout wx:if="{{orderInfo && orderInfo.status == 1}}">
-  <van-button type="danger" custom-style="height:88rpx;width:186rpx" bind:click="closeForm">关闭订单</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="saveForm">保存</van-button>
-  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:218rpx" bind:click="settlementForm">确认收款</van-button>
+  <van-button custom-style="height:88rpx;width:254rpx" bind:click="saveForm">保存</van-button>
+  <van-button type="info" custom-style="margin-left:32rpx;height:88rpx;width:400rpx" bind:click="settlementForm">确认收款</van-button>
 </submit-layout>
 
 <van-popup position="bottom" show="{{ visible }}" bind:close="onHide" z-index="29">