diff --git a/pages/home/factory-info/index.js b/pages/home/factory-info/index.js
index ceff0f7..894cb90 100644
--- a/pages/home/factory-info/index.js
+++ b/pages/home/factory-info/index.js
@@ -36,6 +36,17 @@ Scene({
var data = {settlePriceType: Number(this.data.settlePriceType), settleType: Number(this.data.settleType) }
configFactory(data).then(result => {
wx.hideLoading()
+ for (let mIndex = app.userInfo.enterpriseInfos.length - 1; mIndex >= 0; mIndex--) {
+ const element = app.userInfo.enterpriseInfos[mIndex]
+ for (let nIndex = element.factoryInfos.length - 1; nIndex >= 0; nIndex--) {
+ const item = element.factoryInfos[nIndex]
+ if(item.factoryId == app.userInfo.factoryId){
+ item.settlePriceType = Number(this.data.settlePriceType)
+ item.settleType = Number(this.data.settleType)
+ break
+ }
+ }
+ }
app.userInfo.factory.settlePriceType = Number(this.data.settlePriceType)
app.userInfo.factory.settleType = Number(this.data.settleType)
util.showBackToast('保存成功')
diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 54b2e68..9644b29 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -160,7 +160,7 @@
结算金额(元)
- {{formate.formateAmount(form.settlePrice, 2) || '- -'}}
+ {{formate.formateAmount(form.adjustedPrice, 2) || '- -'}}
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index 734edfa..41788f0 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-list/index.wxml
@@ -58,7 +58,7 @@
结算金额(元):
- {{item.settlePrice || '- -'}}
+ {{item.adjustedPrice || '- -'}}
diff --git a/pages/process/outside-check-item/index.wxml b/pages/process/outside-check-item/index.wxml
index 9fc00ae..fb050e9 100644
--- a/pages/process/outside-check-item/index.wxml
+++ b/pages/process/outside-check-item/index.wxml
@@ -74,7 +74,7 @@
结算金额(元)
- {{ item.settlePrice || '- -' }}
+ {{ item.adjustedPrice || '- -' }}
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index caf5127..95cbbc4 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -191,7 +191,7 @@
结算金额(元)
- {{item.settlePrice || '- -'}}
+ {{item.adjustedPrice || '- -'}}
diff --git a/pages/process/outside-item/index.wxml b/pages/process/outside-item/index.wxml
index 51f5cbf..a80108f 100644
--- a/pages/process/outside-item/index.wxml
+++ b/pages/process/outside-item/index.wxml
@@ -105,6 +105,6 @@
结算金额(元)
- {{ item.settlePrice || '- -' }}
+ {{ item.adjustedPrice || '- -' }}
\ No newline at end of file
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index b8eb24e..32e4551 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -165,31 +165,31 @@
结算金额(元)
- {{ form.settlePrice}}
+ {{ form.adjustedPrice}}
-
+
代卖费(元)
{{ form.settlePrice}}
-
+
运费(元)
- {{ form.settlePrice}}
+ {{ form.freight}}
-
+
其他费用(元)
- {{ form.settlePrice}}
+ {{ form.otherFee}}
-
+
补贴(元)
- {{ form.settlePrice}}
+ {{ form.subsidy}}