diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue
index 6e11f0c..c08f4f4 100644
--- a/src/views/coupon_manage/components/coupon_details.vue
+++ b/src/views/coupon_manage/components/coupon_details.vue
@@ -91,7 +91,7 @@
Date: Wed, 20 Nov 2024 15:55:31 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
=?UTF-8?q?=E4=B8=8B=E5=8D=95=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C=E7=A7=AF?=
=?UTF-8?q?=E5=88=86=E6=8A=B5=E6=89=A3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tool/Instead/components/pay-type.vue | 9 +++
src/views/tool/Instead/components/quans.vue | 79 ++++++++++++------
src/views/tool/Instead/index.vue | 80 +++++++++++++------
src/views/tool/Instead/quan_util.js | 41 ++++++++--
4 files changed, 153 insertions(+), 56 deletions(-)
diff --git a/src/views/tool/Instead/components/pay-type.vue b/src/views/tool/Instead/components/pay-type.vue
index f5f672d..884fd53 100644
--- a/src/views/tool/Instead/components/pay-type.vue
+++ b/src/views/tool/Instead/components/pay-type.vue
@@ -10,6 +10,7 @@
v-for="(item, index) in list"
:key="index"
:type="sel === item.payType ? 'primary' : ''"
+ :disabled="disabledPayType.includes(item.payType)"
>
{{ item.payName }}
@@ -30,6 +31,10 @@ export default {
type: [String, Number],
default: '',
},
+ disabledPayType:{
+ type:Array,
+ default:()=>[]
+ }
},
data() {
return {
@@ -38,6 +43,10 @@ export default {
};
},
watch: {
+ disabledPayType(){
+ const item = this.list.find(v=>!this.disabledPayType.includes(v.payType))
+ this.sel=item.payType
+ },
sel(newval) {
console.log(newval);
this.$emit("input", newval);
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 2de1167..7540356 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -16,11 +16,7 @@
:data="quans.fullReductionCoupon"
@cell-click="fullReductionCouponClick"
>
-
+
-
+
-
+
@@ -232,11 +225,11 @@ export default {
isVip: false,
};
},
- }
+ },
},
data() {
return {
- orderPrice:0,
+ orderPrice: 0,
fullReductionCouponSel: {
id: "",
},
@@ -297,7 +290,7 @@ export default {
$goodsPayPriceMap[row.proId],
index,
row.num
- );
+ ).toFixed(2);
} else {
return 0;
}
@@ -310,7 +303,8 @@ export default {
const index = this.quansSelArr.findIndex((item) => item.id == row.id);
if (row.type == 2 && index != -1) {
this.quansSelArr.splice(index, 1);
- this.quans.productCoupon[index].checked = false;
+ const proIndex=this.quans.productCoupon.findIndex((v) => v.id == row.id);
+ this.quans.productCoupon[proIndex].checked = false;
}
if (row.type == 1 && index != -1) {
this.fullReductionCouponSel = { id: "" };
@@ -350,16 +344,44 @@ export default {
if (!item.use) {
return;
}
+ const hasSelNum = this.quansSelArr
+ .filter((v) => v.type == 2 && v.proId == item.proId)
+ .reduce((a, b) => {
+ return a + b.num;
+ }, 0);
+ const maxSelNum = $goodsPayPriceMap[item.proId].length;
+ const coupMaxUseNum = Math.min(item.num, maxSelNum - hasSelNum);
+ const canUseNum = Math.min(maxSelNum, coupMaxUseNum);
+
if (this.fullReductionCouponSel.id && !item.checked) {
const goodsQuan = this.quans.productCoupon.filter((v) => v.checked);
const fullReductionCoupon = this.fullReductionCouponSel.id
? [this.fullReductionCouponSel]
: [];
- let coupArr = [...goodsQuan, item];
+
+ let coupArr = [...goodsQuan, { ...item, num: canUseNum }];
const payPrice =
this.orderPrice -
returnCouponAllPrice(coupArr, canDikouGoodsArr, this.vipUser);
console.log(payPrice);
+ if (payPrice <= 0) {
+ return this.$confirm(
+ "选择该商品券后支付金额将为0，继续选择将取消选择的满减券",
+ "提示",
+ {
+ confirmButtonText: "继续选择",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ this.fullReductionCouponSel = {
+ id: "",
+ };
+ this.quansSelArr.splice(0, 1);
+ })
+ .catch(() => {});
+ }
if (this.fullReductionCouponSel.fullAmount > payPrice) {
this.$confirm(
"选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券",
@@ -379,13 +401,19 @@ export default {
}
}
item.checked = !item.checked;
+ if (!item.checked) {
+ console.log(index);
+ const index = this.quansSelArr.findIndex((v) => v.id == item.id);
+ this.quansSelArr.splice(index, 1);
+ } else {
+ this.quansSelArr.push({ ...item, num: canUseNum });
+ }
const CheckedArr = this.quans.productCoupon.filter((v) => v.checked);
- this.quansSelArr = [
- ...(this.fullReductionCouponSel.id
- ? [this.fullReductionCouponSel]
- : []),
- ...CheckedArr,
- ];
+ if (CheckedArr.length <= 0) {
+ return this.quans.productCoupon.map((v) => {
+ v.use = true;
+ });
+ }
const noCheckedArr = this.quans.productCoupon.filter((v) => !v.checked);
noCheckedArr.map((v) => {
v.use = returnCoupCanUse(canDikouGoodsArr, v, CheckedArr);
@@ -405,12 +433,12 @@ export default {
},
confirm() {
- this.$emit("confirm", [...this.quansSelArr]);
+ this.$emit("confirm", [...this.quansSelArr], $goodsPayPriceMap);
this.close();
},
async open(data, propSelCoup) {
console.log(data);
- this.orderPrice=data.orderPrice;
+ this.orderPrice = data.orderPrice;
this.quansSelArr = [...propSelCoup];
$goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
if (data.memberId) {
@@ -419,7 +447,7 @@ export default {
memberId: data.memberId,
});
quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
- (v) => v.use && this.orderPrice * 1 >= v.fullAmount * 1
+ (v) =>this.orderPrice<=0?false:(v.use && this.orderPrice * 1 >= v.fullAmount * 1)
);
const selFullReductionCoupon = this.quansSelArr.find(
(v) => v.type == 1
@@ -442,6 +470,7 @@ export default {
checked: this.quansSelArr.find((selCoup) => selCoup.id == v.id)
? true
: false,
+ use:this.orderPrice<=0?false:calcCoup.use
};
})
.filter((v) => v.use);
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index a9a1272..d721fa9 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -982,9 +982,14 @@
-
+
￥{{ scope.row.discountAmount }}
+
+ ￥{{
+ returnProDiscount(scope.row, scope.row.index)
+ }}
+
@@ -1011,6 +1016,7 @@
ref="refPayType"
v-model="order.payType"
@itemClick="payTypeItemClick"
+ :disabledPayType="disabledPayType"
>
@@ -1481,6 +1481,11 @@ import {
returnVipDiscountPrice,
returnCouponAllPrice,
} from "./util.js";
+import {
+ returnProductCoupAllPrice
+} from "./quan_util.js";
+//商品数量从0到n每一个对应的价格
+let $goodsPayPriceMap = {};
import { $status } from "@/utils/table.js";
let $originTableList = [];
@@ -1501,6 +1506,7 @@ export default {
},
data() {
return {
+ disabledPayType: [],
//积分抵扣
points: {
res: {
@@ -1609,7 +1615,7 @@ export default {
total: 0,
},
order: {
- status:'',
+ status: "",
packFee: {
totalNumber: 0,
status: "",
@@ -1715,8 +1721,8 @@ export default {
},
computed: {
isShowVipPrice() {
- if(!this.shopInfo.isMemberPrice){
- return false
+ if (!this.shopInfo.isMemberPrice) {
+ return false;
}
return this.vipUser.isVip ? true : false;
},
@@ -1972,6 +1978,13 @@ export default {
},
},
watch: {
+ yinFuJinE: function (newval) {
+ if (newval <= 0) {
+ this.disabledPayType = ["scanCode", "deposit"];
+ } else {
+ this.disabledPayType = [];
+ }
+ },
"goods.query.categoryId": function (newval) {
this.goods.query.page = 1;
this.goods.list = [];
@@ -2039,9 +2052,9 @@ export default {
// this.masterId = masterId;
console.log("this.createOrder.data");
console.log(this.createOrder.data);
- if(this.order.status=='finish'){
- return
- }
+ if (this.order.status == "finish") {
+ return;
+ }
$setUser({
tableId: this.table.tableId,
masterId: this.masterId,
@@ -2054,8 +2067,8 @@ export default {
this.getOrderData().then(() => {
this.pointsValueChange(this.points.value);
});
- }else{
- this.getCart()
+ } else {
+ this.getCart();
}
});
},
@@ -2174,6 +2187,21 @@ export default {
this.open(this.$route.query);
},
methods: {
+ returnProDiscount(row) {
+ console.log(row);
+ //相同商品抵扣券数组
+ const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
+ const index = arr.findIndex((v) => v.id == row.id);
+ if (index != -1) {
+ return returnProductCoupAllPrice(
+ $goodsPayPriceMap[row.proId],
+ index,
+ row.num
+ ).toFixed(2);
+ } else {
+ return 0;
+ }
+ },
lingshicaiShow() {
this.$refs.refPopAddCai.open();
},
@@ -2234,14 +2262,15 @@ export default {
{
id: this.createOrder.data.id,
memberId: this.createOrder.data.memberId || this.vipUser.id,
- orderPrice:(this.yinFuJinE*1+this.coupdiscount*1).toFixed(2)
+ orderPrice: (this.yinFuJinE * 1 + this.coupdiscount * 1).toFixed(2),
},
[...this.quansSelArr]
);
},
- quansConfirm(e) {
+ quansConfirm(e,goodsPayPriceMap) {
console.log(e);
this.quansSelArr = [...e];
+ $goodsPayPriceMap=goodsPayPriceMap
},
searchInput(e) {
console.log(e);
@@ -2837,7 +2866,7 @@ export default {
title: "支付成功",
type: "success",
});
- this.order.status='finish'
+ this.order.status = "finish";
this.close();
// this.reset();
},
@@ -3069,11 +3098,14 @@ export default {
}
if (key === "returnCart") {
console.log(this.order);
- let selGoods=undefined
- if(this.order.selPlaceNum==-10){
- selGoods = {...this.order.seatFee,num:this.order.seatFee.number}
- }else{
- selGoods = this.order.old.list[this.order.selPlaceNum-1].info[this.order.old.selIndex];
+ let selGoods = undefined;
+ if (this.order.selPlaceNum == -10) {
+ selGoods = { ...this.order.seatFee, num: this.order.seatFee.number };
+ } else {
+ selGoods =
+ this.order.old.list[this.order.selPlaceNum - 1].info[
+ this.order.old.selIndex
+ ];
}
console.log(selGoods);
this.refToggle("refReturnCart", true, selGoods);
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
index 5052034..78360d7 100644
--- a/src/views/tool/Instead/quan_util.js
+++ b/src/views/tool/Instead/quan_util.js
@@ -2,7 +2,7 @@ export function isTui(item) {
return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
}
//是否使用会员价
-export function isUseMemberPrice(vipUser,goods){
+export function isUseVipPrice(vipUser,goods){
return vipUser.id&&vipUser.isVip&&goods.isMember
}
@@ -13,7 +13,7 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
return 0
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
- const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
+ const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
return price * coup.num
}
@@ -40,7 +40,8 @@ export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
if (selCoupNumber >= findGoodsTotalNumber) {
return false
}
- return findGoodsTotalNumber < (coup.num + selCoupNumber) ? false : true
+ console.log(selCoupNumber,findGoodsTotalNumber);
+ return findGoodsTotalNumber < selCoupNumber ? false : true
}
//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
@@ -54,12 +55,13 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
}
}
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
- const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
+ const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
const discountAmount = (price * coup.num).toFixed(2)
console.log(discountAmount);
- const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+ // const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
// const canUse=discountAmount>0
+ const canUse=coup.use
return {
...coup,
discountAmount: discountAmount,
@@ -85,7 +87,7 @@ export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
//返回商品实际支付价格
export function returnProductPayPrice(goods,vipUser){
const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
- const price = isUseMemberPrice(vipUser,goods) ? memberPrice : goods.price;
+ const price = isUseVipPrice(vipUser,goods) ? memberPrice : goods.price;
return price
}
//返回商品券抵扣的商品价格
@@ -100,6 +102,23 @@ export function returnProductCoupAllPrice(productPriceArr,startIndex,num){
return prve+curPrice
},0)
}
+
+//返回商品券可抵扣的商品数量
+export function returnProductCanUseNum(productPriceArr,startIndex,num){
+ console.log(productPriceArr);
+ console.log(num);
+ let n=0;
+ for(let i=0;i{
@@ -166,7 +185,9 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
}
const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex);
- total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num)
+ const coupNum=Math.min(goodsPayPriceMap[coup.proId].length,coup.num)
+ console.log(coupNum);
+ total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum)
}
}
@@ -198,6 +219,12 @@ export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
return v
}
const isfullAmount = payPrice >= v.fullAmount * 1
+ if(payPrice<=0){
+ return {
+ ...v,
+ use: false
+ }
+ }
return {
...v,
use: v.use && isfullAmount
From 7ff8632af9af5a85c22adfafdf8ac291326e1294 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:09:44 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=BA=E5=88=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/index.vue | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index d721fa9..457e69a 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1481,9 +1481,7 @@ import {
returnVipDiscountPrice,
returnCouponAllPrice,
} from "./util.js";
-import {
- returnProductCoupAllPrice
-} from "./quan_util.js";
+import { returnProductCoupAllPrice } from "./quan_util.js";
//商品数量从0到n每一个对应的价格
let $goodsPayPriceMap = {};
import { $status } from "@/utils/table.js";
@@ -2267,10 +2265,10 @@ export default {
[...this.quansSelArr]
);
},
- quansConfirm(e,goodsPayPriceMap) {
+ quansConfirm(e, goodsPayPriceMap) {
console.log(e);
this.quansSelArr = [...e];
- $goodsPayPriceMap=goodsPayPriceMap
+ $goodsPayPriceMap = goodsPayPriceMap;
},
searchInput(e) {
console.log(e);
@@ -3574,6 +3572,7 @@ export default {
},
reset() {
// this.goods.list = [];
+ this.order.status = "";
this.loading = false;
this.table = "";
this.order.list = [];
@@ -3947,7 +3946,6 @@ export default {
this.$router.replace({ path: "/tool/table_list" });
} else {
this.$router.replace({ path: "/tool/Instead/index" });
- this.$router.go(0);
// this.reset();
// this.$router.replace({ path: "/tool/Instead/index" });
}
From c7283a493c9e5de0dd159c911a671f66e21c4b04 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:36:32 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B4=E5=8D=95?=
=?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=97=B6=E4=BB=B7=E6=A0=BC=E4=B8=8D=E5=AF=B9?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 457e69a..7510105 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1757,11 +1757,12 @@ export default {
const amount = this.createOrder.data.amount || 0;
const discount = this.createOrder.discount || 1;
// const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
- const total = (amount - this.coupdiscount) * this.createOrder.discount;
+ const total = (amount) * this.createOrder.discount - this.coupdiscount;
return total <= 0 ? 0 : total;
},
yinFuJinE() {
const total = this.currentPayMoney - (this.points.toMoney || 0);
+ console.log(total)
if (this.isCreateOrder) {
return total.toFixed(2);
} else {
@@ -2676,7 +2677,7 @@ export default {
if (!canDiscount) {
return;
}
- const amount = this.createOrder.data.amount - this.coupdiscount;
+ const amount = this.createOrder.data.amount;
this.refToggle("refDiscount", true, {
amount,
discount: this.createOrder.discount * 100,
From d9cf881b62b09ceaa41c7b854191426209a40aea Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:54:43 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
=?UTF-8?q?=E6=89=93=E6=8A=98=E5=BC=B9=E7=AA=97=E5=BA=94=E4=BB=98=E9=87=91?=
=?UTF-8?q?=E9=A2=9D=E6=96=87=E5=AD=97=E6=94=B9=E4=B8=BA=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/components/discount.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/tool/Instead/components/discount.vue b/src/views/tool/Instead/components/discount.vue
index b3a2f56..b281a44 100644
--- a/src/views/tool/Instead/components/discount.vue
+++ b/src/views/tool/Instead/components/discount.vue
@@ -3,7 +3,7 @@
-
+
From 9969251050234f8a145f122222bcad5c72c27619 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 18:25:37 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D=E8=AE=A1?=
=?UTF-8?q?=E7=AE=97=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E9=80=80?=
=?UTF-8?q?=E6=AC=BE=E6=97=B6=E5=AE=A2=E5=BA=A7=E8=B4=B9=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E9=80=80=E6=AC=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
.../order_manage/components/orderDetail.vue | 203 ++++++++++++------
.../tool/Instead/components/return-money.vue | 48 +++--
src/views/tool/Instead/index.vue | 10 +
4 files changed, 180 insertions(+), 85 deletions(-)
diff --git a/.env.development b/.env.development
index fdeba2f..98c3e63 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
# 测试
-VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
#预发布
-# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# 生产
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 568aa0a..9984e66 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -1,7 +1,13 @@
-
+
@@ -1094,13 +1100,7 @@
应付金额
-
- ￥{{
- currentPayMoney - points.toMoney <= 0
- ? 0
- : (currentPayMoney - points.toMoney) | to2
- }}
-
+ ￥{{ yinFuJinE }}
￥{{ form.money }}
-
【收银订单】
+ 【收银订单】
@@ -72,15 +78,20 @@
@@ -100,20 +111,26 @@
-->
打包费：{{ detail.packFee || "-" }}
订单原价：￥{{ detail.originAmount }}
- 优惠金额：￥{{ detail.userCouponAmount || "-" }}
+ 优惠金额：￥{{ youHuiJinE }}
- 实收金额：￥{{ detail.payAmount }}
+ 实收金额：￥{{ detail.payAmount }}
退款金额：￥{{ detail.refundAmount }}
- 退款详情>
+ 退款详情>
支付方式：{{ detail.payType }}
-
item.key == t).label;
+ return t && orderEnum.orderType.find((item) => item.key == t).label;
} else {
return t;
}
},
sendTypeFilter(t) {
if (t) {
- return orderEnum.sendType.find(item => item.key == t).label;
+ return orderEnum.sendType.find((item) => item.key == t).label;
} else {
return t;
}
},
statusFilter(t) {
if (t) {
- return t && orderEnum.status.find(item => item.key == t).label;
+ return t && orderEnum.status.find((item) => item.key == t).label;
} else {
return t;
}
@@ -278,45 +301,85 @@ export default {
} else {
return "-";
}
- }
+ },
},
- watch:{
- drawer:function(newval){
- if(!newval){
+ watch: {
+ drawer: function (newval) {
+ if (!newval) {
this.close();
}
- }
+ },
+ },
+ computed: {
+ vipDiscountAmount() {
+ if (!this.detail.memberId) {
+ return 0;
+ }
+ if (this.detail.status == "unpaid") {
+ return this.detail.detailList
+ .filter((v) => !$util.isTui(v) && v.productId != "-999")
+ .reduce((prve, cur) => {
+ if (!cur.isMember) {
+ return prve + 0;
+ } else {
+ const memberPrice = cur.memberPrice ? cur.memberPrice : cur.price;
+ return prve + (cur.price - memberPrice) * cur.num;
+ }
+ }, 0)
+ .toFixed(2);
+ }
+ return 0
+ },
+ youHuiJinE() {
+ console.log(this.vipDiscountAmount);
+ const discountAmount=this.detail.discountAmount;
+ const calcDiscountAmount=(this.detail.originAmount*(1-this.detail.discountRatio)).toFixed(2);
+ console.log(this.detail.originAmount*(1-this.detail.discountRatio))
+ const n = $util.numSum([
+ this.vipDiscountAmount,
+ (discountAmount?discountAmount:calcDiscountAmount),
+ this.detail.productCouponDiscountAmount,
+ this.detail.fullCouponDiscountAmount,
+ this.detail.pointsDiscountAmount,
+ ]);
+ if (n * 1 <= 0) {
+ return "-";
+ }
+ return n;
+ },
},
methods: {
- close(){
- console.log('drawer close')
- this.$emit('close');
+ close() {
+ console.log("drawer close");
+ this.$emit("close");
},
- isTui(item){
+ isTui(item) {
return $util.isTui(item);
},
- canTuikuan(item){
- return $util.canTuiKuan(this.detail,item);
+ canTuikuan(item) {
+ return $util.canTuiKuan(this.detail, item);
},
- canTuicai(item){
- return $util.canTuicai(this.detail,item);
+ canTuicai(item) {
+ return $util.canTuicai(this.detail, item);
},
- async refReturnMoneyConfirm(e){
+ async refReturnMoneyConfirm(e) {
const res = await $returnOrder({
...e,
- orderId:this.detail.id,
- orderDetails:[{
- id:this.selGoods.id,
- num:e.num
- }]
+ orderId: this.detail.id,
+ orderDetails: [
+ {
+ id: this.selGoods.id,
+ num: e.num,
+ },
+ ],
});
this.$message.success("退款成功");
this.update();
},
- update(){
+ update() {
this.tbOrderInfoDetail(this.detail.id);
},
- async refReturnCartConfirm(e){
+ async refReturnCartConfirm(e) {
const res = await $returnCart({
...e,
cartId: this.selGoods.cartId,
@@ -325,13 +388,13 @@ export default {
this.$message.success("退菜成功");
this.update();
},
- tuikuan(item){
- this.selGoods=item;
+ tuikuan(item) {
+ this.selGoods = item;
console.log(item);
this.$refs.refReturnMoney.open(item);
},
- tuiCai(item){
- this.selGoods=item;
+ tuiCai(item) {
+ this.selGoods = item;
console.log(item);
this.$refs.refReturnCart.open(item);
},
@@ -348,7 +411,7 @@ export default {
source: this.detail.id,
page: 0,
pageSize: 500,
- orderType: "0"
+ orderType: "0",
});
this.refoundList = res.content;
} catch (error) {
@@ -371,23 +434,23 @@ export default {
this.type = "1";
this.detail = "";
this.tbOrderInfoDetail(obj.id);
- }
- }
+ },
+ },
};
\ No newline at end of file
From 25c030f2a27dc6e34cb7fbef6adacbb0e492c842 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 21 Nov 2024 15:23:30 +0800
Subject: [PATCH 13/22] =?UTF-8?q?=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83-?=
=?UTF-8?q?=E5=BD=92=E6=A1=A3=20=E5=9F=BA=E4=BA=8E=E5=BD=93=E5=89=8Ddev?=
=?UTF-8?q?=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/application.js | 5 +-
src/views/marketing/index.vue | 108 ++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 2 deletions(-)
create mode 100644 src/views/marketing/index.vue
diff --git a/src/api/application.js b/src/api/application.js
index 8aa460c..4da83fc 100644
--- a/src/api/application.js
+++ b/src/api/application.js
@@ -19,10 +19,11 @@ export function tbPrintMachine(data, method = "post") {
* 获取应用中心列表
* @returns
*/
-export function appCenterGet() {
+export function appCenterGet(params) {
return request({
url: "/api/appCenter",
- method: "get"
+ method: "get",
+ params
});
}
diff --git a/src/views/marketing/index.vue b/src/views/marketing/index.vue
new file mode 100644
index 0000000..5340401
--- /dev/null
+++ b/src/views/marketing/index.vue
@@ -0,0 +1,108 @@
+
+ 编辑
-->
- 编辑
-
- 删除
-
+
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up
import { hasPermission } from '@/utils/limits.js'
export default {
- name:'product',
+ name: 'product',
components: {
BindCons,
StockHistory
From 5076efee3a319b91632e25616d4131a6e4b46e30 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 23 Nov 2024 17:44:21 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=87=91=E9=A2=9D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
.../order_manage/components/orderDetail.vue | 34 +++-
src/views/order_manage/order_goods_util.js | 15 +-
.../tool/Instead/components/discount.vue | 2 +-
src/views/tool/Instead/components/quans.vue | 13 +-
src/views/tool/Instead/index.vue | 181 ++++++++++++------
src/views/tool/Instead/quan_util.js | 27 ++-
7 files changed, 199 insertions(+), 77 deletions(-)
diff --git a/.env.development b/.env.development
index 98c3e63..fdeba2f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
# 测试
-# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
#预发布
-VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# 生产
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 9984e66..349f845 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -141,10 +141,25 @@
x{{ scope.row.num }}
- ￥{{ scope.row.price }}/
+
+ ￥{{ scope.row.price }}
+
+
- ￥{{ scope.row.priceAmount }}
+ ￥{{ scope.row.canReturnAmount }}
@@ -274,6 +289,9 @@ export default {
};
},
filters: {
+ to2(n){
+ return Number(n).toFixed(2)
+ },
orderTypeFilter(t) {
if (t) {
return t && orderEnum.orderType.find((item) => item.key == t).label;
@@ -349,6 +367,12 @@ export default {
},
},
methods: {
+ isShowGoodsVipPrice(item){
+ return $util.isShowGoodsVipPrice(item);
+ },
+ isUseCalcPrice(item){
+ return $util.isUseCalcPrice(this.detail,item);
+ },
close() {
console.log("drawer close");
this.$emit("close");
@@ -391,7 +415,7 @@ export default {
tuikuan(item) {
this.selGoods = item;
console.log(item);
- this.$refs.refReturnMoney.open(item);
+ this.$refs.refReturnMoney.open({...item,priceAmount:item.canReturnAmount});
},
tuiCai(item) {
this.selGoods = item;
@@ -488,7 +512,9 @@ export default {
}
}
}
-
+.line-th{
+ text-decoration: line-through;
+}
.container {
padding: 0 20px;
font-size: 14px;
diff --git a/src/views/order_manage/order_goods_util.js b/src/views/order_manage/order_goods_util.js
index c38e1e9..224a68f 100644
--- a/src/views/order_manage/order_goods_util.js
+++ b/src/views/order_manage/order_goods_util.js
@@ -18,7 +18,7 @@ export function canTuicai(orderInfo,item){
}
export function canTuiKuan(orderInfo,item){
// return orderInfo.status!='unpaid'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding'
- return orderInfo.status=='closed'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding' && !item.userCouponId
+ return orderInfo.status=='closed'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding'
}
export function isTui(item){
return item.status=='return'||item.status=='refund'||item.status=='refunding'
@@ -28,4 +28,17 @@ export function numSum(arr){
return a+b*100
},0)
return (sum/100).toFixed(2)
+}
+//是否使用计算的会员价
+export function isUseCalcPrice(order,item){
+ console.log(order)
+ if(order.fullCouponDiscountAmount>0||order.pointsDiscountAmount>0){
+ return true
+ }else{
+ return false
+ }
+}
+//商品列表是否展示会员价
+export function isShowGoodsVipPrice(item){
+ return item.isMember==1&&item.memberPrice&&item.memberPrice!=item.price
}
\ No newline at end of file
diff --git a/src/views/tool/Instead/components/discount.vue b/src/views/tool/Instead/components/discount.vue
index 9831ed0..e2c0ae3 100644
--- a/src/views/tool/Instead/components/discount.vue
+++ b/src/views/tool/Instead/components/discount.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index a804bcf..10782cb 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -286,11 +286,13 @@ export default {
//相同商品抵扣券数组
const arr = this.quans.productCoupon.filter((v) => v.proId == row.proId);
const index = arr.findIndex((v) => v.id == row.id);
+ const item=this.goodsArr.find((v) => v.productId == row.proId);
if (index != -1) {
const n=returnProductCoupAllPrice(
$goodsPayPriceMap[row.proId],
index,
- row.num
+ row.num,
+ item.isMember
)
return (n*this.discount).toFixed(2);
} else {
@@ -385,7 +387,7 @@ export default {
.catch(() => {});
}
if (this.fullReductionCouponSel.fullAmount > payPrice) {
- this.$confirm(
+ this.$confirm(
"选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券",
"提示",
{
@@ -399,7 +401,11 @@ export default {
id: "",
};
})
- .catch(() => {});
+ .catch(() => {
+ item.checked=false
+ const index = this.quansSelArr.findIndex((v) => v.id == item.id);
+ this.quansSelArr.splice(index, 1);
+ });
}
}
item.checked = !item.checked;
@@ -441,7 +447,6 @@ export default {
async open(data, propSelCoup) {
console.log(data);
this.orderPrice = data.orderPrice;
- this.discount=data.discount||1
this.quansSelArr = [...propSelCoup];
$goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
if (data.memberId) {
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 019d78d..75ca1cb 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1065,16 +1065,11 @@
商品信息
+ 商品信息
-
-
- x{{ scope.row.num }}
-
+ x{{ scope.row.num }}
-
- ￥{{ scope.row.price }}/
-
+ ￥{{ scope.row.price }}/
-
- ￥{{ scope.row.priceAmount }}
-
+ ￥{{ scope.row.priceAmount }}
-
- 退款
+
+ 退款
已退款
-
- 退菜
- 已退菜
+
+ 退菜
+ 已退菜
@@ -211,13 +236,13 @@
- {{ scope.row.productName ||'客座费'}}
+ {{ scope.row.productName || "客座费" }}
- {{ scope.row.productName }}
- {{
+ {{
+ scope.row.productName
+ }}
+ {{
scope.row.productSkuName
}}
@@ -121,29 +138,37 @@
+
+
+
+
+
+
\ No newline at end of file
From 862812caa35bcc24a5dce7465984322fa2f32041 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 21 Nov 2024 15:24:31 +0800
Subject: [PATCH 14/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=88=B8=E8=AE=A1=E7=AE=97=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=89=93?=
=?UTF-8?q?=E6=8A=98=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/tool/Instead/components/discount.vue | 1 +
src/views/tool/Instead/components/quans.vue | 7 +++++--
src/views/tool/Instead/index.vue | 10 ++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/tool/Instead/components/discount.vue b/src/views/tool/Instead/components/discount.vue
index b281a44..9831ed0 100644
--- a/src/views/tool/Instead/components/discount.vue
+++ b/src/views/tool/Instead/components/discount.vue
@@ -168,6 +168,7 @@ export default {
},
confirm() {
+ console.log(this.form.discount / 100)
this.$emit("confirm", (this.form.discount / 100));
this.close();
},
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 7540356..a804bcf 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -229,6 +229,7 @@ export default {
},
data() {
return {
+ discount:1,
orderPrice: 0,
fullReductionCouponSel: {
id: "",
@@ -286,11 +287,12 @@ export default {
const arr = this.quans.productCoupon.filter((v) => v.proId == row.proId);
const index = arr.findIndex((v) => v.id == row.id);
if (index != -1) {
- return returnProductCoupAllPrice(
+ const n=returnProductCoupAllPrice(
$goodsPayPriceMap[row.proId],
index,
row.num
- ).toFixed(2);
+ )
+ return (n*this.discount).toFixed(2);
} else {
return 0;
}
@@ -439,6 +441,7 @@ export default {
async open(data, propSelCoup) {
console.log(data);
this.orderPrice = data.orderPrice;
+ this.discount=data.discount||1
this.quansSelArr = [...propSelCoup];
$goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
if (data.memberId) {
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 2d367a1..019d78d 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1725,11 +1725,11 @@ export default {
return this.vipUser.isVip ? true : false;
},
coupdiscount() {
- return returnCouponAllPrice(
+ return (this.createOrder.discount*returnCouponAllPrice(
this.quansSelArr,
this.createOrder.data.detailList || [],
this.vipUser
- );
+ )).toFixed(2)
},
goodsDisCount() {
const goodsQuanArr = this.quansSelArr.filter((v) => v.type == 2);
@@ -2195,11 +2195,12 @@ export default {
const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
const index = arr.findIndex((v) => v.id == row.id);
if (index != -1) {
- return returnProductCoupAllPrice(
+ const n=returnProductCoupAllPrice(
$goodsPayPriceMap[row.proId],
index,
row.num
- ).toFixed(2);
+ )
+ return (n*this.createOrder.discount).toFixed(2);
} else {
return 0;
}
@@ -2265,6 +2266,7 @@ export default {
id: this.createOrder.data.id,
memberId: this.createOrder.data.memberId || this.vipUser.id,
orderPrice: (this.yinFuJinE * 1 + this.coupdiscount * 1).toFixed(2),
+ discount:this.createOrder.discount
},
[...this.quansSelArr]
);
From f266501a7b5ae895d9935c229f40008148032678 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 22 Nov 2024 14:31:32 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=95=86=E5=93=81?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E8=A7=84=E6=A0=BC=E6=93=8D=E4=BD=9C?=
=?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/product/index.vue | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 3499939..38bbe20 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -189,11 +189,13 @@
style="margin-left: 20px !important;">
营销中心
+
+
+
+ ![]()
+
+
+
+ {{ item.name }}
+
+ {{ item.value }}
+
+
+ 编辑
+
+ 删除
+
+
￥{{ form.money }}
积分抵扣
- -￥{{ points.toMoney | to2 }}
+ -￥{{ pointsDiscountAmount | to2 }}
整单改价
-
- -￥{{
- ((1 - createOrder.discount) * createOrder.data.amount)
- | to2
- }}
-
+ -￥{{ gaijia | to2 }}
打包费
@@ -1718,6 +1713,22 @@ export default {
};
},
computed: {
+ pointsDiscountAmount() {
+ if (this.points.selected) {
+ return this.points.toMoney;
+ } else {
+ return 0;
+ }
+ },
+ gaijia() {
+ const disCountOriginPrice =
+ this.createOrder.data.amount - this.coupdiscount;
+ const disocunt = (1 - this.createOrder.discount) * disCountOriginPrice;
+ return disocunt.toFixed(2);
+ },
+ pointsCanDicountMoney() {
+ return (this.yinFuJinE - this.points.toMoney).toFixed(2);
+ },
isShowVipPrice() {
if (!this.shopInfo.isMemberPrice) {
return false;
@@ -1725,44 +1736,22 @@ export default {
return this.vipUser.isVip ? true : false;
},
coupdiscount() {
- return (this.createOrder.discount*returnCouponAllPrice(
- this.quansSelArr,
- this.createOrder.data.detailList || [],
- this.vipUser
- )).toFixed(2)
+ const n = this.quansSelArr.reduce((prve, cur) => {
+ return prve + cur.discountAmount * 1;
+ }, 0);
+ return n;
},
- goodsDisCount() {
- const goodsQuanArr = this.quansSelArr.filter((v) => v.type == 2);
- let result = 0;
- if (goodsQuanArr.length < 0) {
- result = 0;
- } else {
- result = goodsQuanArr.reduce((a, b) => {
- const item = this.createOrder.data.detailList.find(
- (v) => v.productId == b.proId
- );
- const memberPrice = item.memberPrice ? item.memberPrice : item.price;
- const price = item
- ? this.vipUser.isVip
- ? memberPrice
- : item.price
- : 0;
- return a + price;
- }, 0);
- }
- return result.toFixed(2);
- },
-
currentPayMoney() {
const amount = this.createOrder.data.amount || 0;
const discount = this.createOrder.discount || 1;
// const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
- const total = (amount) * this.createOrder.discount - this.coupdiscount;
+ const total = amount - this.gaijia - this.coupdiscount;
return total <= 0 ? 0 : total;
},
yinFuJinE() {
- const total = this.currentPayMoney - (this.points.toMoney || 0);
- console.log(total)
+ const total =
+ this.currentPayMoney - (this.points.selected ? this.points.toMoney : 0);
+ console.log(total);
if (this.isCreateOrder) {
return total.toFixed(2);
} else {
@@ -1886,13 +1875,20 @@ export default {
const seatFee =
this.order.seatFee.totalAmount *
(returnStatus.includes(this.order.seatFee.status) ? 0 : 1);
+ // return (
+ // (oldPrice + price + +packFee + seatFee - this.youhuiAllPrice) *
+ // this.createOrder.discount
+ // ).toFixed(2);
return (
- (oldPrice + price + +packFee + seatFee - this.youhuiAllPrice) *
- this.createOrder.discount
+ oldPrice +
+ price +
+ +packFee +
+ seatFee -
+ this.youhuiAllPrice
).toFixed(2);
},
vipDiscountPrice() {
- if (!this.vipUser.isVip) {
+ if (!this.vipUser.isVip || !this.shopInfo.isMemberPrice) {
return 0;
}
const oldMemberPrice = this.order.old.list.reduce((a, b) => {
@@ -1990,10 +1986,15 @@ export default {
this.goods.status = "loadmore";
this.getGoods();
},
+ pointsCanDicountMoney: function (newval) {
+ this.getCalcUsablePoints();
+ },
currentPayMoney: function (newval) {
if (this.createOrder.data.memberId || this.vipUser.id) {
this.getCalcUsablePoints().then((res) => {
- this.pointsValueChange(this.points.value);
+ if (this.points.selected) {
+ this.pointsValueChange(this.points.value);
+ }
});
}
},
@@ -2054,8 +2055,12 @@ export default {
if (this.order.status == "finish") {
return;
}
- if(!this.table.tableId&&(this.order.list.length<=0&&this.order.old.list.length<=0)){
- return ;
+ if (
+ !this.table.tableId &&
+ this.order.list.length <= 0 &&
+ this.order.old.list.length <= 0
+ ) {
+ return;
}
$setUser({
tableId: this.table.tableId,
@@ -2194,13 +2199,18 @@ export default {
//相同商品抵扣券数组
const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
const index = arr.findIndex((v) => v.id == row.id);
+ const item = this.createOrder.data.detailList.find(
+ (v) => v.productId == row.proId
+ );
+
if (index != -1) {
- const n=returnProductCoupAllPrice(
+ const n = returnProductCoupAllPrice(
$goodsPayPriceMap[row.proId],
index,
- row.num
- )
- return (n*this.createOrder.discount).toFixed(2);
+ row.num,
+ item.isMember
+ );
+ return (n * this.createOrder.discount).toFixed(2);
} else {
return 0;
}
@@ -2213,6 +2223,13 @@ export default {
console.log(index);
if (index != -1) {
this.quansSelArr.splice(index, 1);
+ this.quansSelArr
+ .map((v, index) => {
+ return {
+ ...v,
+ discountAmount:v.type==2?this.returnProDiscount(v):v.discountAmount,
+ };
+ });
}
},
async getCalcUsablePoints() {
@@ -2232,6 +2249,9 @@ export default {
this.vipUser.accountPoints,
this.points.res.maxUsablePoints || 0
);
+ if(!pointsRes.usable){
+ this.points.selected=false
+ }
}
return pointsRes;
},
@@ -2266,13 +2286,21 @@ export default {
id: this.createOrder.data.id,
memberId: this.createOrder.data.memberId || this.vipUser.id,
orderPrice: (this.yinFuJinE * 1 + this.coupdiscount * 1).toFixed(2),
- discount:this.createOrder.discount
+ discount: this.createOrder.discount,
},
[...this.quansSelArr]
);
},
quansConfirm(e, goodsPayPriceMap) {
console.log(e);
+ this.createOrder.discount = 1;
+ this.points.selected = "";
+ e.map((v, index) => {
+ return {
+ ...v,
+ discountAmount:v.type==2? this.returnProDiscount(v):v.discountAmount,
+ };
+ });
this.quansSelArr = [...e];
$goodsPayPriceMap = goodsPayPriceMap;
},
@@ -2320,7 +2348,7 @@ export default {
// return
// }
await this.returnCreateOrderData();
- this.payBeforeClear();
+ // this.payBeforeClear();
// this.order.payType = "";
},
async cashPayClick() {
@@ -2413,10 +2441,13 @@ export default {
if (!canJiesuan) {
return;
}
- const order = await this.returnCreateOrderData();
- this.order.payType = "scanCode";
- this.payTypeItemClick({ payType: "scanCode", order });
- this.payBeforeClear();
+ if (!this.isCreateOrder) {
+ const order = await this.returnCreateOrderData();
+ this.order.payType = "scanCode";
+ this.payTypeItemClick({ payType: "scanCode", order });
+ return;
+ }
+ this.payTypeItemClick({ payType: "scanCode" });
},
async changeOrderUseType(useType) {
if (useType && this.order.list.length) {
@@ -2553,10 +2584,11 @@ export default {
},
//退菜
async refReturnCartConfirm(e) {
- console.log(this.order.selGoods);
const res = await $returnCart({
...e,
- cartId: this.order.selGoods.cartId,
+ cartId: this.isCreateOrder
+ ? this.order.selGoods.id
+ : this.order.selGoods.cartId,
tableId: this.table.tableId,
});
this.order.selGoods.status = "return";
@@ -2675,14 +2707,41 @@ export default {
}
},
ChangeDiscount(discount) {
+ const fullCoupIndex = this.quansSelArr.findIndex((v) => v.type == 1);
+ const fullCoup = this.quansSelArr[fullCoupIndex];
this.createOrder.discount = discount;
+ if (fullCoup && this.yinFuJinE < fullCoup.fullAmount) {
+ return this.$confirm(
+ "改价后价格不满足满减券最低满减需求" + fullCoup.fullAmount + "元",
+ "提示",
+ {
+ confirmButtonText: "删除满减券",
+ cancelButtonText: "取消改价",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ this.quansSelArr.splice(fullCoupIndex, 1);
+ this.createOrder.discount = discount;
+ })
+ .catch((action) => {
+ this.createOrder.discount = 1;
+ this.$message({
+ type: "info",
+ message: "已取消改价",
+ });
+ });
+ }
},
async disCountShow() {
const canDiscount = await hasPermission("允许打折");
if (!canDiscount) {
return;
}
- const amount = this.createOrder.data.amount;
+ const amount = (this.createOrder.data.amount - this.coupdiscount).toFixed(
+ 2
+ );
+ console.log(amount);
this.refToggle("refDiscount", true, {
amount,
discount: this.createOrder.discount * 100,
@@ -4516,11 +4575,13 @@ input[type="number"]::-webkit-outer-spin-button {
font-weight: 600;
}
::v-deep input[aria-hidden="true"] {
- display: none !important;
+ display: none !important;
}
-
-::v-deep .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
- box-shadow: none !important;
+
+::v-deep
+ .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+ .el-radio__inner {
+ box-shadow: none !important;
}
::v-deep .categorys .el-tag--plain.el-tag--info {
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
index 78360d7..14b4747 100644
--- a/src/views/tool/Instead/quan_util.js
+++ b/src/views/tool/Instead/quan_util.js
@@ -91,11 +91,12 @@ export function returnProductPayPrice(goods,vipUser){
return price
}
//返回商品券抵扣的商品价格
-export function returnProductCoupAllPrice(productPriceArr,startIndex,num){
+export function returnProductCoupAllPrice(productPriceArr,startIndex,num,isMember=true){
+ console.log(productPriceArr);
return productPriceArr.slice(startIndex,startIndex+num).reduce((prve,cur)=>{
let curPrice=0
if(typeof cur==='object'){
- curPrice=cur.memberPrice*1
+ curPrice=isMember?cur.memberPrice*1:cur.price
}else{
curPrice=cur*1
}
@@ -216,9 +217,9 @@ export function returnCouponAllPrice(coupArr, goodsArr, vipUser) {
export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
return coupArr.map(v => {
if (v.id == selCoup.id) {
- return v
+ return {...v,use:true}
}
- const isfullAmount = payPrice >= v.fullAmount * 1
+ const isfullAmount = payPrice*1 >= v.fullAmount * 1
if(payPrice<=0){
return {
...v,
@@ -229,5 +230,21 @@ export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
...v,
use: v.use && isfullAmount
}
- })
+ }).filter(v => v.use)
+}
+
+//根据商品数量还有商品券数量返回优惠券可以使用的数量数组
+export function returnCanUseNumProductCoup(coupArr,){
+ let productCoup = coupArr.filter(v => v.type == 2)
+ //商品券分组
+ let coupMap={}
+ for(let i in productCoup){
+ const coup=productCoup[i]
+ if(coupMap.hasOwnProperty(coup.proId)){
+ coupMap[coup.proId].push(coup)
+ }else{
+ coupMap[coup.proId]=[coup]
+ }
+ }
+ return arr
}
\ No newline at end of file
From 56b9c1ebf719f7c57c9765b65176d24db0bb9538 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 23 Nov 2024 17:58:53 +0800
Subject: [PATCH 17/22] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.development b/.env.development
index fdeba2f..98c3e63 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
# 测试
-VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
#预发布
-# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# 生产
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
From ae03b5b9f34f557eaf888ff1a315e6353f14d35e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 23 Nov 2024 18:13:01 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.production b/.env.production
index 2a4f841..1db13cc 100644
--- a/.env.production
+++ b/.env.production
@@ -3,13 +3,13 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# 测试
-VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
# 生产
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# 预发布接口
-# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# VUE_APP_BASE_API = 'http://192.168.2.98:8000'
# 如果接口是 http 形式， wss 需要改为 ws
From 62d775a668ed248271a75f1784dfef086195281f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 23 Nov 2024 18:13:23 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.development b/.env.development
index 98c3e63..fdeba2f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ ENV = 'development'
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
# 测试
-# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
#预发布
-VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# 生产
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
From 94bf94b16a9b8640fbd90c82673ee242f4ddad5f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 25 Nov 2024 09:33:06 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E9=87=91=E9=A2=9D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/order_manage/components/orderDetail.vue | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 349f845..edff56b 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -351,11 +351,9 @@ export default {
youHuiJinE() {
console.log(this.vipDiscountAmount);
const discountAmount=this.detail.discountAmount;
- const calcDiscountAmount=(this.detail.originAmount*(1-this.detail.discountRatio)).toFixed(2);
- console.log(this.detail.originAmount*(1-this.detail.discountRatio))
const n = $util.numSum([
this.vipDiscountAmount,
- (discountAmount?discountAmount:calcDiscountAmount),
+ discountAmount,
this.detail.productCouponDiscountAmount,
this.detail.fullCouponDiscountAmount,
this.detail.pointsDiscountAmount,
From 54f0a407c2cfc928475622ad5d717ee64c905e8e Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 25 Nov 2024 09:41:24 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.production b/.env.production
index 2a4f841..7f079f7 100644
--- a/.env.production
+++ b/.env.production
@@ -3,10 +3,10 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
# 测试
-VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
# 生产
-# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# 预发布接口
# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
From 22bec823b284a271e505c86b3b2125be893d51eb Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 25 Nov 2024 09:42:32 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env.production b/.env.production
index 2927b1e..7f079f7 100644
--- a/.env.production
+++ b/.env.production
@@ -9,7 +9,7 @@ ENV = 'production'
VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
# 预发布接口
-VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
+# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn'
# VUE_APP_BASE_API = 'http://192.168.2.98:8000'
# 如果接口是 http 形式， wss 需要改为 ws