From 1a2117de86cc4aa56a94756475d2c1c6a3931d66 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 28 May 2021 15:24:13 +0800
Subject: [PATCH] no message

---
 components/uploader/index.js            | 2 +-
 pages/process/order-info/index.js       | 2 +-
 pages/process/outside-info/index.js     | 2 +-
 pages/storage/order-info/index.js       | 2 +-
 pages/storage/order-settlement/index.js | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/uploader/index.js b/components/uploader/index.js
index 4cab65f..d10407f 100644
--- a/components/uploader/index.js
+++ b/components/uploader/index.js
@@ -13,7 +13,7 @@ VantComponent({
     useBeforeRead: Boolean,
     afterRead: null,
     beforeRead: null,
-    previewSize: { type: null, value: 90 },
+    previewSize: { type: null, value: 100 },
     name: { type: [Number, String], value: '' },
     accept: { type: String, value: 'image' },
     fileList: { type: Array, value: [], observer: 'formatFileList' },
diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js
index 6c0401b..47db067 100644
--- a/pages/process/order-info/index.js
+++ b/pages/process/order-info/index.js
@@ -73,7 +73,7 @@ Scene({
   },
   printOrder: function(){
     wx.showLoading({ title: '正在处理', mask: true })
-    printOrder({id: this.data.form.id}).then(result => {
+    printOrder({id: this.data.form.id, printType: 1}).then(result => {
       wx.hideLoading()
       util.showToast('即将打印，请稍后')
     }).catch(err => {
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index d7292b4..21c1e99 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -59,7 +59,7 @@ Scene({
   },
   printOrder: function(){
     wx.showLoading({ title: '正在处理', mask: true })
-    printOrder({id: this.data.id}).then(result => {
+    printOrder({id: this.data.id, printType: 2}).then(result => {
       wx.hideLoading()
       util.showToast('即将打印，请稍后')
     }).catch(err => {
diff --git a/pages/storage/order-info/index.js b/pages/storage/order-info/index.js
index 3ec631c..412cf43 100644
--- a/pages/storage/order-info/index.js
+++ b/pages/storage/order-info/index.js
@@ -90,7 +90,7 @@ Scene({
   },
   printOrderInfo: function(){
     wx.showLoading({ title: '正在处理', mask: true })
-    printOrder({id: this.data.form.id, type: 2 }).then(result => {
+    printOrder({id: this.data.form.id, printType: 3 }).then(result => {
       wx.hideLoading()
       util.showToast('即将打印，请稍后')
     }).catch(err => {
diff --git a/pages/storage/order-settlement/index.js b/pages/storage/order-settlement/index.js
index acd88e0..978aa6d 100644
--- a/pages/storage/order-settlement/index.js
+++ b/pages/storage/order-settlement/index.js
@@ -179,7 +179,7 @@ Scene({
       util.showToast('请输入结算重量')
       return
     }
-    var params = { id: this.data.form.id, categoryId: this.data.form.categoryId }
+    var params = { id: this.data.orderInfo.id, categoryId: this.data.form.categoryId }
     params.otherFee = this.data.form.otherFee
     params.unitPrice = this.data.form.unitPrice
     params.estimatedAmount = this.data.form.estimatedAmount