diff --git a/components/my-components/my-up-upload.vue b/components/my-components/my-up-upload.vue index e82600d..76a8afe 100644 --- a/components/my-components/my-up-upload.vue +++ b/components/my-components/my-up-upload.vue @@ -8,9 +8,9 @@ :height="height" :maxCount="maxCount" > - diff --git a/pageMarket/packagePopularize/selectGoods.vue b/pageMarket/packagePopularize/selectGoods.vue index 1793054..262bbd0 100644 --- a/pageMarket/packagePopularize/selectGoods.vue +++ b/pageMarket/packagePopularize/selectGoods.vue @@ -42,7 +42,8 @@ async function getProductListAjax() { mask: true }); const res = await getProductList(); - list.value = res.productList; + console.log('res',res); + list.value = res; } catch (error) { console.log(error); } diff --git a/pageProduct/add-Product/components/choose-goods.vue b/pageProduct/add-Product/components/choose-goods.vue index 0fe7609..54364ff 100644 --- a/pageProduct/add-Product/components/choose-goods.vue +++ b/pageProduct/add-Product/components/choose-goods.vue @@ -145,7 +145,7 @@ let obj = pageData.types.find(item=> item.value == e) return obj.name } - + let selArr=[] getGoods() /** * 获取商品列表 @@ -200,7 +200,6 @@ const show = ref(props.modelValue) - let selArr=[] let $selGoodsMap={} async function open(arr) { diff --git a/pageProduct/add-Product/components/edit-haocai.vue b/pageProduct/add-Product/components/edit-haocai.vue index 1b6b217..eac1f14 100644 --- a/pageProduct/add-Product/components/edit-haocai.vue +++ b/pageProduct/add-Product/components/edit-haocai.vue @@ -75,7 +75,7 @@ - 当前店铺退菜退库存规则：跟随商品分类 + 当前店铺退菜退库存规则：{{nowRefundRule}} @@ -143,7 +143,13 @@ } } }) - + const shopInfo=uni.getStorageSync('shopInfo') + const nowRefundRule=computed(()=>{ + if(!shopInfo||!shopInfo.refundMode){ + return '' + } + return shopInfo.refundMode==1?'跟随商品分类':'跟随单商品' + }) const pageData = reactive({ isBindGuige: false, //是否绑定至规格 }) diff --git a/pageProduct/index/components/baosun.vue b/pageProduct/index/components/baosun.vue index 4beda9d..733eb75 100644 --- a/pageProduct/index/components/baosun.vue +++ b/pageProduct/index/components/baosun.vue @@ -31,7 +31,7 @@ 上传图片 - + diff --git a/pagesCreateOrder/index/components/list-goods-item.vue b/pagesCreateOrder/index/components/list-goods-item.vue index 169eda0..5932294 100644 --- a/pagesCreateOrder/index/components/list-goods-item.vue +++ b/pagesCreateOrder/index/components/list-goods-item.vue @@ -3,7 +3,7 @@ 限时折扣 - + 剩余库存：{{nowStockerNumber}} @@ -172,7 +172,7 @@ }) - // 1. 筛选匹配的耗材列表 + // 1. 筛选匹配的耗材列表，增加对应商品数量 const conslist=computed(()=>{ if(props.consStockList.length<=0){ return [] @@ -181,37 +181,27 @@ return props.data.consList.find(i =>{ return i.consInfoId == v.consId }); - }); - }) - // 2. 找到 stockNumber 最小的那一项 - const minConsItem=computed(()=>{ - if(conslist.value.length<=0){ - return null - } - return conslist.value.reduce((prev, current) => { - return prev.stockNumber < current.stockNumber ? prev : current; - }); - }) - // 3. 找到和 minItem 的 consId 一样的那个消耗配置项 - const targetCons=computed(()=>{ - if(!minConsItem.value){ - return null - } - return props.data.consList.find(i => i.consInfoId == minConsItem.value.consId); + }).map(v=>{ + const cItem=props.data.consList.find(c=>c.consInfoId==v.consId) + const goodsNumber=Math.floor(v.stockNumber/cItem.surplusStock) + console.log('props.data',props.data.name); + console.log('goodsNumber',goodsNumber); + return { + ...v, + goodsNumber + } + }).sort((a,b)=>{ + return a.goodsNumber-b.goodsNumber + }) }) + const nowStockerNumber=computed(()=>{ - if(!targetCons.value||!minConsItem.value){ - return 9999 - } - return Math.floor(minConsItem.value.stockNumber/targetCons.value.surplusStock) + return conslist.value[0]?conslist.value[0].goodsNumber:9999 }) function consStockisFull(item) { - // 无数据直接返回 true（或按你需求返回 false） - if (!conslist.value.length) return true; - - if(!minConsItem.value)return true; - - if(!targetCons.value) return true; + if(!item.isAutoSoldStock){ + return true + } // 4. 判断：最小库存 > 每份消耗库存 → 返回 true，否则 false if (nowStockerNumber.value>=1) { diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index b0aad30..65d900d 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -407,9 +407,9 @@ initCart(); } - - - const allHistoryOrder=ref([]) + + + const allHistoryOrder = ref([]) /** * 获取订单详情 */ @@ -432,7 +432,7 @@ console.log("data.historyOrder===", data.historyOrder); - allHistoryOrder.value = data.historyOrder.map((item) => { + allHistoryOrder.value = data.historyOrder.map((item) => { return [...item.info]; }).flat(); @@ -838,29 +838,34 @@ //更新 let cartItem = cars[goodsInCarIndex]; let number = isAdd ? cartItem.number + 1 : +cartItem.number - 1; - if(isAdd){ - if (number == 2 ) { - // 等待用户点击 - const isConfirm = await showConfirmModal( - '购物车已有该商品，请确认是否重复', - '菜名名称：《' + $goods.name + '》' - ); - if (!isConfirm) { - return - } - } - if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){ + if (isAdd) { + if (allHistoryOrder.value.find(v => v.productId == $goods.id)) { // 等待用户点击 const isConfirm = await showConfirmModal( '该商品已下单过，请确认是否重复', - '菜名名称：《' + $goods.name + '》' + '菜品名称：《' + $goods.name + '》' ); if (!isConfirm) { return } + }else{ + if (number == 2) { + // 等待用户点击 + const isConfirm = await showConfirmModal( + '购物车已有该商品，请确认是否重复', + '菜品名称：《' + $goods.name + '》' + ); + if (!isConfirm) { + return + } + } } + + } + + if (!isAdd) { if (number === 0 || number < suitNum) { //移除 @@ -889,7 +894,7 @@ data.isGoodsAdd = false; setSearchGoods(searchGoodsIndex, number); } else { - + // 不影响之前的代码 称重suit单独处理 if ($goods.type == "weight" && showCurrentInput) { suitNum = showCurrentInput; @@ -901,11 +906,11 @@ return; } } - if(allHistoryOrder.value.find(v=>v.productId==$goods.id)){ + if (allHistoryOrder.value.find(v => v.productId == $goods.id)) { // 等待用户点击 const isConfirm = await showConfirmModal( '该商品已下单过，请确认是否重复', - '菜名名称：《' + $goods.name + '》' + '菜品名称：《' + $goods.name + '》' ); if (!isConfirm) { return @@ -1144,28 +1149,27 @@ let cartId = carGoods.id; let suitNum = goods.skuList[0].suitNum || 1; let newNumber = carGoods.number * 1 + suitNum; - if (newNumber == 2&&carGoods.number v.productId == goods.id)) { // 等待用户点击 const isConfirm = await showConfirmModal( - '请确认当前菜品是否已上菜?', - '菜名名称：《' + goods.name + '》' + '该商品已下单过，请确认是否重复', + '菜品名称：《' + goods.name + '》' ); if (!isConfirm) { return } - - if(allHistoryOrder.value.find(v=>v.productId==goods.id)){ + }else{ + if (newNumber == 2 && carGoods.number < newNumber) { // 等待用户点击 const isConfirm = await showConfirmModal( - '该商品已下单过，请确认是否重复', - '菜名名称：《' + goods.name + '》' + '购物车已有该商品，请确认是否重复?', + '菜品名称：《' + goods.name + '》' ); if (!isConfirm) { return } } - - } editCart({ id: cartId, @@ -1181,12 +1185,12 @@ ); data.isGoodsAdd = false; } else { - - if(allHistoryOrder.value.find(v=>v.productId==goods.id)){ + + if (allHistoryOrder.value.find(v => v.productId == goods.id)) { // 等待用户点击 const isConfirm = await showConfirmModal( '该商品已下单过，请确认是否重复', - '菜名名称：《' + goods.name + '》' + '菜品名称：《' + goods.name + '》' ); if (!isConfirm) { return diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue index 46c2064..a43cb1c 100644 --- a/pagesOrder/index/compoents/order-item.vue +++ b/pagesOrder/index/compoents/order-item.vue @@ -12,7 +12,8 @@ - {{$dict.getDiceName(data.status,'orderStatus')}}{{data.refundType?'['+$dict.getDiceName(data.refundType,'refundType')+']':''}} + {{$dict.getDiceName(data.status,'orderStatus')}}{{data.refundType?'['+$dict.getDiceName(data.refundType,'refundType')+']':''}} @@ -33,13 +34,18 @@ - {{item.productName}} + + {{item.productName}} + {{item.skuName}} - ×{{item.num}} + + ×{{item.num}} + (退{{item.returnNum}}) + ￥{{item.unitPrice}} @@ -56,7 +62,7 @@ 打包费 ￥{{data.packFee||0}} - + {{data.seatInfo.productName}} ￥{{data.seatInfo.priceAmount}} @@ -98,8 +104,13 @@