From 120c478b86ebcd915745e6602e71cb0df782870d Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Fri, 1 Mar 2024 20:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=93=E7=AE=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/product.js | 13 + src/components/payCard.vue | 199 +++++++++++++++ src/components/settleAccount.vue | 20 -- src/views/home/components/cartOperation.vue | 18 +- src/views/home/components/goods.vue | 1 - src/views/home/components/settleAccount.vue | 258 ++++++++++++++++++++ src/views/home/index.vue | 88 +++---- 7 files changed, 520 insertions(+), 77 deletions(-) create mode 100644 src/components/payCard.vue delete mode 100644 src/components/settleAccount.vue create mode 100644 src/views/home/components/settleAccount.vue diff --git a/src/api/product.js b/src/api/product.js index e60fa43..4d06036 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -130,4 +130,17 @@ export function getCartList(params) { }); } +/** + * 清空购物车 + * @param {*} params + * @returns + */ +export function clearCart(data) { + return request({ + method: "post", + url: "/order/clearCart", + data + }); +} + diff --git a/src/components/payCard.vue b/src/components/payCard.vue new file mode 100644 index 0000000..a7351be --- /dev/null +++ b/src/components/payCard.vue @@ -0,0 +1,199 @@ + + + + + \ No newline at end of file diff --git a/src/components/settleAccount.vue b/src/components/settleAccount.vue deleted file mode 100644 index 8052568..0000000 --- a/src/components/settleAccount.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/views/home/components/cartOperation.vue b/src/views/home/components/cartOperation.vue index de8bfc2..18900d1 100644 --- a/src/views/home/components/cartOperation.vue +++ b/src/views/home/components/cartOperation.vue @@ -5,7 +5,7 @@ -
+
{{ props.item.number || 1 }}
@@ -13,7 +13,7 @@
-
+
@@ -31,19 +31,19 @@ 打包
-
+
删除
-
+
挂单
-
+
@@ -65,13 +65,14 @@ const props = defineProps({ default: {} } }) -const emit = defineEmits(['confirm', 'delete', 'pending']) +const emit = defineEmits(['confirm', 'delete', 'pending', 'clearCart']) const takeFoodCodeRef = ref(null) const skuModalRef = ref([]) // 赠送打包操作 function giftPackHandle(key) { + if (!props.item.id) return if (props.item[key] == 'true') { props.item[key] = false } else { @@ -82,6 +83,7 @@ function giftPackHandle(key) { // 加减修改数量 function numberChange(t) { + if (!props.item.id) return switch (t) { case 'sub': if (props.item.number <= 1) return @@ -98,12 +100,14 @@ function numberChange(t) { // 输入修改数量 function updateNumber(num) { + if (!props.item.id) return props.item.number = num emit('confirm', props.item) } // 显示规格 function showSkuModal() { + if (!props.item.id) return if (props.item.tbProductSpec && props.item.tbProductSpec.specList) { skuModalRef.value.show(props.item, 'cart') } @@ -111,7 +115,7 @@ function showSkuModal() { // 修改规格 function skuConfirm(e) { - console.log(e) + if (!props.item.id) return emit('confirm', e) } diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue index e5161d9..99b969f 100644 --- a/src/views/home/components/goods.vue +++ b/src/views/home/components/goods.vue @@ -172,7 +172,6 @@ async function queryCategoryAjax() { // 查询商品信息 async function productqueryCommodityInfoAjax() { try { - console.log(props.masterId) const res = await productqueryCommodityInfo({ shopId: store.userInfo.shopId, categoryId: categorys.value[categorysActive.value].id, diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue new file mode 100644 index 0000000..219840d --- /dev/null +++ b/src/views/home/components/settleAccount.vue @@ -0,0 +1,258 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index a0c4996..b1275a4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -22,9 +22,9 @@
-
-
+
+
{{ item.name }} ￥{{ item.salePrice }} @@ -53,8 +53,8 @@
- +
@@ -74,7 +74,7 @@
- +
￥{{ cartInfo.totalAmount }} 结算 @@ -98,7 +98,7 @@ - + @@ -109,10 +109,10 @@ import { useUser } from "@/store/user.js" import remarkModal from '@/components/remarkModal.vue' import takeFoodCode from '@/components/takeFoodCode.vue' import cartOperation from '@/views/home/components/cartOperation.vue' -import settleAccount from '@/components/settleAccount.vue' +import settleAccount from '@/views/home/components/settleAccount.vue' import pendingCartModal from '@/views/home/components/pendingCartModal.vue' -import { createCart, queryCart, createCode, packall, delCart, cartStatus } from '@/api/product' +import { createCart, queryCart, createCode, packall, delCart, cartStatus, clearCart } from '@/api/product' // 商品列表 import goods from '@/views/home/components/goods.vue' @@ -123,10 +123,12 @@ const remarkRef = ref(null) const takeFoodCodeRef = ref(null) const goodsRef = ref(null) const pendingCartModalRef = ref(null) +const settleAccountRef = ref(null) const allSelected = ref(false) -const cartLoading = ref(false) +const remark = ref('') +const cartListActive = ref(0) const cartList = ref([]) const cartInfo = ref({}) @@ -135,23 +137,40 @@ const masterId = ref('') // 挂单量 const pendingCartNum = ref(0) +// 清空购物车 +async function clearCartHandle() { + try { + await clearCart({ + shopId: store.userInfo.shopId, + masterId: masterId.value + }) + queryCartAjax() + } catch (error) { + console.log(error) + } +} + // 恢复挂单 async function pendingCartHandle(item) { - masterId.value = item.masterId - await pendingCart(item, false) + const nItem = { ...item } + if (cartList.value.length) { + // 当购物车有数据时，先挂起当前购物车 + await pendingCart({ masterId: masterId.value }) + } + masterId.value = nItem.masterId + await pendingCart(nItem, false) await queryCartAjax() } // 挂单 async function pendingCart(params, status = true) { try { - cartLoading.value = true await cartStatus({ shopId: store.userInfo.shopId, masterId: params.masterId, status: status }) - if (status) createCodeAjax() + if (status && !cartList.value.length) createCodeAjax() } catch (error) { console.log(error) } @@ -160,7 +179,6 @@ async function pendingCart(params, status = true) { // 删除购物车 async function delCartHandle(params) { try { - cartLoading.value = true await delCart({ masterId: params.masterId, cartId: params.id @@ -179,17 +197,7 @@ function giftPackHandle(key, item) { // 打包全选 const allSelectedHandle = async () => { - if (allSelected.value) { - allSelected.value = false - cartList.value.map(item => { - item.isPack = false - }) - } else { - allSelected.value = true - cartList.value.map(item => { - item.isPack = true - }) - } + allSelected.value = !allSelected.value await packall({ shopId: store.userInfo.shopId, status: allSelected.value, @@ -204,20 +212,14 @@ function takeFoodCodeSuccess(code) { queryCartAjax() } -const selectCartItem = ref({}) // 从购物车选择商品 -function selectCartItemHandle(item) { - cartList.value.map(val => { - val.active = false - }) - item.active = true - selectCartItem.value = item +function selectCartItemHandle(item, index) { + cartListActive.value = index } // 选择完规格开始添加购物车 async function addCart(params, type = 'add') { try { - cartLoading.value = true const res = await createCart({ productId: params.productId, masterId: masterId.value, @@ -239,27 +241,14 @@ async function addCart(params, type = 'add') { // 获取购物车商品 async function queryCartAjax() { try { - cartLoading.value = true const res = await queryCart({ masterId: masterId.value, shopId: store.userInfo.shopId }) - selectCartItem.value = {} - cartList.value = res.list.map((item, index) => { - if (index == 0) { - item.active = true - selectCartItem.value = item - } else { - item.active = false - } - return item - }) + cartList.value = res.list cartInfo.value = res.amount pendingCartNum.value = res.num goodsRef.value.updateData() - setTimeout(() => { - cartLoading.value = false - }, 100) } catch (error) { console.log('获取购物车商品', error) } @@ -269,7 +258,8 @@ async function queryCartAjax() { async function createCodeAjax() { try { const res = await createCode({ shopId: store.userInfo.shopId }) - masterId.value = res.code + // masterId.value = res.code + masterId.value = '#51' queryCartAjax() } catch (error) { console.log(error)