diff --git a/app.js b/app.js
index 679502a..c4f32a3 100644
--- a/app.js
+++ b/app.js
@@ -1,11 +1,11 @@
 //app.js
 App({
-  evn: 1, // 0: 开发版本；1：测试版本；2：生产版本
+  evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
   tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
   version: '2.4.0',
   xAppId: '503258978847953926',
   userInfo: null,
-  //----------------------------------------------globalData--------------------------------------
+  //-------------------------------------------globalData--------------------------------------
   globalData: {
     token: null,
     agenting: 1,
diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js
index 9f2e880..961d232 100644
--- a/pages/process/order-price/index.js
+++ b/pages/process/order-price/index.js
@@ -19,7 +19,8 @@ Scene({
     focus: 0,
     visible: false,
     plateList: [],
-    nowItem: null
+    nowItem: null,
+    konePrice: '请输入单价'
   },
   /**
    * 生命周期函数--监听页面加载
@@ -92,8 +93,9 @@ Scene({
     this.data.cIndex = e.currentTarget.dataset.index
     this.data.nowItem = this.data.paperList[this.data.cIndex]
     this.data.form.productId = this.data.nowItem.id
-    var unitPrice = this.data.nowItem.defaultUnitPrice
-    this.setData({ visible: false, ['form.productName']: this.data.nowItem.name, ['form.unitPrice']: unitPrice, cIndex: this.data.cIndex })
+    var konePrice = '指导价格：' + this.data.nowItem.defaultUnitPrice
+    // this.setData({ visible: false, ['form.productName']: this.data.nowItem.name, ['form.unitPrice']: unitPrice, cIndex: this.data.cIndex })
+    this.setData({ visible: false, ['form.productName']: this.data.nowItem.name, konePrice, cIndex: this.data.cIndex })
   },
   loop: function(){
     return false
diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml
index 453b6db..c0de98c 100644
--- a/pages/process/order-price/index.wxml
+++ b/pages/process/order-price/index.wxml
@@ -70,7 +70,7 @@
         placeholder="请输入单价" value="{{form.unitPrice || ''}}" bindinput="bindInput" />
     </view>
   </van-cell> -->
-  <van-field id="unitPrice" value="{{ form.unitPrice || '' }}" type="digit" placeholder="请输入单价" clearable input-align="right" bind:change="bindInput">
+  <van-field id="unitPrice" value="{{ form.unitPrice || '' }}" type="digit" placeholder="{{konePrice}}" 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>
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index 863a0ad..ca2d61f 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -49,8 +49,8 @@ Scene({
         if(result.data.weightNote.secondWeightImageUrl2){
           result.data.weightNote.totalWeighingPicture.push(result.data.weightNote.secondWeightImageUrl2)
         }
-        result.data.outboundDeliveryOrderSettlementInfo.netWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.netWeight, 1000)
         if(result.data.outboundDeliveryOrderSettlementInfo.id){
+          result.data.outboundDeliveryOrderSettlementInfo.netWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.netWeight, 1000)
           this.setData({ 
             safeBottom: app.globalData.safeBottom, 
             poundInfo: result.data.weightNote, 
@@ -68,6 +68,7 @@ Scene({
         wx.hideLoading()
       }).catch(err => {
         wx.hideLoading()
+        console.log(err)
         util.showToast(err)
       })
     }
@@ -148,9 +149,10 @@ Scene({
   closeForm: function(){
     Dialog.confirm({ title: '温馨提示',  message: '确定关闭该出货单？' }).then(() => {
       wx.showLoading({ title: '正在处理', mask: true })
-      closeOutOrder( {id: this.data.form.id }).then(result => {
+      closeOutOrder( {id: this.data.orderInfo.id }).then(result => {
         wx.hideLoading()
-        util.showBackToast('磅单处理成功')
+        event.emit('OrderMessage', {  what: 21, desc: 'closeOrder' })
+        util.showBackToast('出货单已关闭')
       }).catch(err => {
         wx.hideLoading()
         util.showToast(err)