diff --git a/pages/login/index.js b/pages/login/index.js
index 162b2f5..2b43731 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -147,7 +147,11 @@ Page({
})
}).catch(err => {
wx.hideLoading()
- util.showToast(err)
+ if(err !== null && err instanceof Object) {
+ util.showToast('服务器错误')
+ } else {
+ util.showToast(err)
+ }
config.header = null
this.setData({ loging: false})
})
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index 73ab2ac..cf05ee1 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -4,6 +4,7 @@ import Dialog from '../../../components/dialog/dialog'
import { repeatSideOrder, getSideOrderInfo, printOrder} from "../../../api/saas"
const event = require('../../../utils/event')
const util = require('../../../utils/util')
+const math = require('../../../utils/math')
const app = getApp()
Scene({
@@ -23,12 +24,17 @@ Scene({
wx.showLoading({ title: '正在获取', mask: true })
getSideOrderInfo({id: options.id}).then(result => {
wx.hideLoading()
+ result.data.settleTotalAmount = 0
+ result.data.settleTotalWeight = 0
for (let index = 0; index < result.data.productCategoryInfos.length; index++) {
const element = result.data.productCategoryInfos[index]
element.fileList = []
for (let k = 0; k < element.weightNoteImages.length; k++) {
element.fileList.push({url: element.weightNoteImages[k]})
}
+ element.settlePrice = math.times(element.settleWeight, element.settleUnitPrice)
+ result.data.settleTotalAmount = math.plus(result.data.settleTotalAmount, element.settlePrice)
+ result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
}
this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
}).catch(err => {
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index 775162c..7e6fe51 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -4,7 +4,29 @@
-
+
+
+
+ 待过磅审核
+
+ 重新定价
+
+
+
+ 待付款
+
+
+
+ 代付审核中
+
+
+
+ 待结算
+
+
+
+ 已完成
+
客户姓名
@@ -36,7 +58,42 @@
-
+
+
+ 厂外皮重(公斤)
+ {{form.offsiteTareWeight || '- -'}}
+
+
+
+
+ 厂外毛重(公斤)
+ {{form.offsiteGrossWeight || '- -'}}
+
+
+
+
+ 净重(公斤)
+ {{form.offsiteGrossWeight || '- -'}}
+
+
+
+
+ 预计总金额(元)
+ {{form.estimatedTotalAmount || '- -'}}
+
+
+
+
+ 厂内毛重(公斤)
+ {{form.onsideGrossWeight || '- -'}}
+
+
+
+
+ 厂内厂外毛重差异(公斤)
+ {{form.onsideAndOffsiteDifferences || '- -'}}
+
+
@@ -111,31 +168,13 @@
结算总重量(公斤)
- {{form.totalNetWeight || '- -'}}
+ {{form.settleTotalWeight || '- -'}}
结算总金额(元)
- {{form.totalSettleWeight || '- -'}}
-
-
-
-
- 厂内毛重(公斤)
- {{form.onsideGrossWeight || '- -'}}
-
-
-
-
- 厂外皮重(公斤)
- {{form.offsiteTareWeight || '- -'}}
-
-
-
-
- 厂外毛重(公斤)
- {{form.offsiteGrossWeight || '- -'}}
+ {{form.settleTotalAmount || '- -'}}
diff --git a/pages/process/outside-info/index.wxss b/pages/process/outside-info/index.wxss
index 14a8a3a..5f1972f 100644
--- a/pages/process/outside-info/index.wxss
+++ b/pages/process/outside-info/index.wxss
@@ -1,4 +1,10 @@
/* pages/process/order-check/index.wxss */
+.info_status{
+ background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
+ height:90rpx;
+ padding: 0rpx 32rpx;
+}
+
.cate-list {
margin: 24rpx 30rpx;
border: 1rpx solid #dcdcdc;
diff --git a/pages/process/outside-price/index.wxml b/pages/process/outside-price/index.wxml
index 86926d0..089ad88 100644
--- a/pages/process/outside-price/index.wxml
+++ b/pages/process/outside-price/index.wxml
@@ -15,6 +15,13 @@
待定价
+
+
+
+ 待过磅审核
+
+ 重新定价
+
@@ -32,19 +39,19 @@
司机
- {{form.driverName || '请选择司机'}}
+ {{form.driverName || '- -'}}
-
+
操作员
- {{form.predictDeliveryToFactoryTime}}
+ {{form.operatorName}}
-
+
预计到厂时间
- {{form.appointDate || '请选择预计到厂时间'}}
+ {{form.predictDeliveryToFactoryTime || '- -'}}