修改先付订单未支付显示已退款问题
This commit is contained in:
@@ -165,9 +165,9 @@
|
||||
<script>
|
||||
import { $activateByOrderId } from "@/api/table";
|
||||
import {
|
||||
returnProductCouponAllPrice,
|
||||
returnProductCouponAllPrice,returnProductCoupon,
|
||||
returnProductCouponPrice,
|
||||
returnFullReductionCouponAllPrice,
|
||||
returnFullReductionCouponAllPrice,returnNewGoodsList
|
||||
} from "../util";
|
||||
let $originFullReductionCoupon = [];
|
||||
export default {
|
||||
@@ -327,15 +327,15 @@ export default {
|
||||
} else {
|
||||
this.quansSelArr.unshift(row);
|
||||
}
|
||||
if(!this.fullReductionCouponSel.id){
|
||||
return
|
||||
if (!this.fullReductionCouponSel.id) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (
|
||||
this.orderPrice -
|
||||
this.fullReductionCouponDiscount -
|
||||
this.goodsDiscount <
|
||||
this.fullReductionCouponSel.fullAmount
|
||||
this.fullReductionCouponSel.fullAmount
|
||||
) {
|
||||
this.fullReductionCouponSel = { id: "" };
|
||||
this.quansSelArr.splice(0, 1);
|
||||
@@ -396,21 +396,16 @@ export default {
|
||||
memberId: data.memberId,
|
||||
});
|
||||
quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
|
||||
(v) => this.orderPrice >= v.fullAmount
|
||||
(v) => {
|
||||
return this.orderPrice >= v.fullAmount && v.use;
|
||||
}
|
||||
);
|
||||
const canDikouGoodsArr = returnNewGoodsList(this.goodsArr|| [])
|
||||
$originFullReductionCoupon = quansRes.fullReductionCoupon;
|
||||
this.quans.productCoupon = quansRes.productCoupon
|
||||
.map((v) => {
|
||||
return {
|
||||
...v,
|
||||
discountAmount: returnProductCouponPrice(
|
||||
v,
|
||||
this.goodsArr,
|
||||
this.vipUser
|
||||
),
|
||||
};
|
||||
})
|
||||
.filter((v) => v.discountAmount > 0);
|
||||
this.quans.productCoupon = quansRes.productCoupon.map(v=>{
|
||||
const coup = returnProductCoupon(v, canDikouGoodsArr,this.vipUser)
|
||||
return coup
|
||||
}).filter(v=>v.use)
|
||||
// this.quans = quans;
|
||||
this.filterFullReductionCoupon();
|
||||
this.quansSelArr = this.propSelCoup;
|
||||
|
||||
Reference in New Issue
Block a user