diff --git a/pages/cart/components/cart-bar/index.wxml b/pages/cart/components/cart-bar/index.wxml index 486a0d5..c816d25 100644 --- a/pages/cart/components/cart-bar/index.wxml +++ b/pages/cart/components/cart-bar/index.wxml @@ -1,31 +1,19 @@ - - 全选 - - - 总计 - - （不含运费） - - - 已优惠 - - - - - - + + 全选 + + + 总计 + + （不含运费） + + + 已优惠 + + + + + \ No newline at end of file diff --git a/pages/cart/components/cart-bar/index.wxss b/pages/cart/components/cart-bar/index.wxss index 0e63f60..b054b49 100644 --- a/pages/cart/components/cart-bar/index.wxss +++ b/pages/cart/components/cart-bar/index.wxss @@ -44,7 +44,7 @@ width: 192rpx; height: 80rpx; border-radius: 40rpx; - background-color: #fa4126; + background-color: #1989fa; font-size: 28rpx; font-weight: bold; line-height: 80rpx; diff --git a/pages/cart/components/cart-group/index.js b/pages/cart/components/cart-group/index.js index 99a908d..99f4f0b 100644 --- a/pages/cart/components/cart-group/index.js +++ b/pages/cart/components/cart-group/index.js @@ -13,11 +13,15 @@ Component({ for (const store of storeGoods) { for (const activity of store.promotionGoodsList) { for (const goods of activity.goodsPromotionList) { - goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + if(goods.specInfo){ + goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + } } } for (const goods of store.shortageGoodsList) { - goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + if(goods.specInfo){ + goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + } } } @@ -28,7 +32,9 @@ Component({ type: Array, observer(invalidGoodItems) { invalidGoodItems.forEach((goods) => { - goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + if(goods.specInfo){ + goods.specs = goods.specInfo.map((item) => item.specValue); // 目前仅展示商品已选规格的值 + } }); this.setData({ _invalidGoodItems: invalidGoodItems }); }, @@ -127,6 +133,14 @@ Component({ }); }, + gotoShop(e){ + const { storeIndex } = e.currentTarget.dataset; + const store = this.data.storeGoods[storeIndex]; + wx.navigateTo({ + url: "/pages/shop/all-goods/index?shopGuid=" + store.storeId, + }); + }, + // 展开/收起切换 showToggle() { this.setData({ @@ -136,12 +150,12 @@ Component({ // 展示规格popup specsTap(e) { - this.isSpecsTap = true; - const { goods } = e.currentTarget.dataset; - this.setData({ - isShowSpecs: true, - currentGoods: goods, - }); + // this.isSpecsTap = true; + // const { goods } = e.currentTarget.dataset; + // this.setData({ + // isShowSpecs: true, + // currentGoods: goods, + // }); }, hideSpecsPopup() { diff --git a/pages/cart/components/cart-group/index.wxml b/pages/cart/components/cart-group/index.wxml index 9e3c1d9..58cd53c 100644 --- a/pages/cart/components/cart-group/index.wxml +++ b/pages/cart/components/cart-group/index.wxml @@ -2,8 +2,8 @@ - - + + {{store.storeName}} - 优惠券 + @@ -145,7 +145,7 @@ price="{{currentGoods.price || ''}}" thumb="{{utils.imgCut(currentGoods.thumb, 180, 180)}}" specs="{{currentGoods.specs || []}}" - zIndex="{{999}}" + zIndex="{{99}}" bindclose="hideSpecsPopup" /> diff --git a/pages/cart/components/goods-card/index.wxml b/pages/cart/components/goods-card/index.wxml index df4111f..02cca72 100644 --- a/pages/cart/components/goods-card/index.wxml +++ b/pages/cart/components/goods-card/index.wxml @@ -8,12 +8,18 @@ - --> + @@ -38,6 +44,7 @@ { let isEmpty = true; const cartGroupData = res; - console.log(cartGroupData,'1231232'); // 一些组件中需要的字段可能接口并没有返回，或者返回的数据结构与预期不一致，需要在此先对数据做一些处理 // 统计门店下加购的商品是否全选、是否存在缺货/无货 for (const store of cartGroupData.storeGoods) { @@ -62,7 +76,9 @@ Page({ // return goods; // }); cartGroupData.isNotEmpty = !isEmpty; - this.setData({ cartGroupData }); + this.setData({ + cartGroupData + }); }); }, @@ -70,7 +86,9 @@ Page({ let currentStore; let currentActivity; let currentGoods; - const { storeGoods } = this.data.cartGroupData; + const { + storeGoods + } = this.data.cartGroupData; for (const store of storeGoods) { for (const activity of store.promotionGoodsList) { for (const goods of activity.goodsPromotionList) { @@ -96,68 +114,59 @@ Page({ // 注：实际场景时应该调用接口获取购物车数据 getCartGroupData() { - const { cartGroupData } = this.data; - if (!cartGroupData) { - return fetchCartGroupData(); - } - return Promise.resolve({ data: cartGroupData }); + return fetchCartGroupData(); }, // 选择单个商品 // 注：实际场景时应该调用接口更改选中状态 - selectGoodsService({ spuId, skuId, isSelected }) { - this.findGoods(spuId, skuId).currentGoods.isSelected = isSelected; - return Promise.resolve(); + selectGoodsService( + cartId, + isSelected + ) { + let data = { + cartId: cartId, + isSelected: isSelected, + } + return updateCartGoodsSelect(data); }, // 全选门店 // 注：实际场景时应该调用接口更改选中状态 - selectStoreService({ storeId, isSelected }) { + selectStoreService({ + storeId, + isSelected + }) { const currentStore = this.data.cartGroupData.storeGoods.find((s) => s.storeId === storeId); currentStore.isSelected = isSelected; currentStore.promotionGoodsList.forEach((activity) => { activity.goodsPromotionList.forEach((goods) => { - goods.isSelected = isSelected; + console.log(goods.cartId,'asdasd'); + this.selectGoodsService(goods.cartId, isSelected) }); }); return Promise.resolve(); }, - // 加购数量变更 - // 注：实际场景时应该调用接口 - changeQuantityService({ spuId, skuId, quantity }) { - this.findGoods(spuId, skuId).currentGoods.quantity = quantity; - return Promise.resolve(); + // 加购数量变更接口 + changeQuantityService({ + cartId, + quantity + }) { + // this.findGoods(spuId, skuId).currentGoods.quantity = quantity; + let data = { + cartId: cartId, + cartGoodsNum: quantity, + } + return updateCartGoodsNum(data).then((res) => { + this.refreshData(); + }) }, // 删除加购商品 // 注：实际场景时应该调用接口 - deleteGoodsService({ spuId, skuId }) { - function deleteGoods(group) { - for (const gindex in group) { - const goods = group[gindex]; - if (goods.spuId === spuId && goods.skuId === skuId) { - group.splice(gindex, 1); - return gindex; - } - } - return -1; - } - const { storeGoods, invalidGoodItems } = this.data.cartGroupData; - for (const store of storeGoods) { - for (const activity of store.promotionGoodsList) { - if (deleteGoods(activity.goodsPromotionList) > -1) { - return Promise.resolve(); - } - } - if (deleteGoods(store.shortageGoodsList) > -1) { - return Promise.resolve(); - } - } - if (deleteGoods(invalidGoodItems) > -1) { - return Promise.resolve(); - } - return Promise.reject(); + deleteGoodsService(cartId) { + // console.log(cartId,'删除的id'); + return deleteCart(cartId) }, // 清空失效商品 @@ -169,35 +178,59 @@ Page({ onGoodsSelect(e) { const { - goods: { spuId, skuId }, + goods: { + cartId, + spuId, + skuId + }, isSelected, } = e.detail; - const { currentGoods } = this.findGoods(spuId, skuId); - Toast({ - context: this, - selector: '#t-toast', - message: `${isSelected ? '选择' : '取消'}"${ - currentGoods.title.length > 5 ? `${currentGoods.title.slice(0, 5)}...` : currentGoods.title - }"`, - icon: '', + // const { + // currentGoods + // } = this.findGoods(spuId, skuId); + // Toast({ + // context: this, + // selector: '#t-toast', + // message: `${isSelected ? '选择' : '取消'}"${ + // currentGoods.title.length > 5 ? `${currentGoods.title.slice(0, 5)}...` : currentGoods.title + // }"`, + // icon: '', + // }); + this.selectGoodsService( + cartId, + isSelected + ).then(() => { + this.refreshData() }); - this.selectGoodsService({ spuId, skuId, isSelected }).then(() => this.refreshData()); }, onStoreSelect(e) { const { - store: { storeId }, + store: { + storeId + }, isSelected, } = e.detail; - this.selectStoreService({ storeId, isSelected }).then(() => this.refreshData()); + this.selectStoreService({ + storeId, + isSelected + }).then(() => this.refreshData()); }, + // 修改购物车的商品数量 onQuantityChange(e) { + console.log(e.detail, '加够的信息'); const { - goods: { spuId, skuId }, + goods: { + spuId, + skuId, + cartId + }, quantity, } = e.detail; - const { currentGoods } = this.findGoods(spuId, skuId); + const { + currentGoods + } = this.findGoods(spuId, skuId); const stockQuantity = currentGoods.stockQuantity > 0 ? currentGoods.stockQuantity : 0; // 避免后端返回的是-1 // 加购数量超过库存数量 if (quantity > stockQuantity) { @@ -211,22 +244,24 @@ Page({ return; } Dialog.confirm({ - title: '商品库存不足', - content: `当前商品库存不足，最大可购买数量为${stockQuantity}件`, - confirmBtn: '修改为最大可购买数量', - cancelBtn: '取消', - }) + title: '商品库存不足', + content: `当前商品库存不足，最大可购买数量为${stockQuantity}件`, + confirmBtn: '修改为最大可购买数量', + cancelBtn: '取消', + }) .then(() => { this.changeQuantityService({ - spuId, - skuId, - quantity: stockQuantity, - }).then(() => this.refreshData()); + cartId, + stockQuantity, + }); }) .catch(() => {}); return; } - this.changeQuantityService({ spuId, skuId, quantity }).then(() => this.refreshData()); + this.changeQuantityService({ + cartId, + quantity + }); }, goCollect() { @@ -238,7 +273,10 @@ Page({ }, goGoodsDetail(e) { - const { spuId, storeId } = e.detail.goods; + const { + spuId, + storeId + } = e.detail.goods; wx.navigateTo({ url: `/pages/goods/details/index?spuId=${spuId}&storeId=${storeId}`, }); @@ -251,28 +289,44 @@ Page({ onGoodsDelete(e) { const { - goods: { spuId, skuId }, + goods: { + cartId + }, } = e.detail; Dialog.confirm({ content: '确认删除该商品吗?', confirmBtn: '确定', cancelBtn: '取消', }).then(() => { - this.deleteGoodsService({ spuId, skuId }).then(() => { - Toast({ context: this, selector: '#t-toast', message: '商品删除成功' }); - this.refreshData(); + this.deleteGoodsService(cartId).then((res) => { + if (res.code === 200) { + Toast({ + context: this, + selector: '#t-toast', + message: '商品删除成功' + }); + this.refreshData(); + } }); }); }, onSelectAll(event) { - const { isAllSelected } = event?.detail ?? {}; - Toast({ - context: this, - selector: '#t-toast', - message: `${isAllSelected ? '取消' : '点击'}了全选按钮`, - }); + const { + isAllSelected + } = event?.detail ?? {}; + // Toast({ + // context: this, + // selector: '#t-toast', + // message: `${isAllSelected ? '取消' : '点击'}了全选按钮`, + // }); + // console.log(isAllSelected); // 调用接口改变全选 + selectAllCartGoods({isSelected: !isAllSelected}).then((res) => { + if(res.code === 200){ + this.refreshData() + } + }) }, onToSettle() { @@ -287,9 +341,13 @@ Page({ }); }); wx.setStorageSync('order.goodsRequestList', JSON.stringify(goodsRequestList)); - wx.navigateTo({ url: '/pages/order/order-confirm/index?type=cart' }); + wx.navigateTo({ + url: '/pages/order/order-confirm/index?type=cart' + }); }, onGotoHome() { - wx.switchTab({ url: '/pages/home/home' }); + wx.switchTab({ + url: '/pages/home/home' + }); }, -}); +}); \ No newline at end of file diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml index 8828092..b7994fd 100644 --- a/pages/cart/index.wxml +++ b/pages/cart/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss index ea19962..a50a87d 100644 --- a/pages/cart/index.wxss +++ b/pages/cart/index.wxss @@ -2,12 +2,13 @@ padding-bottom: 100rpx; } +.cart-box{ + margin-bottom: 1000rpx; +} + .gap { height: 100rpx; width: 100%; } -.t-button { - --td-button-default-color: #000; - --td-button-primary-text-color: #fa4126; -} + diff --git a/pages/goods/details/components/goods-specs-popup/index.js b/pages/goods/details/components/goods-specs-popup/index.js index 2608637..a8fad6c 100644 --- a/pages/goods/details/components/goods-specs-popup/index.js +++ b/pages/goods/details/components/goods-specs-popup/index.js @@ -338,6 +338,7 @@ Component({ this.setData({ buyNum: value, }); + this.setBuyNum(value) }, }, }); diff --git a/pages/goods/details/index.js b/pages/goods/details/index.js index 5b739ba..e340468 100644 --- a/pages/goods/details/index.js +++ b/pages/goods/details/index.js @@ -2,6 +2,9 @@ import Toast from 'tdesign-miniprogram/toast/index'; import { fetchGood } from '~/services/good/fetchGood'; +import { + addOrUpdateCart +} from '~/services/cart/addOrUpdateCart'; import { fetchActivityList } from '~/services/activity/fetchActivityList'; @@ -77,6 +80,7 @@ Page({ specImg: '', isSpuSelectPopupShow: false, isAllSelectedSku: false, + selectedSkuId: 0, buyType: 0, outOperateStatus: false, // 是否外层加入购物车 operateType: 0, @@ -193,7 +197,9 @@ Page({ }); this.selectSpecsName(selectedSkuValues.length > 0 ? selectedAttrStr : ''); if (skuItem) { + console.log(skuItem[0]?.skuId,'选中的item'); this.setData({ + selectedSkuId: skuItem[0]?.skuId, selectItem: skuItem, selectSkuSellsPrice: skuItem[0]?.priceInfo[0].price || 0, selectSkuLinePrice: skuItem[0]?.priceInfo[1].price || 0, @@ -215,6 +221,7 @@ Page({ getSelectedSkuValues(skuTree, selectedSku) { const normalizedTree = this.normalizeSkuTree(skuTree); return Object.keys(selectedSku).reduce((selectedValues, skuKeyStr) => { + console.log(selectedSku,'sku啊'); const skuValues = normalizedTree[skuKeyStr]; const skuValueId = selectedSku[skuKeyStr]; if (skuValueId !== '') { @@ -247,29 +254,75 @@ Page({ } }, + /** 加入购物车 */ addCart() { const { - isAllSelectedSku + isAllSelectedSku, } = this.data; const { - specList + specList, } = this.data.details; + if (specList.length != 0) { - Toast({ - context: this, - selector: '#t-toast', - message: isAllSelectedSku ? '点击加入购物车' : '请选择规格', - icon: '', - duration: 1000, - }); + if (isAllSelectedSku) { + this.addCartFun() + } else { + Toast({ + context: this, + selector: '#t-toast', + message: '请选择规格', + icon: '', + duration: 1000, + }); + } } + else{ + this.addCartFun() + } + }, + + addCartFun(){ + const { + isAllSelectedSku, + buyNum, + selectedSkuId + } = this.data; + const { + specList, + shopGuid, + spuId, + } = this.data.details; + + let data = { + shopGuid: shopGuid, + goodsGuid: spuId, + goodsSkuId: selectedSkuId, + cartGoodsNum: buyNum + } + console.log(data, '加入购物车的数据'); + + // 添加购物车接口 + addOrUpdateCart(data).then((res) => { + if (res.code == 200) { + Toast({ + context: this, + selector: '#t-toast', + message: '加入购物车成功', + icon: '', + duration: 1000, + }); + this.setData({ + isSpuSelectPopupShow: false, + }); + } + }) }, gotoBuy(type) { console.log(type); const { isAllSelectedSku, - buyNum + buyNum, } = this.data; const { specList @@ -315,7 +368,7 @@ Page({ }); }, - gotoShop(){ + gotoShop() { const { shopGuid } = this.data.details; @@ -506,7 +559,7 @@ Page({ const { spuId } = query; - // const spuId = "1680467515018448896"; + // const spuId = "1672964367177617408"; this.setData({ spuId: spuId, diff --git a/services/cart/addOrUpdateCart.js b/services/cart/addOrUpdateCart.js new file mode 100644 index 0000000..2b23a08 --- /dev/null +++ b/services/cart/addOrUpdateCart.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + +/** 添加购物车 */ +export function addOrUpdateCart(data) { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/addOrUpdateCart`, + method: 'POST', + data: data, + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/cart/deleteCart.js b/services/cart/deleteCart.js new file mode 100644 index 0000000..70723df --- /dev/null +++ b/services/cart/deleteCart.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + + +/** 删除购物车记录 */ +export function deleteCart(ids) { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/` + ids, + method: 'DELETE', + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/cart/selectAllCartGoods.js b/services/cart/selectAllCartGoods.js new file mode 100644 index 0000000..b2887b9 --- /dev/null +++ b/services/cart/selectAllCartGoods.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + +/** 全选购物车商品 */ +export function selectAllCartGoods(data) { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/selectAllCartGoods`, + method: 'POST', + data: data, + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/cart/updateCartGoodsNum.js b/services/cart/updateCartGoodsNum.js new file mode 100644 index 0000000..4db0527 --- /dev/null +++ b/services/cart/updateCartGoodsNum.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + +/** 修改购物车商品数量 */ +export function updateCartGoodsNum(data) { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/updateCartGoodsNum`, + method: 'POST', + data: data, + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/services/cart/updateCartGoodsSelect.js b/services/cart/updateCartGoodsSelect.js new file mode 100644 index 0000000..598c3d1 --- /dev/null +++ b/services/cart/updateCartGoodsSelect.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + +/** 修改购物车商品数量 */ +export function updateCartGoodsSelect(data) { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/updateCartGoodsSelect`, + method: 'POST', + data: data, + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file diff --git a/style/theme.wxss b/style/theme.wxss index d3e606e..12b0e07 100644 --- a/style/theme.wxss +++ b/style/theme.wxss @@ -47,6 +47,11 @@ --td-tab-track-color: #1989fa; } +.t-button { + --td-button-default-color: #000; + --td-button-primary-text-color: #1989fa; +} + .dialog__button-confirm { color: #1989fa !important; }