diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js
index 830d770..eea0a96 100644
--- a/pages/agent/edit/index.js
+++ b/pages/agent/edit/index.js
@@ -68,8 +68,8 @@ Page({
}
if(!util.isEmpty(element.unitPrice)){
var unitPrice = math.times(element.unitPrice, 1000)
- if(element.uPrice && Number(element.uPrice) > 0){
- unitPrice = math.times(math.plus(element.unitPrice, element.uPrice), 1000)
+ if(element.publicSubsidies && Number(element.publicSubsidies) > 0){
+ unitPrice = math.times(math.plus(element.unitPrice, element.publicSubsidies), 1000)
}
this.data.cateList.push({value: element.categoryId, text: element.categoryName + '(预估单价:' + unitPrice + '元/吨)'})
}
@@ -210,16 +210,16 @@ Page({
const element = this.data.factoryDetail.paperCategoryList[index]
if(element.categoryId == detail.value){
this.data.form.unitPrice = element.unitPrice
- if(element.uPrice && Number(element.uPrice) > 0){
- this.data.form.uPrice = element.uPrice
- this.data.form.unitPrice = math.plus(element.unitPrice, element.uPrice)
+ if(element.publicSubsidies && Number(element.publicSubsidies) > 0){
+ this.data.form.publicSubsidies = element.publicSubsidies
+ this.data.form.unitPrice = math.plus(element.unitPrice, element.publicSubsidies)
}
this.data.cateName = element.categoryName
break
}
}
this.data.form.paperCategoryId = detail.value
- this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.uPrice']: this.data.form.uPrice, cateName: this.data.cateName })
+ this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies, cateName: this.data.cateName })
}
},
onEvent: function (message) {
diff --git a/pages/agent/edit/index.wxml b/pages/agent/edit/index.wxml
index 575cd56..41e9425 100644
--- a/pages/agent/edit/index.wxml
+++ b/pages/agent/edit/index.wxml
@@ -39,7 +39,7 @@
预估单价(元/吨):
{{formate.formatePrice(form.unitPrice)}}
- (已含补贴{{formate.formatePrice2(form.uPrice, 0)}})
+ (已含补贴{{formate.formatePrice2(form.publicSubsidies, 0)}})
diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js
index a0e51f4..662e817 100644
--- a/pages/agent/factory-fragment/index.js
+++ b/pages/agent/factory-fragment/index.js
@@ -79,13 +79,7 @@ Component({
if (this.data.requesting) {
return
}
- this.setData({
- orderList: [],
- tabIndex: this.data.tabIndex,
- ['form.pageNum']: 1,
- loading: true,
- finished: false
- })
+ this.setData({ orderList: [], tabIndex: this.data.tabIndex, ['form.pageNum']: 1, loading: true, finished: false })
this.fetchPapersList()
},
// 获取特价列表
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index 3e0d755..7881f51 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -59,7 +59,7 @@
{{item.categoryName}}
{{priceItem(item, kg)}}
- (已含补贴{{formate.formatePrice2(item.uPrice, kg)}})
+ (已含补贴{{formate.formatePrice2(item.publicSubsidies, kg)}})
暂无报价
@@ -181,14 +181,14 @@
function priceItem(item, kg) {
if(kg){
- if(item.uPrice && Number(item.uPrice) > 0){
- let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice)
+ if(item.publicSubsidies && Number(item.publicSubsidies) > 0){
+ let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies)
return (parseFloat(price)).toFixed(3) + '元/KG'
}
return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG'
} else {
- if(item.uPrice && Number(item.uPrice) > 0){
- let price = parseFloat(item.unitPrice) + parseFloat(item.uPrice)
+ if(item.publicSubsidies && Number(item.publicSubsidies) > 0){
+ let price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies)
return (parseFloat(price) * 1000).toFixed(1) + '元/吨'
}
return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨'
diff --git a/pages/withdrawal/vcheckout/index.wxml b/pages/withdrawal/vcheckout/index.wxml
index 745820a..d3f0d3e 100644
--- a/pages/withdrawal/vcheckout/index.wxml
+++ b/pages/withdrawal/vcheckout/index.wxml
@@ -3,9 +3,9 @@
申请提现
-
+
+ 提现额度:对私100万/天,对公1000万/天
提现到账:对私预计两小时内到账,对公预计下一个工作日内到账
- 提现申请后T+1个工作日到账(周六、周日及节假日顺延到工作日),如有疑问请联系客服400-6881-001
@@ -26,7 +26,9 @@
全部提现
-
+
+ 提现申请后T+1个工作日到账(周六、周日及节假日顺延到工作日),如有疑问请联系客服400-6881-001
+