diff --git a/src/views/order/components/confirmSubmit.vue b/src/views/order/components/confirmSubmit.vue
index e3014fa..0427a35 100644
--- a/src/views/order/components/confirmSubmit.vue
+++ b/src/views/order/components/confirmSubmit.vue
@@ -64,7 +64,7 @@
{{ row.floorPrice }}元
- {{ (row.floorPrice * row.preQuantity) | toNumberFixed }}元
+ {{ row.preCostAmount | toNumberFixed }}元
@@ -150,20 +150,22 @@ export default {
if (salePrice && floorPrice && preQuantity && preAmount) {
let strategyArr = [
// 原策略
- { salePrice: salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount: preAmount },
+ { salePrice, floorPrice: floorPrice, preQuantity: preQuantity, preAmount, preCostAmount: +floorPrice * +preQuantity },
// 以提货量为准
{
salePrice: this.newSalePrice,
floorPrice: this.newCostPrice,
- preQuantity: preQuantity,
- preAmount: +this.newSalePrice * +preQuantity
+ preQuantity,
+ preAmount: +this.newSalePrice * +preQuantity,
+ preCostAmount: +floorPrice * +preQuantity
},
// 以订单金额为准
{
salePrice: this.newSalePrice,
floorPrice: this.newCostPrice,
preQuantity: +preAmount / +this.newSalePrice,
- preAmount: preAmount
+ preAmount,
+ preCostAmount: +floorPrice * +preQuantity
}
]
strategyArr.forEach((item, index) => {
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index d58ef5b..fddc8ab 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -116,9 +116,10 @@
订单锁定
-
- 下单确认
-
+
+
+ 下单确认
{
- if (res.code == 20000) {
- this.$message.success(res.msg)
- // this.closeWindow()
- this.getByPage()
- }
- })
+ // order.orderSuccess({ id: row.id }).then(res => {
+ // if (res.code == 20000) {
+ // this.$message.success(res.msg)
+ // // this.closeWindow()
+ // this.getByPage()
+ // }
+ // })
},
//启用禁用
switchTrigger(val, row) {