diff --git a/pages/agent/detail/item-money-info/money-info.wxml b/pages/agent/detail/item-money-info/money-info.wxml
index 939a8f1..4b6e857 100644
--- a/pages/agent/detail/item-money-info/money-info.wxml
+++ b/pages/agent/detail/item-money-info/money-info.wxml
@@ -4,7 +4,8 @@
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 
 <!-- 预付款 -->
-<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
+<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="flex flex-justify text-sg">
 		<text class="text-black">预计总金额</text>
@@ -28,7 +29,7 @@
 		<text class="text-black">代卖费</text>
 		<text style="">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
 	</view>
-	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}" >
+	<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}">
 		<text class="text-gray">代卖费单价 x 净重</text>
 		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge)}} x
 			{{formate.formateWeight3(item.weightnoteInfo.netWeight)}}</view>
@@ -42,7 +43,7 @@
 <!-- 尾款 只有活动订单才会有这个字段,并且这个字段=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="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>
@@ -64,11 +65,21 @@
 			<text class="text-black">调节费</text>
 			<text style="">-{{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">
-			<text class="text-black">补贴与扣款</text>
+		<view wx:if="{{item.totalOtherAmount}}" class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
+			<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:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
+			wx:if="{{item.refundSubsidy}}">
+			<text class="text-black">返还补贴</text>
+			<text style="">{{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>
+		</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>
@@ -80,8 +91,8 @@
 	</view>
 </view>
 <!-- 全款 非活动订单,或者一次性付款的活动订单 , 在待审核和待结算,已完成下 , 显示全款信息, -->
-<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}" class="bg-white"
-	style="padding: 24rpx 30rpx;margin-top:16rpx">
+<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}"
+	class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
 	<view class="flex flex-justify text-sg">
 		<text class="text-black">总金额</text>
 		<text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text>
@@ -95,7 +106,7 @@
 		<text class="text-black">代卖费</text>
 		<text style="">{{formate.formateAmount(item.surcharge) || 0}}元</text>
 	</view>
-	<view class="flex flex-justify text-xs" style="margin-top:2rpx"  wx:if="{{item.proxySellerSettleType==1}}">
+	<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
 		<text class="text-gray">代卖费单价 x 结算重量</text>
 		<view class="text-gray">{{formate.formatePrice2(item.unitSurcharge==null?0:item.unitSurcharge)}} x
 			{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}</view>
@@ -111,10 +122,20 @@
 		<text style="">{{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>
+		wx:if="{{item.totalOtherAmount}}">
+		<text class="text-black">纸厂补贴与扣款</text>
 		<text style="">{{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}}">
+		<text class="text-black">返还补贴</text>
+		<text style="">{{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>
+	</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>
diff --git a/pages/agent/detail/order-info/order-info.wxml b/pages/agent/detail/order-info/order-info.wxml
index ff2d51c..db3d857 100644
--- a/pages/agent/detail/order-info/order-info.wxml
+++ b/pages/agent/detail/order-info/order-info.wxml
@@ -15,7 +15,7 @@
 			<text class="text-black">创建时间</text>
 			<text class="text-gray">{{orderInfo.createTime}}</text>
 		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+		<view wx:if="{{orderInfo.remark}}" 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">{{orderInfo.remark || ''}}</text>
 		</view>
diff --git a/pages/agent/detail/pound-info/pound-info.wxml b/pages/agent/detail/pound-info/pound-info.wxml
index fde7c3b..c607918 100644
--- a/pages/agent/detail/pound-info/pound-info.wxml
+++ b/pages/agent/detail/pound-info/pound-info.wxml
@@ -24,29 +24,20 @@
     <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" style="margin-left: -32rpx">补贴与扣款</text>
+            <text class="text-sg text-black" 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" wx:for="{{ item.otherAmountDtoList }}" wx:for-item="cell" wx:for-index="cellIndex" wx:key="cellIndex" style="margin-top:{{cellIndex==0?0:20}}px;font-size:28rpx">
           <text class="text-black">{{cell.title}}</text>
           <text class="text-gray">{{formate.formateAmount(cell.amount==null?0:cell.amount)}}元</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.deductionNotes==null? '':item.deductionNotes}}</text>
-        </view>
+        </view>      
       </wux-accordion>
     </wux-accordion-group>
   </view>
@@ -61,4 +52,8 @@
     <sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}">
     </sudoku-image>
   </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.deductionNotes==null? '':item.deductionNotes}}</text>
+        </view>
 </view>
\ No newline at end of file
diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js
index c141cf4..dd08453 100644
--- a/pages/article/detail/index.js
+++ b/pages/article/detail/index.js
@@ -285,12 +285,9 @@ Page({
     var context = wx.createCanvasContext('mycanvas');
     context.setFillStyle("red")
     context.fillRect(0, 0, 375, 667)
-    var path = "/assets/image/def_image.png";
     var path2 = "/assets/image/def_image.png";
-    var path3 = "/assets/image/def_image.png";
-    var path4 = "/assets/image/def_image.png";
-    var path5 = "/assets/image/def_image.png";
-    context.drawImage(path2, 126, 186, 120, 120);
+    context.drawImage(path2, 0, 0, 375,667)
+    // context.drawImage(path2, 0, 0, 120, 120);
     // context.save(); // 保存当前context的状态
 
     var name = 'hahahaha';
diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml
index 8dd2cf0..5dac308 100644
--- a/pages/article/detail/index.wxml
+++ b/pages/article/detail/index.wxml
@@ -74,7 +74,7 @@
 
 <view class="cu-bar foot input" style="bottom:{{inputBottom}}px" wx:if="{{momentDetail}}">
 	<view class="flex flex-center" style="height:{{100 + safeBottom}}rpx;padding-bottom: {{safeBottom}}rpx;" wx:if="{{!focus}}">
-		<view class="search-form" style="border-radius: 12rpx;width:440rpx;margin-left: 32rpx" bindtap="showComment">
+		<view class="search-form" style="border-radius: 12rpx;width:370rpx;margin-left: 32rpx" bindtap="showComment">
 			<input placeholder="点击输入评论" disabled="true" adjust-position="{{false}}" focus="{{false}}"></input>
 		</view>
 		<view class="action" style="margin-right:24rpx">
@@ -94,11 +94,11 @@
 			</button>
 		</view>
 		<!-- 生成海报点击图标  -->
-		<!-- <view class="roder-add flex flex-center">
+		<view class="roder-add flex flex-center">
 			<button bindtap="createNewImg" class="share-btn">
 				<text class="cuIcon-news text-black" style="font-size:27px;"></text>
 			</button>
-		</view> -->
+		</view>
 	</view>
 	<view style="padding:30rpx 10rpx 30rpx 30rpx;width:100%" wx:else>
 		<textarea id="content" maxlength="180" style="height:160rpx;width:100%" focus="{{focus}}" cursor-spacing="40" show-confirm-bar="{{false}}" adjust-position="{{false}}" bindinput="bindInput" placeholder="输入评论，最多180字" placeholder-style="color:#aaa" bindfocus="inputFocus" bindblur="inputBlur"></textarea>
@@ -107,13 +107,14 @@
 		</view>
 	</view>
   <!--生成海报  -->
-    <!-- <view class='imagePathBox' hidden="{{maskHidden == false}}">
-      <image src="{{imagePath}}" class='shengcheng'></image>
-      <button class='baocun' bindtap='baocun'>保存相册，分享到朋友圈</button>
+    <view class='imagePathBox' hidden="{{maskHidden == false}}">
+			<image src="{{imagePath}}" class='shengcheng'></image>    
+			<button class='baocun' bindtap='baocun'>保存相册，分享到朋友圈</button>
     </view>
    <view hidden="{{maskHidden == false}}" class="mask"></view> 
   <view class="canvas-box">
-      <canvas  style="width: 375px;height: 667px;position:fixed;top:9999px" canvas-id="mycanvas"/>
-  </view> -->
+			<canvas  style="width: 375px;height: 667px;position:fixed;top:9999px" canvas-id="mycanvas"/>
+			
+  </view>
 </view>
   
\ No newline at end of file
diff --git a/pages/article/detail/index.wxss b/pages/article/detail/index.wxss
index a0b76d5..44d78f9 100644
--- a/pages/article/detail/index.wxss
+++ b/pages/article/detail/index.wxss
@@ -52,9 +52,10 @@
   line-height: 80rpx;
   text-align: center;
   position: fixed;
-  bottom: 90rpx;
   left: 6%;
   background: red;
   color: white;
   font-size: 32rpx;
+  top:82%;
+  z-index: 11;
 }