|
@@ -48,13 +48,13 @@ import AddDiscount from './add-discount'
|
|
/** 保留两位小数向上取整 */
|
|
/** 保留两位小数向上取整 */
|
|
export const numberToTwoUp = (num: number | string) => {
|
|
export const numberToTwoUp = (num: number | string) => {
|
|
num = Number(num)
|
|
num = Number(num)
|
|
- return Math.ceil(num * 1000) / 1000
|
|
|
|
|
|
+ return Math.ceil(Number((num * 100).toFixed(1))) / 100
|
|
}
|
|
}
|
|
|
|
|
|
/** 保留两位小数向下取整 */
|
|
/** 保留两位小数向下取整 */
|
|
export const numberToTwoDown = (num: number | string) => {
|
|
export const numberToTwoDown = (num: number | string) => {
|
|
num = Number(num)
|
|
num = Number(num)
|
|
- return Math.floor(num * 1000) / 1000
|
|
|
|
|
|
+ return Math.floor(Number((num * 100).toFixed(1))) / 100
|
|
}
|
|
}
|
|
|
|
|
|
export default defineComponent({
|
|
export default defineComponent({
|
|
@@ -122,7 +122,7 @@ export default defineComponent({
|
|
},
|
|
},
|
|
countDiscountPrice() {
|
|
countDiscountPrice() {
|
|
const orderObject = orderStatus.orderObject
|
|
const orderObject = orderStatus.orderObject
|
|
- return orderObject.couponAmount || numberToTwoUp(orderObject.couponDiscountPrice + orderObject.discountPrice + orderObject.discountCardPrice)
|
|
|
|
|
|
+ return orderObject.couponAmount || numberToTwoDown(orderObject.couponDiscountPrice + orderObject.discountPrice + orderObject.discountCardPrice)
|
|
}
|
|
}
|
|
},
|
|
},
|
|
async mounted() {
|
|
async mounted() {
|
|
@@ -681,6 +681,10 @@ export default defineComponent({
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.orderGoodsType = tempType
|
|
this.orderGoodsType = tempType
|
|
|
|
+
|
|
|
|
+ console.log(item, this.orderAmount, '-----------------', Number(this.orderAmount) -
|
|
|
|
+ Number(item.discountPrice) -
|
|
|
|
+ Number(orderStatus.orderObject.couponDiscountPrice))
|
|
// 更新优惠券列表
|
|
// 更新优惠券列表
|
|
const useCouponRef: any = this.$refs.useCouponRef
|
|
const useCouponRef: any = this.$refs.useCouponRef
|
|
if(useCouponRef) {
|
|
if(useCouponRef) {
|