|
@@ -132,7 +132,7 @@
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
- return total
|
|
|
+ return total.toFixed(2)
|
|
|
},
|
|
|
// 总重量
|
|
|
totalWeight() {
|
|
@@ -188,6 +188,7 @@
|
|
|
this.typeData.map(k =>{
|
|
|
let p = {
|
|
|
typeCode: k.code,
|
|
|
+ typeName: k.dispName,
|
|
|
typeList: []
|
|
|
}
|
|
|
console.log(p,'pppppp')
|
|
@@ -230,7 +231,8 @@
|
|
|
},
|
|
|
// 提交
|
|
|
submit() {
|
|
|
- let arr = []
|
|
|
+ let arr = [] // 有重量也有价格
|
|
|
+ let arrP = [] // 有重量没有价格
|
|
|
this.list.map(item =>{
|
|
|
item.typeList.map(k =>{
|
|
|
if(k.rubbishWeight && k.customerPrice) {
|
|
@@ -243,8 +245,23 @@
|
|
|
}
|
|
|
arr.push(p)
|
|
|
}
|
|
|
+ if(k.rubbishWeight && !k.customerPrice) {
|
|
|
+ let p = {
|
|
|
+ name: item.typeName,
|
|
|
+ itemName: k.name
|
|
|
+ }
|
|
|
+ arrP.push(p)
|
|
|
+ }
|
|
|
})
|
|
|
})
|
|
|
+ if(arrP.length) {
|
|
|
+ uni.showToast({
|
|
|
+ title: `请输入【 ${arrP[0].name} 】中 【${arrP[0].itemName}】的价格!`,
|
|
|
+ icon: 'none',
|
|
|
+ duration: 3000
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
if(arr.length==0) {
|
|
|
uni.showToast({
|
|
|
title: '请先输入重量且合计金额必须大于0!',
|
|
@@ -252,6 +269,15 @@
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ let item = arr.find(item=>!item.rubbishPrice)
|
|
|
+ if(item) {
|
|
|
+ uni.showToast({
|
|
|
+ title: '请先输入重量且合计金额必须大于0!',
|
|
|
+ icon: 'none'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
if (!this.payType) {
|
|
|
uni.showToast({
|
|
|
title: '请选择支付方式!',
|