diff --git a/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue b/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue index 8a34d1c..42cc847 100644 --- a/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue +++ b/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue @@ -26,7 +26,7 @@ * - + @@ -118,8 +118,10 @@ list: [], current: '' }) - let category = reactive([]) - let categoryCurrent = ref('') + const pageData = reactive({ + category: [], + categoryCurrent: '' + }) const refform = ref(null) const form = reactive({ @@ -202,7 +204,7 @@ page: 1, size: 600 }) - category = res.map(v => { + pageData.category = res.map(v => { return { ...v, value: v.id @@ -211,8 +213,8 @@ } function categoryChange(e) { - categoryCurrent.value = e.detail.value - form.category = category[e.detail.value].name + pageData.categoryCurrent = e.detail.value + form.category = pageData.category[e.detail.value].name } function unitChange(e) { diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue index b14bf67..4ad6d95 100644 --- a/pagesCreateOrder/confirm-order/confirm-order.vue +++ b/pagesCreateOrder/confirm-order/confirm-order.vue @@ -412,6 +412,7 @@ * 打包费 */ const $packFee = computed(() => { + console.log("打包费===",goods.list) return goods.list.reduce((prve, cur) => { return prve + (cur.packFee*parseFloat(cur.pack_number).toFixed(0)) }, 0).toFixed(2) @@ -447,7 +448,7 @@ const goodsTotalPrice = goods.list.reduce((prve, cur) => { const lowMemberPrice = cur.lowMemberPrice ? cur.lowMemberPrice : cur.lowPrice const tPrice = (isVip.value ? lowMemberPrice : cur.lowPrice) * cur.number - const tpackFee = parseFloat(cur.pack_number).toFixed(0) > 0 ? cur.packFee*parseFloat(cur.pack_number).toFixed(0) : 0 + const tpackFee = cur.is_temporary !=1&&parseFloat(cur.pack_number).toFixed(0) > 0 ? cur.packFee*parseFloat(cur.pack_number).toFixed(0) : 0 return prve + (cur.is_gift ? 0 : tPrice) + tpackFee }, 0) return ((goodsTotalPrice - discount_sale_amount.value) || 0).toFixed(2) diff --git a/pagesCreateOrder/index/components/car.vue b/pagesCreateOrder/index/components/car.vue index 48e1245..04d3ad5 100644 --- a/pagesCreateOrder/index/components/car.vue +++ b/pagesCreateOrder/index/components/car.vue @@ -171,6 +171,7 @@ } const allPrice = computed(() => { + console.log("购物车数据==",props.data) return props.data.reduce((prve, cur) => { return prve + cur.lowPrice * cur.number }, 0).toFixed(2) diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index a217eae..0f26d0d 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -138,7 +138,7 @@ import appConfig from '@/config/appConfig.js'; import WebsocketUtil from '@/commons/utils/websocket.js' - import { getShopTable } from '@/api/table.js' + import { getShopTable,getShopTableDetail } from '@/api/table.js' import { getProductList } from '@/api/product.js' import { categoryPage } from '@/api/cateGory.js' import { inject } from 'vue'; @@ -954,16 +954,14 @@ console.log('scanCode'); uni.scanCode({ onlyFromCamera: true, - success: function(res) { + success: async function(res) { console.log('条码类型:' + res.scanType); console.log('条码内容:' + res.result); if (res.result.includes('codeplate?code=')) { const par = returnUrlPar(res.result) - const tableId = par.code - - onChooseTable({ - id: tableId - }) + const tableCode = par.code + let resData = await getShopTableDetail({tableCode:tableCode}) + onChooseTable(resData) } else { uni.showToast({ icon: 'error', diff --git a/pagesCreateOrder/util.js b/pagesCreateOrder/util.js index b415e3b..9052f71 100644 --- a/pagesCreateOrder/util.js +++ b/pagesCreateOrder/util.js @@ -32,6 +32,7 @@ export function getNowCart(carItem,goodsList,user) { carItem.number = parseFloat(carItem.number) carItem.name = carItem.product_name carItem.lowPrice = carItem.discount_sale_amount + carItem.discount_sale_amount = 0 } return carItem