From e4e07f1bd19ece4d944c926a727affbb61179a89 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 18 Dec 2025 11:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E9=A4=90=E5=8F=8D?=
=?UTF-8?q?=E5=BA=94=E6=85=A2=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E5=BA=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/product/index.vue | 92 +++++++++++++++++++++++++----------------
stores/carts.js | 1 -
2 files changed, 57 insertions(+), 36 deletions(-)
diff --git a/pages/product/index.vue b/pages/product/index.vue
index 2cc6f57..fa15b09 100644
--- a/pages/product/index.vue
+++ b/pages/product/index.vue
@@ -153,14 +153,16 @@
-
+
+
{{ ifcartNumber(item) }}
-
+
+
@@ -288,15 +290,17 @@
-
+
+
{{ ifcartNumber(item1) }}
-
+
+
@@ -318,7 +322,7 @@
@@ -470,7 +474,7 @@
v-if="specifications.item.suitNum > 1">「{{ specifications.item.suitNum }}{{ specifications.item.unitName }}起点」
-
+
@@ -486,23 +490,32 @@
{{ selectedSpecsStr }}
-
-
- {{ skuBtnText }}
-
-
- {{ skuBtnText }}
+
+
+ 库存不足
-
- {{ skuBtnText }}
-
+
+
+ {{ skuBtnText }}
+
+
+ {{ skuBtnText }}
+
+
+
+
+ {{ skuBtnText }}
+
+
+
+
@@ -1154,7 +1167,7 @@
return;
}
let res = await shoppingcart();
-
+
if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type ==
'sku' && canSubmit.value)) {
// 是否是套餐 有就传
@@ -1336,19 +1349,27 @@
return isInRange;
};
-
+
+
+ function stockNumberIsFull(item){
+ if(item.isStock && item.stockNumber < item.suitNum){
+ return false
+ }
+ return true
+ }
+
/**
* 判断商品是否可售
* @param {Object} item
*/
- function juageProductAvailable(item) {
+ function juageProductAvailable(item, i) {
if (!isProductAvailable(item.days, item.startTime, item.endTime)) {
uni.showToast({
title: '不在可售时间内'
});
return false;
}
- if (item.isStock && item.stockNumber < item.suitNum) {
+ if ( item.isStock && item.stockNumber < item.suitNum && i == '+') {
uni.showToast({
title: '库存不足',
icon: 'none'
@@ -1361,7 +1382,7 @@
// 单规格
const singleclick = async (item, i) => {
console.log('单规格商品点击事件:', item, i);
- if (!juageProductAvailable(item)) {
+ if (!juageProductAvailable(item, i)) {
return false;
}
// 判断购物车是否有该选中商品
@@ -1477,9 +1498,9 @@
const websocketsendMessage = (data) => {
console.log('websocketsendMessage', data);
delete data.memberPrice;
- uni.$u.debounce(() => {
- useSocket.sendMessage(data);
- }, 500);
+ useSocket.sendMessage(data);
+ // uni.$u.debounce(() => {
+ // }, 500);
};
// 用于记录已经处理过的消息的 msg_id
@@ -1556,7 +1577,7 @@
}
}
-
+
let socketInitFinished = false
// 收到的消息变化
async function onMessage(Message) {
@@ -1688,7 +1709,8 @@
}
// 提示
- if (Message.status == 0 && Message.type != 'no_suit_num' && Message.type != 'time_discount'&&Message.operate_type != 'rottable_error') {
+ if (Message.status == 0 && Message.type != 'no_suit_num' && Message.type != 'time_discount' && Message
+ .operate_type != 'rottable_error') {
uni.showToast({
title: Message.msg,
icon: 'none'
@@ -2210,7 +2232,7 @@
await userStore.actionsproductqueryShop(newTableCode);
await userStore.actionsproductqueryProduct();
const res = await APIhistoryOrder({
- tableCode:newTableCode
+ tableCode: newTableCode
});
if (res && res.id) {
@@ -2265,7 +2287,7 @@
if (e.one_more_order && e.order_id) {
extraInitPar.one_more_order = 1
extraInitPar.order_id = e.order_id
- extraInitPar.user_id = uni.cache.get('userInfo').id||''
+ extraInitPar.user_id = uni.cache.get('userInfo').id || ''
}
useSocket.connect({
diff --git a/stores/carts.js b/stores/carts.js
index 64466a6..f3a4526 100644
--- a/stores/carts.js
+++ b/stores/carts.js
@@ -387,7 +387,6 @@ export const useCartsStore = defineStore("cart", () => {
limitTimeDiscount.value = Message.time_dis_info;
}
cartsGoodsInfoInit(msgData);
- uni.hideLoading();
isLoading.value = false;
}