diff --git a/pages/process/outside-price/index.js b/pages/process/outside-price/index.js
index cb70c62..3183b96 100644
--- a/pages/process/outside-price/index.js
+++ b/pages/process/outside-price/index.js
@@ -39,20 +39,24 @@ Scene({
wx.hideLoading()
this.data.param.offsiteGrossWeight = result.data.offsiteGrossWeight
this.data.param.offsiteTareWeight = result.data.offsiteTareWeight
- var height = app.globalData.fragmentHeight - app.globalData.safeBottom - 120
+ var admin = app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0
+ var height = app.globalData.fragmentHeight - app.globalData.safeBottom
+ if(admin){
+ height = app.globalData.fragmentHeight - app.globalData.safeBottom - 120
+ }
var imageList = []
if(result.data.orderImageList && result.data.orderImageList.length){
for (let index = 0; index < result.data.orderImageList.length; index++) {
imageList.push({url: result.data.orderImageList[index]})
}
}
- // var grossList = []
- // if(result.data.onsideGrossWeightImageList && result.data.onsideGrossWeightImageList.length){
- // for (let index = 0; index < result.data.onsideGrossWeightImageList.length; index++) {
- // grossList.push({url: result.data.onsideGrossWeightImageList[index]})
- // }
- // }
- this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, height, imageList })
+ var grossList = []
+ if(result.data.onsideGrossWeightImageList && result.data.onsideGrossWeightImageList.length){
+ for (let index = 0; index < result.data.onsideGrossWeightImageList.length; index++) {
+ grossList.push({url: result.data.onsideGrossWeightImageList[index]})
+ }
+ }
+ this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, height, imageList, grossList })
}).catch(err => {
wx.hideLoading()
util.showToast(err)
diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml
index e498bd2..4d35669 100644
--- a/pages/process/outside-price/index.wxml
+++ b/pages/process/outside-price/index.wxml
@@ -79,12 +79,7 @@
厂内毛重凭证
-
-
-
-
-
+
@@ -137,13 +132,13 @@
厂外毛重(公斤)
-
+
*
订单凭证
- 3-9张以内,每张图片大小限制5M
+ 3-9张以内,每张图片大小限制5M