修复限时折扣问题
This commit is contained in:
@@ -7,14 +7,14 @@ VITE_APP_BASE_API=/dev-api
|
|||||||
# 接口地址
|
# 接口地址
|
||||||
|
|
||||||
# VITE_APP_API_URL=https://tapi.cashier.sxczgkj.cn/ # 测试
|
# VITE_APP_API_URL=https://tapi.cashier.sxczgkj.cn/ # 测试
|
||||||
# VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式
|
VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式
|
||||||
VITE_APP_API_URL=http://192.168.1.42/ # 本地
|
# VITE_APP_API_URL=http://192.168.1.42/ # 本地
|
||||||
|
|
||||||
|
|
||||||
# WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws
|
# WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws
|
||||||
# VITE_APP_WS_ENDPOINT=wss://sockets.sxczgkj.com/wss
|
# VITE_APP_WS_ENDPOINT=wss://sockets.sxczgkj.com/wss
|
||||||
# VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss # 正式
|
VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss # 正式
|
||||||
VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地
|
# VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地
|
||||||
|
|
||||||
|
|
||||||
# 启用 Mock 服务
|
# 启用 Mock 服务
|
||||||
|
|||||||
@@ -198,8 +198,8 @@ export const useCartsStore = defineStore("carts", () => {
|
|||||||
goods.value = res.records.map(item => {
|
goods.value = res.records.map(item => {
|
||||||
return {
|
return {
|
||||||
...item,
|
...item,
|
||||||
isLimitDiscount: limitDiscountRes.value !== null && canUseLimitTimeDiscount(item, limitDiscountRes.value, shopInfo, shopUser.userInfo),
|
isLimitDiscount: limitDiscountRes.value !== null && canUseLimitTimeDiscount(item, limitDiscountRes.value, shopInfo, vipUser.value),
|
||||||
limitDiscountPrice: limitDiscountRes.value !== null && returnPrice({ goods: { ...item, memberPrice: item.lowMemberPrice, salePrice: item.lowPrice }, shopInfo: shopInfo, limitTimeDiscountRes: limitDiscountRes.value, shopUserInfo: shopUser.userInfo, idKey: 'id' })
|
limitDiscountPrice: limitDiscountRes.value !== null && returnPrice({ goods: { ...item, memberPrice: item.lowMemberPrice, salePrice: item.lowPrice }, shopInfo: shopInfo, limitTimeDiscountRes: limitDiscountRes.value, shopUserInfo: vipUser.value, idKey: 'id' })
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -314,7 +314,7 @@ export const useCartsStore = defineStore("carts", () => {
|
|||||||
fullReductionActivities: fullReductionActivities.value,
|
fullReductionActivities: fullReductionActivities.value,
|
||||||
currentDinnerType: dinnerType.value,
|
currentDinnerType: dinnerType.value,
|
||||||
limitTimeDiscount: limitDiscountRes.value,
|
limitTimeDiscount: limitDiscountRes.value,
|
||||||
shopUserInfo: shopUser.userInfo,
|
shopUserInfo: vipUser.value,
|
||||||
newUserDiscount: newUserDiscount.value
|
newUserDiscount: newUserDiscount.value
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ export function returnIsSeatFee(item) {
|
|||||||
/**
|
/**
|
||||||
* 计算购物车会员优惠价格
|
* 计算购物车会员优惠价格
|
||||||
*/
|
*/
|
||||||
export function returnVipDiscountPrice() {}
|
export function returnVipDiscountPrice() { }
|
||||||
|
|
||||||
//计算商品券优惠价格
|
//计算商品券优惠价格
|
||||||
export function returnProductCouponPrice(coup, goodsArr, vipUser) {
|
export function returnProductCouponPrice(coup, goodsArr, vipUser) {
|
||||||
@@ -243,6 +243,9 @@ export function returnCartPrice(goods, vipUser) {
|
|||||||
|
|
||||||
// 价格保留两位小数不四舍五入
|
// 价格保留两位小数不四舍五入
|
||||||
export function customTruncateToTwoDecimals(number) {
|
export function customTruncateToTwoDecimals(number) {
|
||||||
|
if (!number) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
let stringNumber = number.toString();
|
let stringNumber = number.toString();
|
||||||
let dotIndex = stringNumber.indexOf(".");
|
let dotIndex = stringNumber.indexOf(".");
|
||||||
if (dotIndex === -1) {
|
if (dotIndex === -1) {
|
||||||
|
|||||||
Reference in New Issue
Block a user