From 5b8100aa64e4778da676624a5e18bea42f903e2b Mon Sep 17 00:00:00 2001 From: wwz <1144797966@qq.com> Date: Thu, 20 Mar 2025 18:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=EF=BC=8C=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E9=9C=B8=E7=8E=8B=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/order/index.js | 3 +- common/js/websocket.js | 4 + components/paymentMethod.vue | 18 +- pages/order/components/orderInfoAfter.vue | 30 +- pages/order/components/rechargeFree.vue | 114 +- pages/order/coupon.vue | 56 +- pages/order/detail.vue | 238 ++- pages/product/components/confirmorder.vue | 1883 ++++++++++--------- pages/product/components/shoppingCartes.vue | 1 + pages/product/index.vue | 196 +- pages/user/coupon.vue | 4 +- pages/user/member/billDetails.vue | 4 +- pages/user/member/index.vue | 19 +- pages/user/member/memberdetails.vue | 8 +- pages/user/user.vue | 24 +- stores/pay.js | 4 +- 16 files changed, 1382 insertions(+), 1224 deletions(-) diff --git a/common/api/order/index.js b/common/api/order/index.js index df355f9..b27a806 100644 --- a/common/api/order/index.js +++ b/common/api/order/index.js @@ -32,7 +32,8 @@ export const APIhistoryOrder = (data) => { return request({ url: url + '/user/order/historyOrder', method: 'get', - data: data + data: data, + toast: false }) } diff --git a/common/js/websocket.js b/common/js/websocket.js index 074f6e5..536a20b 100644 --- a/common/js/websocket.js +++ b/common/js/websocket.js @@ -312,6 +312,10 @@ const useWebSocket = (options = {}) => { // 页面显示，尝试连接 WebSocket const onShowconnect = () => { if (autoReconnect.value) { + uni.showLoading({ + title: `尝试再次连接`, + mask: true + }) connect(); } } diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue index 27f8b9b..fbf554f 100644 --- a/components/paymentMethod.vue +++ b/components/paymentMethod.vue @@ -3,10 +3,10 @@ 支付方式 - - + @@ -38,7 +38,8 @@ computed, defineEmits, watch, - watchEffect + watchEffect, + defineExpose } from 'vue' const props = defineProps({ @@ -53,10 +54,15 @@ freeCheck: { type: Boolean, default: false + }, + changeFreeenable: { + type: Boolean, + default: false } }); + const orderVIP = ref(uni.cache.get('orderVIP')) const emits = defineEmits(['customevent', 'groupChange']); @@ -113,7 +119,7 @@ const storeInfo = ref({}) // * 监听支付方式切换 - const groupChange = (type) => { + const groupChanges = (type) => { if (props.freeCheck && type == 1) { return; } @@ -132,6 +138,10 @@ shopId: orderVIP.value.shopId }) } + // 将方法暴露给父组件 + defineExpose({ + groupChanges + }); + \ No newline at end of file diff --git a/pages/order/coupon.vue b/pages/order/coupon.vue index 3c498bd..784a38b 100644 --- a/pages/order/coupon.vue +++ b/pages/order/coupon.vue @@ -80,6 +80,7 @@ ref, reactive, onMounted, + computed } from 'vue'; import { onLoad, @@ -113,7 +114,7 @@ // 去使用优惠券 const navigatorGo = (item) => { - console.log(Orderinfo.payAmount, item) + // console.log(Orderinfo.payAmount, item) if (Orderinfo.payAmount < item.fullAmount) { uni.showToast({ title: "当前订单金额不足使用金额", @@ -138,6 +139,23 @@ }); } + + // 计算合并后的数组 num相加 + const mergedArray = computed(() => { + const map = new Map(); + Orderinfo.shoppingCart.forEach(item => { + if (map.has(item.productId)) { + const existingItem = map.get(item.productId); + existingItem.num += item.num; + } else { + map.set(item.productId, { + ...item + }); + } + }); + return Array.from(map.values()); + }); + const Selectedlist = ref([]) // 商品卷 @@ -146,12 +164,31 @@ if (!item.show) { return false; } - console.log(Orderinfo.shoppingCart) - if (Orderinfo.shoppingCart.length < Selectedlist.value.length) { + // 查找选中的数组里面 统计指定 id 的重复次数 + const count = Selectedlist.value.filter(item => item.id === item.id).length; + + // 查找选中的数组里面 统计指定 id 的重复次数 + const foundObject = mergedArray.value.find(i => i.productId === item.proId) + if (foundObject.num <= count) { uni.showToast({ - title: '不可多余下单参数哦！' + title: '不可多余商品!', + icon: 'none' }) + return false; } + // 查找选中的数组里面 统计指定 id 的重复次数 + + console.log(mergedArray.value) + console.log(item) + console.log(Selectedlist.value) + console.log(Orderinfo.shoppingCart) + // if (Orderinfo.shoppingCart.length <= Selectedlist.value.length) { + // uni.showToast({ + // title: '不可多余下单数!', + // icon:'none' + // }) + // return false; + // } if (item.Selected) { Selectedlist.value = Selectedlist.value.filter(i => i.id !== item.id) @@ -251,15 +288,12 @@ }; }); } - console.log(res) if (res.length > 0) { fromInfo.list = res } else { fromInfo.list = [] return false } - console.log(res) - } // 商品取消 const cancelCoupon = () => { @@ -296,12 +330,8 @@ uni.setNavigationBarTitle({ title: Orderinfo.typeOrder == 2 ? '商品卷' : '优惠卷', - success: () => { - console.log('导航栏标题修改成功'); - }, - fail: (err) => { - console.error('导航栏标题修改失败', err); - } + success: () => {}, + fail: (err) => {} }); Orderinfo.shopUserId = options.shopUserId diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 69d7c06..01a7843 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -36,39 +36,18 @@ + @clickPointsamount='clickPointsamount' @learcoupons="learcoupons" :changeFreeenable='changeFreeenable'> - - + + + + :changeFreeenable='changeFreeenable' v-if="listinfo.status == 'unpaid'"> - - - @@ -77,8 +56,13 @@ ¥{{listinfo.totalCost}} - - {{paymentmethod.paymentBtnText}} + + + {{paymentmethod.paymentBtnText}} + + @@ -97,11 +81,12 @@ } from 'vue'; import { - APIgetOrderById + APIgetOrderById, + APIputuserorder, + APIhistoryOrder } from '@/common/api/order/index.js' import { - APIusershopInfodetail, APIshopUserInfo } from '@/common/api/member.js' @@ -131,7 +116,7 @@ import payPassword from '@/components/payPassword.vue' import orderInfoAfter from './components/orderInfoAfter.vue' // import orderInfoBefore from '../components/orderInfoBefore.vue' - // import rechargeFree from '../components/rechargeFree.vue' + import rechargeFree from './components/rechargeFree.vue' import paymentMethodes from '@/components/paymentMethod.vue'; //支付方式 import { onBackPress @@ -186,13 +171,13 @@ }) if (res) { Object.assign(listinfo, res); - if (listinfo.status == 'unpaid') { - try { - let res = await APIhistoryOrder({ - orderId: orderId.value - }) - } catch (error) {} - } + // if (listinfo.status == 'unpaid') { + // try { + // let res = await APIhistoryOrder({ + // orderId: orderId.value + // }) + // } catch (error) {} + // } // 历史订单 if (listinfo.detailMap) { let combinedArray = []; @@ -245,6 +230,13 @@ 0 ? listinfo.Seatcharge : 0) - (listinfo.Productroll || 0) - (listinfo .coupondiscountAmount || 0) - (listinfo.pointsDiscountAmount || 0); listinfo.totalCost = Math.round(sums * 100) / 100; + // 霸王餐 + console.log(orderVIP.value.freeDineConfig.enable, changeFreeenable.value) + if (orderVIP.value.freeDineConfig.enable && changeFreeenable.value) { + listinfo.totalCost = (parseFloat(listinfo.totalCost) * parseFloat(orderVIP.value + .freeDineConfig + .rechargeTimes)).toFixed(2) + } // 积分 if (listinfo.totalCost && listinfo.status == 'unpaid') { uni.$u.debounce(memberPointscalcUsablePoints, 500) @@ -256,6 +248,34 @@ } }); + // 霸王餐 + const changeFreeenable = ref(false) + + const changeFree = (e) => { + console.log(e) + if (e) { + uniqueIds.value = [] // 筛选出商品卷的id + listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额 + listinfo.Productroll = 0 // 商品卷总价价格 + uniqueIds.value = [] // 筛选出商品卷的id + listinfo.coupondiscountAmount = 0 // 优惠卷减去的金额 + // 支付方式切换 + // #ifdef MP-WEIXIN + paymentMethodref.value.groupChanges(2) + // paymentmethod.radiovalue = 2; + // paymentmethod.paymentBtnText = "微信支付"; + // paymentmethod.payType = 'wechatPay'; + // #endif + // #ifdef MP-ALIPAY + paymentMethodref.value.groupChanges(3) + // paymentmethod.radiovalue = 3; + // paymentmethod.paymentBtnText = "支付宝支付"; + // paymentmethod.payType = 'wechatPay'; + // #endif + } + changeFreeenable.value = e + } + const saveImage = (url) => { uni.saveImage({ url: url, @@ -268,6 +288,9 @@ }); } + // + const paymentMethodref = ref(null) + // 支付方式切换 const paymentmethod = reactive({ radiovalue: 2, @@ -330,8 +353,52 @@ } } + // 删除订单 + const APIputuserorderclick = async () => { + await APIputuserorder(listinfo.id) + uni.navigateBack() + } + + const istoricalorders = async () => { + console.log(paymentmethod.payType, '1212') + // 先调用历史订单 + let APIhistoryOrderres = await APIhistoryOrder({ + tableCode: listinfo.tableCode + }) + // 判断是否有历史订单 + if (APIhistoryOrderres.detailMap) { + let combinedArray = []; + for (const key in APIhistoryOrderres.detailMap) { + if (APIhistoryOrderres.detailMap.hasOwnProperty(key)) { + let subArray = APIhistoryOrderres.detailMap[key]; + combinedArray = [...combinedArray, ...subArray] + } + } + // 判断支付之前是是否还有新加订单 + if (listinfo.combinedArray.length === combinedArray.length) { + goToPay() + } else { + uni.showToast({ + title: '你的订单已更新！', + icon: 'none' + }) + orderorderInfo() + } + } else { + uni.showToast({ + title: '你的小伙伴已提交订单~', + icon: 'none' + }) + setTimeout(() => { + orderorderInfo() + }, 1000) + } + } + // * 去支付 const goToPay = async () => { + // 霸王餐 + // 余额支付 if (paymentmethod.payType == 'accountPay') { if (orderVIP.value.isVip == 0) { @@ -369,34 +436,48 @@ } return false } - let checkOrderPay = { - orderId: orderId.value, - vipPrice: orderVIP.value.isVip == 1 && ordershopUserInfo.value.isMemberPrice == 1 ? 1 : - 0, //是否使用会员价0否1是 - userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包 - seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数 - originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格 - discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数) 写死1 - discountAmount: 0, //手动优惠金额 写死0 - productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额 - fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额 - couponList: uniqueIds.value, //用户使用的卡券 - orderAmount: listinfo.totalCost, // 最中订单金额 - roundAmount: 0, //抹零金额 减免多少钱 - pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表) - pointsNum: 0, //(扣除各类折扣 enable_deduction后使用) - remark: '', //用户备注 - } - try { - await storeMemberpay.actionsltPayOrder({ - checkOrderPay, - payType: paymentmethod.payType, - buyerRemark: '', - returnUrl: '' + if (orderVIP.value.freeDineConfig.enable && changeFreeenable.value) { + await storeMemberpay.actionspayltPayVip({ + shopId: orderVIP.value.shopId, + shopUserId: orderVIP.value.id, + orderId: orderId.value, + userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包 + amount: listinfo.totalCost, // 最终订单金额 + returnUrl: '', //跳转地址 + buyerRemark: '' }) - } catch (error) { - //TODO handle the exception + return false; + } else { + let checkOrderPay = { + orderId: orderId.value, + vipPrice: orderVIP.value.isVip == 1 && ordershopUserInfo.value.isMemberPrice == 1 ? 1 : + 0, //是否使用会员价0否1是 + userAllPack: is_type.value == 0 ? 0 : 1, //是否整单打包 + seatNum: is_type.value == 0 ? listinfo.seatNum : 0, //用餐人数 + originAmount: listinfo.originAmount, //订单原金额（包含打包费+餐位费） 不含折扣价格 + discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数) 写死1 + discountAmount: 0, //手动优惠金额 写死0 + productCouponDiscountAmount: listinfo.Productroll, //商品优惠券抵扣金额 + fullCouponDiscountAmount: listinfo.coupondiscountAmount, //满减优惠券抵扣金额 + couponList: uniqueIds.value, //用户使用的卡券 + orderAmount: listinfo.totalCost, // 最终订单金额 + roundAmount: 0, //抹零金额 减免多少钱 + pointsDiscountAmount: listinfo.pointsDiscountAmount, //积分抵扣金额(tb_points_basic_setting表) + pointsNum: 0, //(扣除各类折扣 enable_deduction后使用) + remark: '', //用户备注 + } + try { + await storeMemberpay.actionsltPayOrder({ + checkOrderPay, + payType: paymentmethod.payType, + buyerRemark: '', + returnUrl: '' + }) + } catch (error) { + //TODO handle the exception + } } + orderorderInfo() } @@ -906,6 +987,7 @@ left: 0; width: 100%; + // height: 80rpx; .flex-between { width: 100%; padding: 36rpx 54rpx 102rpx 54rpx; @@ -932,14 +1014,26 @@ } } - .fixedview_tow { - background: #E3AD7F; - border-radius: 36rpx; - font-weight: 400; - font-size: 32rpx; - color: #FFFFFF; - padding: 14rpx 44rpx; + .flex-colum-end { + .fixedview_tow { + background: #E3AD7F; + border-radius: 36rpx; + font-weight: 400; + font-size: 32rpx; + color: #FFFFFF; + padding: 14rpx 44rpx; + } + + .fixedview_tows { + background: #c3c3c3; + border-radius: 36rpx; + font-weight: 400; + font-size: 32rpx; + color: #FFFFFF; + padding: 14rpx 44rpx; + } } + } } \ No newline at end of file diff --git a/pages/product/components/confirmorder.vue b/pages/product/components/confirmorder.vue index 974b777..0539e5b 100644 --- a/pages/product/components/confirmorder.vue +++ b/pages/product/components/confirmorder.vue @@ -4,118 +4,119 @@ :overlayStyle="{ zIndex: 98 }" @close="close"> - - - - - - 温馨提示：请适量点餐，避免浪费 - - - - - - - - - 第{{key}}次下单 - - + + + + + + + 温馨提示：请适量点餐，避免浪费 - - - - - - - - - {{item.productName}} - {{item.productSkuName}} - + - - - ￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.price}} + + + + + + 第{{key}}次下单 + + + + + + + + + + + + {{item.productName}} + {{item.productSkuName}} + + + + + ￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.price}} + + x{{item.num}} - x{{item.num}} - - - - + + + + - - - - - {{ shopInfo.name }} - - - - - {{item.name}} - - - {{item.id == i.productId && item.skuId == i.id ? i.specInfo :""}} + + + + {{ shopInfo.name }} + + + + + {{item.name}} + + + {{item.id == i.productId && item.skuId == i.id ? i.specInfo :""}} + - - X{{ ifcartNumber(item) }} + X{{ ifcartNumber(item) }} + + + ￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.salePrice}} + + + + + 餐位费 + + X{{shopTable.seatNum}} + ￥ + {{Seatcharge}} - ￥{{shopInfo.isVip ==1 && shopInfo.isMemberPrice==1?item.memberPrice:item.salePrice}} - - - - - 餐位费 - - X{{shopTable.seatNum}} - ￥ - {{Seatcharge}} - - - - + + - - - - - 订单备注 - + + + + 订单备注 + + - - - + - - - - - 实付金额 - ￥{{ totalPrices }} - - + + + + 实付金额 + ￥{{ totalPrices }} + + - - 提交订单 - - + + 提交订单 + + + @@ -207,7 +209,7 @@ let combinedArray = []; for (const key in props.orderinfo.detailMap) { if (props.orderinfo.detailMap.hasOwnProperty(key)) { - let subArray = props.orderinfo .detailMap[key]; + let subArray = props.orderinfo.detailMap[key]; combinedArray = [...combinedArray, ...subArray] } } @@ -235,7 +237,7 @@ }, 0); cart = cartone + cart // 向上取整并保留两位小数 - return cart = Math.ceil(cart * 100) / 100; + return parseFloat(cart.toFixed(2)); }); // 餐位费 @@ -244,10 +246,9 @@ let tableFeeTotals = 0 if (isTableFee == 0 && dinersNum) { - tableFeeTotals = Math.ceil(parseFloat(dinersNum) * parseFloat(tableFee) * - 100) / 100; + tableFeeTotals = parseFloat(dinersNum) * parseFloat(tableFee) } - return Math.floor(tableFeeTotals * 100) / 100 ? Math.floor(tableFeeTotals * 100) / 100 : 0; + return parseFloat(cart.toFixed(2)); }); //总价格 @@ -415,753 +416,246 @@ border-radius: 30rpx 30rpx 0 0; max-height: 80vh; overflow: auto; + .scroll-view { + max-height: 80vh; + margin-bottom: 190rpx; - .card { - // background-color: #fff; - border-radius: 20upx; - margin-bottom: 28upx; - position: relative; - - .card_item { - display: flex; - flex-direction: column; + .card { + // background-color: #fff; + border-radius: 20upx; + margin-bottom: 28upx; position: relative; - padding: 0 34rpx; - .head { - display: flex; - justify-content: space-between; - // padding: 32rpx 0; - - .head_left { - display: flex; - align-items: center; - - .placeNum { - font-weight: bold; - font-size: 32rpx; - color: #333333; - margin-right: 32rpx; - flex-shrink: 0; - } - - .placeTime { - font-weight: 400; - font-size: 32rpx; - color: #666666; - flex-shrink: 0; - } - } - - } - - .shop-info { - border-bottom: 2rpx dashed #e5e5e5; - - .item:nth-child(1) { - margin-top: 0; - } - - .item { - margin-bottom: 32rpx; - display: flex; - - .cover {} - - .info { - flex: 1; - display: flex; - flex-direction: column; - padding-left: 16upx; - - .productName { - font-weight: bold; - font-size: 28rpx; - color: #333333; - margin-top: 20rpx; - } - - .productSkuName { - font-weight: 400; - font-size: 24rpx; - color: #999999; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 3; - overflow: hidden; - text-overflow: ellipsis; - } - - .n { - font-size: 24upx; - color: #999; - } - } - - .price { - display: flex; - flex-direction: column; - align-items: flex-end; - padding-left: 68rpx; - - .priceAmount { - font-weight: 500; - font-size: 28rpx; - color: #333333; - margin-top: 26rpx; - } - - .num { - font-weight: 400; - font-size: 24rpx; - color: #999999; - margin-top: 22rpx; - } - } - } - } - - .status { - align-self: flex-end; - width: 92rpx; - height: 40rpx; - line-height: 40rpx; - text-align: center; - background: #999999; - border-radius: 10rpx 10rpx 10rpx 10rpx; - font-weight: 400; - font-size: 22rpx; - color: #FFFFFF; - margin-top: 32rpx; - } - - .totalAmount { - width: 100%; - display: flex; - justify-content: flex-end; - align-items: flex-end; - padding: 32rpx 0; - border-bottom: 2rpx dashed #e5e5e5; - - .label { - font-weight: bold; - font-size: 28rpx; - color: #333333; - } - - .price { - font-weight: bold; - font-size: 36rpx; - color: #333333; - } - } - - .semicircle_icon { - width: 100%; - position: absolute; - top: -22.5rpx; - left: 0; - display: flex; - justify-content: space-between; - - .semicircle_left_icon { - width: 45rpx; - height: 45rpx; - margin-left: -22.5rpx; - background-color: #f9f9f9; - border-radius: 50%; - // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35); - - } - - .semicircle_right_icon { - width: 45rpx; - height: 45rpx; - margin-right: -22.5rpx; - background-color: #f9f9f9; - border-radius: 50%; - // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35); - - } - } - } - - .cell-item { - display: flex; - align-items: center; - justify-content: space-between; - padding: 32rpx 34rpx 0 34rpx; - - .label { - font-weight: bold; - font-size: 32rpx; - color: #333333; - padding-bottom: 32rpx; - } - - .val { - display: flex; - align-items: flex-end; - padding-bottom: 32rpx; - border-bottom: 2rpx dashed #e5e5e5; - - view:nth-child(1) { - font-weight: 400; - font-size: 24rpx; - color: #999999; - margin-right: 42rpx; - } - - view:nth-child(2) { - display: flex; - align-items: flex-end; - font-weight: bold; - font-size: 36rpx; - color: #333333; - } - } - - .val.column { + .card_item { display: flex; flex-direction: column; + position: relative; + padding: 0 34rpx; - .productCoupon { + .head { display: flex; - align-items: flex-end; - margin: 0 0 10rpx 0; + justify-content: space-between; + // padding: 32rpx 0; - .name { - font-weight: 400; - font-size: 26rpx; - color: #999; - margin: 0; - } - - .num { - font-weight: 400; - font-size: 26rpx; - color: #999; - margin: 0 30rpx; - line-height: 20rpx; - } - - .amount { - font-weight: bold; - font-size: 26rpx; - color: #333; - } - } - } - } - - .favorable { - display: flex; - align-items: center; - justify-content: space-between; - padding: 0 30rpx; - box-sizing: border-box; - padding-bottom: 26rpx; - padding-top: 26rpx; - border-bottom: 2rpx solid #E5E5E5; - - .favorable_left { - display: flex; - align-items: center; - - .icon { - width: 40rpx; - height: 40rpx; - margin-right: 16rpx; - } - - .name { - font-size: 28rpx; - font-weight: 400rpx; - color: #333; - } - } - - .favorable_right { - display: flex; - align-items: center; - - .favorable_right_text { - font-size: 24rpx; - color: #999; - font-weight: 400rpx; - } - - } - - .favorable_right { - .column { - display: flex; - flex-direction: column; - align-items: flex-end; - - .favorable_right_text { - margin-bottom: 10rpx; - - text:nth-child(1) { - font-size: 26rpx; - color: #999; - } - - text:nth-child(2) { - font-size: 26rpx; - color: #999; - margin: 0 30rpx; - } - - text:nth-child(3) { - font-size: 26rpx; - color: #333; - - } - } - } - } - - .favorable_right.column { - align-items: flex-start; - } - } - - .favorable.column { - align-items: flex-start; - } - - .cell-item.column { - align-items: flex-start; - } - - .total-wrap { - width: 100%; - display: flex; - justify-content: flex-end; - align-items: flex-end; - padding: 0 34rpx; - font-weight: bold; - font-size: 28rpx; - color: #333333; - margin-top: 64rpx; - - .price { - font-weight: bold; - font-size: 36rpx; - } - } - - - - .order_footer { - display: flex; - flex-direction: column; - padding: 34rpx; - position: relative; - - - - } - - - } - - .head { - width: 100%; - padding: $uni-spacing-row-base; - box-sizing: border-box; - position: relative; - - .head_bg { - height: 456rpx; - // background: linear-gradient(180deg, #E8AD7B 0%, #F5F5F5 100%); - position: absolute; - left: 0; - right: 0; - top: 0; - margin: auto; - } - - .tips { - width: 100%; - height: 64rpx; - line-height: 64rpx; - background: #FFF8E8; - border-radius: 8rpx 8rpx 8rpx 8rpx; - padding: 0 16rpx; - box-sizing: border-box; - position: relative; - z-index: 1; - display: flex; - align-items: center; - - .informIcon { - width: 26.79rpx; - height: 24.06rpx; - margin-right: 8rpx; - } - - .informText { - font-size: $uni-font-size-base; - color: #FF803D; - font-weight: 400; - } - } - - .tabBox { - width: 100%; - margin-top: 52rpx; - position: relative; - z-index: 1; - - .tab { - display: flex; - justify-content: space-between; - align-items: center; - border-radius: 22rpx 22rpx 0 0; - background-color: $uni-bg-color; - - .tab_item { - width: 50%; - height: 90rpx; - line-height: 90rpx; - display: flex; - align-items: center; - padding-left: 30rpx; - box-sizing: border-box; - background-color: #FEFBF8; - border-radius: 22rpx 22rpx 0 0; - position: relative; - - .title { - font-weight: 500; - font-size: 28rpx; - color: #999999; - position: relative; - z-index: 1; - } - - .title.active { - color: #E8AD7B; - } - - .icon { - width: 48rpx; - height: 48rpx; - margin-right: 16rpx; - position: relative; - z-index: 1; - } - } - - .tab_item.active { - background-color: #fff; - } - - // .tab_item.active:after { - // content: ""; - // position: absolute; - // top: 0; - // left: -4px; - // width: 40px; - // height: 26px; - // background: orange; - // } - .tab_item.active:before { - content: ""; - position: absolute; - top: -20rpx; - left: 0; - right: 0; - bottom: 0; - border-radius: 2px; - background: #fff; - transform: skewX(0deg); - } - - .tab_item1.active:before { - border-radius: 22rpx 40rpx 0 0; - } - - .tab_item2.active:before { - border-radius: 40rpx 22rpx 0 0; - } - } - - .table { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 30rpx; - box-sizing: border-box; - height: 90rpx; - background-color: $uni-bg-color; - border-radius: 0 0 22rpx 22rpx; - - .table_left { - display: flex; - align-items: center; - - .icon { - width: 32.86rpx; - height: 39.07rpx; - margin-right: 24rpx; - } - - .title { + .head_left { display: flex; align-items: center; - color: #E8AD7B; - } - } - .value { - font-weight: 500; - font-size: 32rpx; - color: #333333; - } - } + .placeNum { + font-weight: bold; + font-size: 32rpx; + color: #333333; + margin-right: 32rpx; + flex-shrink: 0; + } - .pack { - display: flex; - flex-direction: column; - padding: 30rpx; - box-sizing: border-box; - background-color: $uni-bg-color; - border-radius: 0 0 22rpx 22rpx; - - .top { - display: flex; - flex-direction: column; - margin-top: 8rpx; - - .title { - font-size: 28rpx; - color: #333; - font-weight: bold; - margin-bottom: 16rpx; + .placeTime { + font-weight: 400; + font-size: 32rpx; + color: #666666; + flex-shrink: 0; + } } - .address { - font-size: 24rpx; - font-weight: 400; - color: #999; - } } - .list { - display: flex; - flex-direction: column; + .shop-info { + border-bottom: 2rpx dashed #e5e5e5; + + .item:nth-child(1) { + margin-top: 0; + } .item { - height: 70rpx; + margin-bottom: 32rpx; display: flex; - align-items: center; - justify-content: space-between; - font-size: 28rpx; - .lable { - color: #666; - font-weight: 500; - } + .cover {} - .getPhone { + .info { + flex: 1; display: flex; - align-items: center; + flex-direction: column; + padding-left: 16upx; - .u-input { - width: 340rpx; - border: none; + .productName { + font-weight: bold; + font-size: 28rpx; + color: #333333; + margin-top: 20rpx; + } - input { - font-size: 24rpx; - color: #333; + .productSkuName { + font-weight: 400; + font-size: 24rpx; + color: #999999; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; + text-overflow: ellipsis; + } - } - - .input-placeholder { - font-size: 24rpx; - } + .n { + font-size: 24upx; + color: #999; } } - .text, - .getBtn { - color: #E8AD7B; - } + .price { + display: flex; + flex-direction: column; + align-items: flex-end; + padding-left: 68rpx; - .getBtn { - border-radius: 12rpx; - border: 2rpx solid #E8AD7B; - padding: 8rpx 20rpx; - box-sizing: border-box; + .priceAmount { + font-weight: 500; + font-size: 28rpx; + color: #333333; + margin-top: 26rpx; + } + + .num { + font-weight: 400; + font-size: 24rpx; + color: #999999; + margin-top: 22rpx; + } } } } - } - } + .status { + align-self: flex-end; + width: 92rpx; + height: 40rpx; + line-height: 40rpx; + text-align: center; + background: #999999; + border-radius: 10rpx 10rpx 10rpx 10rpx; + font-weight: 400; + font-size: 22rpx; + color: #FFFFFF; + margin-top: 32rpx; + } - .addDish { - width: 176rpx; - height: 56rpx; - line-height: 56rpx; - text-align: center; - background: #FFF8E8; - border-radius: 28rpx 28rpx 28rpx 28rpx; - font-weight: 500; - font-size: 28rpx; - color: #333333; - position: relative; - z-index: 1; - } - - .tabBox_t { - font-weight: 500; - font-size: 28rpx; - color: #333333; - padding: 32rpx 24rpx; - background-color: #fff; - border-radius: 18rpx; - display: flex; - flex-direction: column; - position: relative; - z-index: 1; - margin-top: 32rpx; - } - - .shopName { - margin-bottom: 16rpx; - } - - .tableName { - display: flex; - - .name { - margin-right: 16rpx; - } - - .num { - border-left: 2rpx solid #d6d6d6; - padding-left: 16rpx; - } - } - - - - } - - .content_box { - padding: 0 20rpx; - box-sizing: border-box; - margin-top: 10rpx; - position: relative; - z-index: 1; - - .content { - background-color: $uni-bg-color; - border-radius: 22rpx; - display: flex; - flex-direction: column; - padding: 30rpx 0; - box-sizing: border-box; - - .title { - font-size: 28rpx; - color: #666; - margin-bottom: 32rpx; - padding: 0 30rpx; - box-sizing: border-box; - } - - .list_item { - display: flex; - align-items: center; - margin-bottom: 32rpx; - padding: 0 30rpx; - box-sizing: border-box; - - .left { + .totalAmount { width: 100%; display: flex; - align-items: flex-start; + justify-content: flex-end; + align-items: flex-end; + padding: 32rpx 0; + border-bottom: 2rpx dashed #e5e5e5; - .img { - width: 142rpx; - height: 142rpx; - margin-right: 34rpx; - flex-shrink: 0; - border-radius: 20rpx; + .label { + font-weight: bold; + font-size: 28rpx; + color: #333333; } - .center { - width: 100%; - display: flex; - flex-direction: column; - align-items: flex-start; - - .center_title { - font-size: 32rpx; - font-weight: 500; - color: #333; - } - - .type { - margin: 12rpx 0 10rpx 0; - } - - .type, - .num { - font-size: 24rpx; - color: #999; - } - + .price { + font-weight: bold; + font-size: 36rpx; + color: #333333; } } - .num { - font-size: 24rpx; - color: #999; - } + .semicircle_icon { + width: 100%; + position: absolute; + top: -22.5rpx; + left: 0; + display: flex; + justify-content: space-between; - .price { - font-size: 32rpx; - color: #333; - font-weight: 500; + .semicircle_left_icon { + width: 45rpx; + height: 45rpx; + margin-left: -22.5rpx; + background-color: #f9f9f9; + border-radius: 50%; + // box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35); + + } + + .semicircle_right_icon { + width: 45rpx; + height: 45rpx; + margin-right: -22.5rpx; + background-color: #f9f9f9; + border-radius: 50%; + // box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35); + + } } } - .cell_item { + .cell-item { display: flex; - justify-content: space-between; align-items: center; - margin-bottom: 32rpx; - padding: 0 30rpx; + justify-content: space-between; + padding: 32rpx 34rpx 0 34rpx; - .lable { - font-weight: 500; - font-size: 28rpx; + .label { + font-weight: bold; + font-size: 32rpx; color: #333333; + padding-bottom: 32rpx; } - .value { + .val { display: flex; align-items: flex-end; + padding-bottom: 32rpx; + border-bottom: 2rpx dashed #e5e5e5; view:nth-child(1) { font-weight: 400; font-size: 24rpx; color: #999999; - margin-right: 16rpx; + margin-right: 42rpx; } view:nth-child(2) { + display: flex; + align-items: flex-end; font-weight: bold; - font-size: 28rpx; + font-size: 36rpx; color: #333333; } } + + .val.column { + display: flex; + flex-direction: column; + + .productCoupon { + display: flex; + align-items: flex-end; + margin: 0 0 10rpx 0; + + .name { + font-weight: 400; + font-size: 26rpx; + color: #999; + margin: 0; + } + + .num { + font-weight: 400; + font-size: 26rpx; + color: #999; + margin: 0 30rpx; + line-height: 20rpx; + } + + .amount { + font-weight: bold; + font-size: 26rpx; + color: #333; + } + } + } } .favorable { @@ -1204,7 +698,7 @@ } .favorable_right { - >.column { + .column { display: flex; flex-direction: column; align-items: flex-end; @@ -1241,201 +735,712 @@ align-items: flex-start; } - .cell-item { + .cell-item.column { + align-items: flex-start; + } + + .total-wrap { + width: 100%; + display: flex; + justify-content: flex-end; + align-items: flex-end; + padding: 0 34rpx; + font-weight: bold; + font-size: 28rpx; + color: #333333; + margin-top: 64rpx; + + .price { + font-weight: bold; + font-size: 36rpx; + } + } + + + + .order_footer { + display: flex; + flex-direction: column; + padding: 34rpx; + position: relative; + + + + } + + + } + + .head { + width: 100%; + padding: $uni-spacing-row-base; + box-sizing: border-box; + position: relative; + + .head_bg { + height: 456rpx; + // background: linear-gradient(180deg, #E8AD7B 0%, #F5F5F5 100%); + position: absolute; + left: 0; + right: 0; + top: 0; + margin: auto; + } + + .tips { + width: 100%; + height: 64rpx; + line-height: 64rpx; + background: #FFF8E8; + border-radius: 8rpx 8rpx 8rpx 8rpx; + padding: 0 16rpx; + box-sizing: border-box; + position: relative; + z-index: 1; display: flex; align-items: center; - justify-content: space-between; - padding: 32rpx 34rpx 32rpx 34rpx; - .label { - font-weight: bold; - font-size: 32rpx; - color: #333333; + .informIcon { + width: 26.79rpx; + height: 24.06rpx; + margin-right: 8rpx; } - .val { - display: flex; - align-items: flex-end; + .informText { + font-size: $uni-font-size-base; + color: #FF803D; + font-weight: 400; + } + } - view:nth-child(1) { - font-weight: 400; - font-size: 24rpx; - color: #999999; - margin-right: 42rpx; + .tabBox { + width: 100%; + margin-top: 52rpx; + position: relative; + z-index: 1; + + .tab { + display: flex; + justify-content: space-between; + align-items: center; + border-radius: 22rpx 22rpx 0 0; + background-color: $uni-bg-color; + + .tab_item { + width: 50%; + height: 90rpx; + line-height: 90rpx; + display: flex; + align-items: center; + padding-left: 30rpx; + box-sizing: border-box; + background-color: #FEFBF8; + border-radius: 22rpx 22rpx 0 0; + position: relative; + + .title { + font-weight: 500; + font-size: 28rpx; + color: #999999; + position: relative; + z-index: 1; + } + + .title.active { + color: #E8AD7B; + } + + .icon { + width: 48rpx; + height: 48rpx; + margin-right: 16rpx; + position: relative; + z-index: 1; + } } - view:nth-child(2) { + .tab_item.active { + background-color: #fff; + } + + // .tab_item.active:after { + // content: ""; + // position: absolute; + // top: 0; + // left: -4px; + // width: 40px; + // height: 26px; + // background: orange; + // } + .tab_item.active:before { + content: ""; + position: absolute; + top: -20rpx; + left: 0; + right: 0; + bottom: 0; + border-radius: 2px; + background: #fff; + transform: skewX(0deg); + } + + .tab_item1.active:before { + border-radius: 22rpx 40rpx 0 0; + } + + .tab_item2.active:before { + border-radius: 40rpx 22rpx 0 0; + } + } + + .table { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 30rpx; + box-sizing: border-box; + height: 90rpx; + background-color: $uni-bg-color; + border-radius: 0 0 22rpx 22rpx; + + .table_left { display: flex; - align-items: flex-end; - font-weight: bold; - font-size: 36rpx; + align-items: center; + + .icon { + width: 32.86rpx; + height: 39.07rpx; + margin-right: 24rpx; + } + + .title { + display: flex; + align-items: center; + color: #E8AD7B; + } + } + + .value { + font-weight: 500; + font-size: 32rpx; color: #333333; } } - } + .pack { + display: flex; + flex-direction: column; + padding: 30rpx; + box-sizing: border-box; + background-color: $uni-bg-color; + border-radius: 0 0 22rpx 22rpx; - .totalPrice { - padding: 32rpx 30rpx; - box-sizing: border-box; - // border-top: 2rpx solid #E5E5E5; - display: flex; - justify-content: flex-end; - align-items: flex-end; - font-size: 32rpx; - color: #333; - font-weight: bold; + .top { + display: flex; + flex-direction: column; + margin-top: 8rpx; + + .title { + font-size: 28rpx; + color: #333; + font-weight: bold; + margin-bottom: 16rpx; + } + + .address { + font-size: 24rpx; + font-weight: 400; + color: #999; + } + } + + .list { + display: flex; + flex-direction: column; + + .item { + height: 70rpx; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 28rpx; + + .lable { + color: #666; + font-weight: 500; + } + + .getPhone { + display: flex; + align-items: center; + + .u-input { + width: 340rpx; + border: none; + + input { + font-size: 24rpx; + color: #333; + + } + + .input-placeholder { + font-size: 24rpx; + } + } + } + + .text, + .getBtn { + color: #E8AD7B; + } + + .getBtn { + border-radius: 12rpx; + border: 2rpx solid #E8AD7B; + padding: 8rpx 20rpx; + box-sizing: border-box; + } + } + } - .totalPriceNum { - font-size: 40rpx; } } - } - } - // 备注 - .remark { - padding: 0 20rpx; - margin-top: 32rpx; - - .remark_bg { - background-color: $uni-bg-color; - border-radius: 22rpx; - padding: 32rpx 30rpx; - box-sizing: border-box; - - .remark_title { - font-size: 32rpx; - color: #333; + .addDish { + width: 176rpx; + height: 56rpx; + line-height: 56rpx; + text-align: center; + background: #FFF8E8; + border-radius: 28rpx 28rpx 28rpx 28rpx; font-weight: 500; + font-size: 28rpx; + color: #333333; + position: relative; + z-index: 1; + } + + .tabBox_t { + font-weight: 500; + font-size: 28rpx; + color: #333333; + padding: 32rpx 24rpx; + background-color: #fff; + border-radius: 18rpx; + display: flex; + flex-direction: column; + position: relative; + z-index: 1; + margin-top: 32rpx; + } + + .shopName { margin-bottom: 16rpx; } - .u-textarea { - height: 148rpx; - background-color: #f5f5f5; - border-radius: 10rpx; - padding: 32rpx 22rpx !important; + .tableName { + display: flex; + + .name { + margin-right: 16rpx; + } + + .num { + border-left: 2rpx solid #d6d6d6; + padding-left: 16rpx; + } + } + + + + } + + .content_box { + padding: 0 20rpx; + box-sizing: border-box; + margin-top: 10rpx; + position: relative; + z-index: 1; + + .content { + background-color: $uni-bg-color; + border-radius: 22rpx; + display: flex; + flex-direction: column; + padding: 30rpx 0; box-sizing: border-box; - textarea { - font-size: 24rpx; + .title { + font-size: 28rpx; + color: #666; + margin-bottom: 32rpx; + padding: 0 30rpx; + box-sizing: border-box; } - } - } - } - - - - - - .bottom { - width: 100%; - background: #FFFFFF; - box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1); - position: fixed; - bottom: 0; - display: flex; - align-items: center; - justify-content: space-between; - padding: 32rpx 50rpx 82rpx 50rpx; - box-sizing: border-box; - z-index: 9; - - .bottom_left { - display: flex; - font-size: 28rpx; - font-weight: 500; - color: #333; - align-items: flex-end; - - .totalAmount { - font-size: 40rpx; - font-weight: bold; - margin-top: 5rpx; - } - } - - .paymentBtnText { - background: #E8AD7B; - border-radius: 36rpx; - font-weight: 400; - font-size: 32rpx; - color: #FFFFFF; - padding: 14rpx 44rpx; - } - } - - .page-total { - position: inherit; - } - - .pay-info-wrap { - padding: 0; - box-sizing: border-box; - - .info-wrap { - padding: 64rpx 30rpx 30rpx 30rpx; - box-sizing: border-box; - - .title { - align-self: center; - font-size: 32rpx; - color: #333; - font-weight: bold; - } - } - - .info-content { - .pay-title { - display: flex; - align-items: flex-end; - justify-content: center; - font-weight: bold; - width: 100%; - font-size: 48rpx; - color: #333; - margin-top: 48rpx; - - text { - font-size: 60rpx; - color: #333; - } - } - - .pay-password { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 64rpx; - - .list { - width: 88rpx; - height: 88rpx; + .list_item { display: flex; align-items: center; - justify-content: center; - border: 2rpx solid #999; - border-radius: 8rpx; + margin-bottom: 32rpx; + padding: 0 30rpx; + box-sizing: border-box; - text { + .left { + width: 100%; + display: flex; + align-items: flex-start; + + .img { + width: 142rpx; + height: 142rpx; + margin-right: 34rpx; + flex-shrink: 0; + border-radius: 20rpx; + } + + .center { + width: 100%; + display: flex; + flex-direction: column; + align-items: flex-start; + + .center_title { + font-size: 32rpx; + font-weight: 500; + color: #333; + } + + .type { + margin: 12rpx 0 10rpx 0; + } + + .type, + .num { + font-size: 24rpx; + color: #999; + } + + } + } + + .num { + font-size: 24rpx; + color: #999; + } + + .price { font-size: 32rpx; + color: #333; + font-weight: 500; + } + } + + .cell_item { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 32rpx; + padding: 0 30rpx; + + .lable { + font-weight: 500; + font-size: 28rpx; + color: #333333; + } + + .value { + display: flex; + align-items: flex-end; + + view:nth-child(1) { + font-weight: 400; + font-size: 24rpx; + color: #999999; + margin-right: 16rpx; + } + + view:nth-child(2) { + font-weight: bold; + font-size: 28rpx; + color: #333333; + } + } + } + + .favorable { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 30rpx; + box-sizing: border-box; + padding-bottom: 26rpx; + padding-top: 26rpx; + border-bottom: 2rpx solid #E5E5E5; + + .favorable_left { + display: flex; + align-items: center; + + .icon { + width: 40rpx; + height: 40rpx; + margin-right: 16rpx; + } + + .name { + font-size: 28rpx; + font-weight: 400rpx; + color: #333; + } + } + + .favorable_right { + display: flex; + align-items: center; + + .favorable_right_text { + font-size: 24rpx; + color: #999; + font-weight: 400rpx; + } + + } + + .favorable_right { + >.column { + display: flex; + flex-direction: column; + align-items: flex-end; + + .favorable_right_text { + margin-bottom: 10rpx; + + text:nth-child(1) { + font-size: 26rpx; + color: #999; + } + + text:nth-child(2) { + font-size: 26rpx; + color: #999; + margin: 0 30rpx; + } + + text:nth-child(3) { + font-size: 26rpx; + color: #333; + + } + } + } + } + + .favorable_right.column { + align-items: flex-start; + } + } + + .favorable.column { + align-items: flex-start; + } + + .cell-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 32rpx 34rpx 32rpx 34rpx; + + .label { + font-weight: bold; + font-size: 32rpx; + color: #333333; + } + + .val { + display: flex; + align-items: flex-end; + + view:nth-child(1) { + font-weight: 400; + font-size: 24rpx; + color: #999999; + margin-right: 42rpx; + } + + view:nth-child(2) { + display: flex; + align-items: flex-end; + font-weight: bold; + font-size: 36rpx; + color: #333333; + } + } + + } + + .totalPrice { + padding: 32rpx 30rpx; + box-sizing: border-box; + // border-top: 2rpx solid #E5E5E5; + display: flex; + justify-content: flex-end; + align-items: flex-end; + font-size: 32rpx; + color: #333; + font-weight: bold; + + .totalPriceNum { + font-size: 40rpx; + } + } + } + } + + // 备注 + .remark { + padding: 0 20rpx; + margin-top: 32rpx; + + .remark_bg { + background-color: $uni-bg-color; + border-radius: 22rpx; + padding: 32rpx 30rpx; + box-sizing: border-box; + + .remark_title { + font-size: 32rpx; + color: #333; + font-weight: 500; + margin-bottom: 16rpx; + } + + .u-textarea { + height: 148rpx; + background-color: #f5f5f5; + border-radius: 10rpx; + padding: 32rpx 22rpx !important; + box-sizing: border-box; + + textarea { + font-size: 24rpx; } } } + } - .hint { + + + + + .bottom { + width: 100%; + background: #FFFFFF; + box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1); + position: fixed; + bottom: 0; + display: flex; + align-items: center; + justify-content: space-between; + padding: 32rpx 50rpx 82rpx 50rpx; + box-sizing: border-box; + z-index: 9; + + .bottom_left { display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100rpx; + font-size: 28rpx; + font-weight: 500; + color: #333; + align-items: flex-end; - text { - font-size: 28rpx; - color: #ccc; + .totalAmount { + font-size: 40rpx; + font-weight: bold; + margin-top: 5rpx; + } + } + + .paymentBtnText { + background: #E8AD7B; + border-radius: 36rpx; + font-weight: 400; + font-size: 32rpx; + color: #FFFFFF; + padding: 14rpx 44rpx; + } + } + + .page-total { + position: inherit; + } + + .pay-info-wrap { + padding: 0; + box-sizing: border-box; + + .info-wrap { + padding: 64rpx 30rpx 30rpx 30rpx; + box-sizing: border-box; + + .title { + align-self: center; + font-size: 32rpx; + color: #333; + font-weight: bold; + } + } + + .info-content { + .pay-title { + display: flex; + align-items: flex-end; + justify-content: center; + font-weight: bold; + width: 100%; + font-size: 48rpx; + color: #333; + margin-top: 48rpx; + + text { + font-size: 60rpx; + color: #333; + } + } + + .pay-password { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 64rpx; + + .list { + width: 88rpx; + height: 88rpx; + display: flex; + align-items: center; + justify-content: center; + border: 2rpx solid #999; + border-radius: 8rpx; + + text { + font-size: 32rpx; + } + } + + } + + .hint { + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 100rpx; + + text { + font-size: 28rpx; + color: #ccc; + } } } } diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue index 0bf08ee..27a3cc2 100644 --- a/pages/product/components/shoppingCartes.vue +++ b/pages/product/components/shoppingCartes.vue @@ -145,6 +145,7 @@ product_id: item.id, sku_id: item.skuId, number: await calculateValue(item.cartNumber, i), + is_print: 1, }) } diff --git a/pages/product/index.vue b/pages/product/index.vue index b67c2a1..d781e50 100644 --- a/pages/product/index.vue +++ b/pages/product/index.vue @@ -2,7 +2,7 @@