Merge remote-tracking branch 'origin/main'

xuxy

2024-08-01 34b6e0548fb7f3d88842914db89d7cd603a5e531

 sub_pages/customer/shop/shop.vue

@@ -348,7 +348,7 @@
            if (!item.stock) {

               item.stock = 0

            }

            if (item.shopnum + addnum > item.stock) {

            if (addnum > 0 & item.shopnum + addnum > item.stock) {

               this.$message.showToast('库存不足，无法修改')

               return

            }