修复余额显示问题,增加未开启智慧充值禁用余额支付,修复自动删除未找到对应购物车问题

This commit is contained in:
2025-12-25 11:35:04 +08:00
parent edd10edf9f
commit 113193b142
7 changed files with 48 additions and 1697 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -67,7 +67,7 @@
</rechargeFree>
<!-- 支付方式 -->
<paymentMethodes ref="paymentMethodref" :orderVIP="orderVIP" @groupChange="groupChange"
<paymentMethodes ref="paymentMethodref" :shopUserInfo="orderVIP" @groupChange="groupChange"
:disablePayType="disablePayType" :changeFreeenable="isBwc" v-model="paymentmethod"
v-if="listinfo.status == 'unpaid' || !listinfo.id">
<template #bottom>
@@ -203,6 +203,7 @@
useWebSocket
} from "@/stores/carts-websocket.js";
import * as chatApi from "@/http/php/chat";
import * as rechargeApi from '@/common/api/market/recharge.js'
import MsgListItem from '@/components/msg-list-item/msg-list-item.vue'
@@ -858,8 +859,6 @@
icon: "none",
});
const shopUserInfo = uni.cache.get("shopUserInfo");
console.log("shopUserInfo", shopUserInfo);
console.log("listinfo", listinfo);
if (shopUserInfo) {
if (shopUserInfo.userId == listinfo.userId) {
pay_unlock();
@@ -1011,7 +1010,6 @@
// 更新数据
if (orderVIP.value) {
orderVIP.value = uni.cache.get("orderVIP");
paymentMethodref.value.orderVIPfun(uni.cache.get("orderVIP"));
if (listinfo.id && ordershopUserInfo.value.registerType != "before") {
orderorderInfo();
}
@@ -1113,10 +1111,11 @@
}
const limitTimeDiscountRes = ref(null)
const rechargeConfig=ref(null)
async function init(opt) {
await storeuser.actionsproductqueryProduct();
console.log("init");
const res1= await storeuser.actionsproductqueryProduct();
orderVIP.value=res1
console.log('orderVIP',orderVIP.value)
cartStore.clearOrderConfig();
Object.assign(options, opt);
listinfo.id = options.orderId;
@@ -1158,6 +1157,11 @@
const shopInfoRes = await APIusershopInfodetail({
shopId: options.shopId,
});
//智慧充值
const rechargeConfigRes=await rechargeApi.config({shopId: options.shopId})
if(rechargeConfigRes&&typeof rechargeConfigRes ==='object'){
rechargeConfig.value=rechargeConfigRes
}
//获取积分配置
pointsApi.pointsConfig().then(res => {
cartStore.setPointDeductionRule(res);
@@ -1282,6 +1286,9 @@
if (!isCanUseCharge.value) {
arr.add("余额支付");
}
if(rechargeConfig.value&&!rechargeConfig.value.isEnable){
arr.add("余额支付");
}
return Array.from(arr);
});

View File

@@ -583,7 +583,6 @@
console.log(uni.cache.get('orderVIP'))
orderVIP.value = uni.cache.get('orderVIP')
ordershopUserInfo.value = orderVIP.value.shopInfo
paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
if (orderId.value) {
orderorderInfo()
}

View File

@@ -1585,11 +1585,10 @@
// 返回商品对应sku数据
function cartInit(arr) {
const result = []
console.log('cartInitArr', arr);
console.log('allGoodsArr', allGoodsArr);
cartStore.carts = arr.map(v => {
const goods = allGoodsArr.find(g => g.id == v.product_id)
const goods = cartStore.allGoodsArr.find(g => g.id == v.product_id)
const goodsSkuList = goods ? goods.skuList : []
const findSku = goodsSkuList.find(sku => sku.id == v.sku_id)
const memberPrice = findSku ? findSku.memberPrice : 0
@@ -1599,6 +1598,13 @@
}, cartStore.limitTimeDiscount, shopInfo,
shopUserInfo.value, 'product_id');
if (!goods) {
console.log('删除未匹配到的商品', {
id: v.id,
operate_type: "del",
table_code: uni.cache.get('tableCode'),
shop_id: uni.cache.get('shopId'),
type: "shopping",
})
useSocket.sendMessage({
id: v.id,
operate_type: "del",
@@ -1647,7 +1653,7 @@
isLoading.value = false;
return false;
}
console.log('product index 收到消息', Message);
// 检查消息是否已经处理过
if (processedMessageIds.has(Message.msg_id)) {
return;
@@ -2084,11 +2090,11 @@
}
return currentTime >= startTime && currentTime <= endTime;
});
let allGoodsArr = []
const allGoodsArr = ref([])
// 列表请求
const productqueryProduct = async () => {
cartStore.goodsIsloading = false;
allGoodsArr = []; // 确保声明过建议用ref/let声明避免全局隐式变量
allGoodsArr.value=[]
try {
shopProductList.hots = await productminiApphotsquery();
shopProductList.productInfo = await APIgroupquery();
@@ -2114,7 +2120,7 @@
product.startTime,
product.endTime
);
allGoodsArr.push(product);
allGoodsArr.value.push(product);
cartStore.setGoodsMap(product.id, product);
}
}
@@ -2123,14 +2129,15 @@
for (const i of shopProductList.hots) {
i.cartNumber = 0;
i.isSaleTimeshow = await isProductAvailable(i.days, i.startTime, i.endTime);
allGoodsArr.push(i);
allGoodsArr.value.push(i);
cartStore.setGoodsMap(i.id, i);
}
// 此时所有异步操作完成allGoodsArr已有数据
console.log('allGoodsArr', allGoodsArr);
console.log('shopProductList', shopProductList);
// console.log('allGoodsArr', allGoodsArr);
// console.log('shopProductList', shopProductList);
console.log('cartStore.carts', cartStore.carts)
cartStore.allGoodsArr=allGoodsArr.value
if (cartStore.carts.length > 0) {
cartInit(cartStore.carts);
}