czg_team/cashier-ipad-new
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
duan
2025-09-29 10:42:48 +08:00
parent 89db955ec1
commit 096f591123
80 changed files with 8735 additions and 3286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

296
pagesCreateOrder/index/components/car.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="mask" @tap="hideGoods" v-if="switchGoods">
</view>
<view class="fixed goods-box u-flex u-flex-col" :class="{active:switchGoods}" @tap.stop="nullFun">
<view class="u-row-between top u-flex">
@@ -12,7 +12,7 @@
已选菜品({{goodsNumber}})
</view>
</view>
<view class="u-flex" @click="setModalShow('clear',true)">
<view class="u-flex" @click="setModalShow('clear',true,'','是否清空点餐？')">
<view>
<up-icon name="trash-fill" size="20" color="rgb(102,102,102)"></up-icon>
</view>
@@ -26,28 +26,32 @@
<view class="">元</view>
</view>
</view>
<scroll-view scroll-y="true" class=" u-flex-1 ">
<scroll-view scroll-y="true" style="height: 300px;background-color: #fff;">
<!-- <scroll-view scroll-y="true" class=" u-flex-1 " > -->
<view class=" ">
<view class="color-333item border-bottom u-p-l-20 u-p-r-20 u-p-b-10 u-p-t-20 u-flex u-row-center u-row-between"
v-for="(item,index) in data" :key="index">
<view
class="color-333 item border-bottom u-p-l-20 u-p-r-20 u-p-b-10 u-p-t-20 u-flex u-row-center u-row-between"
v-for="(item,index) in data" :key="item.id">
<view class="u-flex u-col-top">
<view class="u-p-r-20">
{{index+1}}
</view>
<view class="">
<view>{{item.name}}</view>
<view class="u-m-t-10 u-font-24 color-666">{{item.specSnap||''}}</view>
<view class="u-m-t-10 u-font-24 color-666">{{item.specInfo||''}}</view>
<view class="u-flex u-m-t-14">
<up-icon name="edit-pen" @click="showModel('remark',index)" color="#333" size="16"></up-icon>
<up-icon name="edit-pen" @click="showModel('remark',index)" color="#333"
size="16"></up-icon>
<view class="color-666 u-font-24">
{{item.note}}
</view>
</view>
</view>
</view>
<view class="u-flex">
<view class="font-bold red u-m-r-32">￥{{formatPrice(item.salePrice*item.number) }}</view>
<view class="font-bold red u-m-r-32">￥{{formatPrice(item.lowPrice*item.number) }}
</view>
<view class="u-flex" @tap="updateNumber(false,index,item)">
<image src="/pagesCreateOrder/static/images/icon-reduce-black.svg" class="icon" mode="">
</image>
@@ -55,17 +59,57 @@
<view class="u-p-l-30 u-p-r-30 color-333" style="">
{{item.number}}
</view>
<view class="u-flex" @tap="updateNumber(true,index,item)">
<image src="/pagesCreateOrder/static/images/icon-add-black.svg" class="icon" mode="">
</image>
</view>
<template v-if="item.type!='package'">
<view class="u-flex" @tap="updateNumber(true,index,item)">
<image src="/pagesCreateOrder/static/images/icon-add-black.svg" class="icon" mode="">
</image>
</view>
</template>
<template v-else>
<view class="u-flex" >
<image src="/pagesCreateOrder/static/images/icon-add-black.svg" style=" filter: opacity(30%);" class="icon" mode="">
</image>
</view>
</template>
</view>
</view>
<my-empty v-if="!data.length" text="暂未有添加商品"></my-empty>
</view>
<!-- 历史订单 -->
<view v-if="historyOrder.length > 0"
class="u-p-t-32 u-p-b-32 u-p-r-28 u-p-l-28 u-m-t-40 bg-fff u-flex u-row-between">
<view class="color-333" style="font-weight: bold;">历史订单</view>
<view class="color-666">
<uni-icons color="#666" type="trash"></uni-icons>
<text class="u-m-l-10" @tap="setModalShow('clear',true,'allHistoryOrder','清空历史订单')">清空历史订单</text>
</view>
</view>
<view v-for="(item,index) in historyOrder" :key="index" style="margin-top: 20rpx;">
<view v-if="historyOrder.length > 0"
class="u-p-t-32 border-top bg-fff u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
<view class="color-333" style="font-size: 30rpx;">第{{item.placeNum}}次下单</view>
<view class="color-666">
<!-- <uni-icons color="#666" type="trash"></uni-icons>
<text class="u-m-l-10"
@tap="setModalShow('clear',true,item.placeNum,'清空第'+item.placeNum+'次下单历史订单')">清空</text> -->
</view>
</view>
<view class="color-333 item border-top u-flex u-row-center u-row-between" style="margin-left: 60rpx;"
v-for="(v,i) in item.info" :key="i">
<view style="display: flex;align-items: center;">
<view class="up-line-1" style="margin-right: 10rpx;">{{v.productName}}</view>
<uni-tag v-if="v.returnNum>0" :text="'退菜X'+v.returnNum"
custom-style="background-color: #EB4F4F; border-color: #EB4F4F; color: #fff;">
</uni-tag>
</view>
<view class="u-flex" style="flex-shrink: 0;margin-top: 20rpx;">
<view class="font-bold red u-m-r-32">￥{{formatPrice(v.price*(v.num - v.returnNum)) }}</view>
<view class="u-m-l-30 u-m-r-30 color-333"> X{{v.num.toFixed(2)}} </view>
</view>
</view>
</view>
</scroll-view>
<view class="u-row-between bottom u-flex">
<view class="u-row-between bottom u-flex" style="position: absolute;left: 0;bottom: 0;background-color: #fff;">
<view class="u-flex" @click="hideGoods">
<view>
<up-icon name="arrow-left" size="14" color="#333"></up-icon>
@@ -80,8 +124,8 @@
</view>
</view>
<view class="car u-flex u-row-between u-col-bottom u-relative" @touchmove.stop.prevent="moveHandle"
:style="{transform: 'translateY(' + offset.y + 'px)'}" @touchstart="touchstart"
@touchmove="touchmove" @touchend="touchend">
:style="{transform: 'translateY(' + offset.y + 'px)'}" @touchstart="touchstart" @touchmove="touchmove"
@touchend="touchend">
<view class="u-absolute goods bg-fff">
<view
class="u-p-t-32 color-666 border-bottom bg-fff u-absolute total u-p-r-28 u-p-b-32 u-p-l-28 u-flex u-row-between">
@@ -98,17 +142,10 @@
<image src="/pagesCreateOrder/static/images/icon-car.svg" class="icon-car" />
<view class="dot">{{goodsNumber}}</view>
</view>
<!-- <view class="price font-bold u-flex">
<view>￥</view>
<view>{{allPrice}}</view>
</view> -->
<!-- <my-button shape="circle" height="80" width="220" @tap="toConfimOrder">
<text class="u-font-32 font-bold">{{table.type=='add'?'确认加菜':'去下单'}} </text>
</my-button> -->
</view>
<up-modal title="提示" content="是否清空全部已添加的商品?" :show="modal.clear" showCancelButton closeOnClickOverlay
<up-modal title="提示" :content="modal.title" :show="modal.clear" showCancelButton closeOnClickOverlay
@confirm="confirmModelConfirm" @cancel="setModalShow('clear',false)" @close="setModalShow('clear',false)"
width="300px"></up-modal>
<one-remark width="400px" @confirm="goodsOneRemarkConfirm" title="单品备注" :ref="setModel" name="remark"></one-remark>
@@ -121,6 +158,13 @@
import {
formatPrice
} from '@/commons/utils/format.js';
import {
$tbProduct,
adminProduct
} from '@/http/yskApi/goods.js'
// import {
// addWXCart
// } from "@/http/yskApi/Instead.js"
import {
getElRect
} from '@/commons/utils/safe-bottom.js'
@@ -132,21 +176,28 @@
reactive,
watch
} from 'vue';
let shopList = ref()
const props = defineProps({
sysInfo:{
sysInfo: {
type: Object,
default:()=>{
default: () => {
return {
windowWidth: 0,
windowHeight: 0,
statusBarHeight:0
statusBarHeight: 0
}
}
},
historyOrder: {
type: Array,
default: () => {
return []
}
},
instance: {
type: Object,
default: {
}
},
data: {
@@ -171,7 +222,7 @@
type: Object,
default: () => {
return {
tableId: ''
}
}
},
@@ -180,12 +231,26 @@
default: ''
}
})
const edmits = defineEmits(['clear', 'updateNumber', 'updateSafeBottom','updateCart'])
const edmits = defineEmits(['clear', 'updateNumber', 'updateSafeBottom', 'updateCart'])
const modal = reactive({
key: '',
title: '',
type: '',
clear: false
})
let allHistoryOrder = ref([]);
const allPrice = computed(() => {
let cartPrice = props.data.reduce((prve, cur) => {
let price = Math.floor((cur.lowPrice * cur.number) * 100) / 100
return prve + price
}, 0)
let historyOrderPrice = allHistoryOrder.value.reduce((prve, cur) => {
let price = Math.floor((cur.price * (cur.num - cur.returnNum)) * 100) / 100
return prve + price
}, 0)
return (cartPrice + historyOrderPrice).toFixed(2)
})
const models = new Map();
const modelData = reactive({
data: {},
@@ -193,29 +258,35 @@
})
//备注
let note = ref('')
watch(() => props.historyOrder, (newval) => {
allHistoryOrder.value = [];
newval.forEach(item => {
allHistoryOrder.value = [...allHistoryOrder.value, ...item.info]
})
})
function setModel(el) {
if (el && el.$attrs['name']) {
models.set(el.$attrs['name'], el);
}
}
function showModel(key, index) {
modelData.data = props.data[index]
modelData.selIndex = index
const model = models.get(key)
model && model.open({
remark: modelData.data.note||''
remark: modelData.data.note || ''
})
}
function confirmModelConfirm() {
if (modal.key == 'clear') {
clear()
}
}
//单品备注确认
async function goodsOneRemarkConfirm(e) {
const cart = props.data[modelData.selIndex]
@@ -229,18 +300,21 @@
})
edmits('updateCart')
}
function setModalShow(key = 'show', show = true) {
if (key == 'clear' && show && props.data.length <= 0) {
return infoBox.showToast('购物车是空的！')
// 清空购物车
function setModalShow(key = 'show', show = true, type = '', title = '') {
if (title) {
modal.title = title
}
if (type) {
modal.type = type
}
modal.key = key
modal[key] = show
console.log(modal);
console.log(modal, 123);
}
function nullFun() {
@@ -260,56 +334,86 @@
function toggleGoods() {
switchGoods.value = !switchGoods.value
// 获取商品详情
// getshopsInfo()
}
function getshopsInfo() {
let arr = uni.getStorageSync('wxList')
let att = []
arr.forEach(async ele => {
let res = await adminProduct(ele.product_id)
console.log(res);
att.push({
...res.data,
...ele,
ele
})
})
setTimeout(() => {
// uni.setStorageSync('shopsList', att)
shopList.value = att
console.log(att, '初始化')
}, 200)
// product_id()
// const findCategory = layoutData.category.list.find(v => v.shopId == goods.shop_id)
}
function toConfimOrder() {
console.log(props.user);
if (props.data.length <= 0) {
return infoBox.showToast('还没有选择商品')
}
const {
tableId,
name,
maxCapacity,
status,
type
} = props.table
if (props.table.tableId == '') {
go.to('PAGES_CONFIRM_ORDER', {
masterId: props.masterId,
isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
})
}else{
go.to('PAGES_CONFIRM_ORDER', {
masterId: props.masterId,
type,
tableId,
if (props.table.id) {
const {
id,
name,
maxCapacity,
status,
isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0
type
} = props.table
go.to('PAGES_CONFIRM_ORDER', {
masterId: props.masterId,
type,
tableId: id,
name,
maxCapacity,
status,
isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0,
tableCode: props.table.tableCode,
})
} else {
go.to('PAGES_CONFIRM_ORDER', {
masterId: props.masterId,
isCreateOrderToDetail: props.isCreateOrderToDetail ? 1 : 0,
tableCode: props.table.tableCode,
})
}
hideGoods()
}
const allPrice = computed(() => {
return props.data.reduce((prve, cur) => {
return prve + cur.salePrice * cur.number
}, 0).toFixed(2)
})
const goodsNumber = computed(() => {
let result = 0
result = props.data.reduce((prve, cur) => {
let cart = props.data.reduce((prve, cur) => {
return prve + cur.number
}, 0)
return result >= 99 ? 99 : result
let historyOrderNum = allHistoryOrder.value.reduce((prve, cur) => {
return prve + cur.num
}, 0)
result = cart + historyOrderNum
result = result > 0 ? result.toFixed(2) : 0
return result >= 99 ? 99 : parseFloat(result)
})
function updateNumber(isAdd, index, goods) {
const step = isAdd ? 1 : -1
const newval = goods.number + step
const newval = (goods.number) + step
const par = {
num: newval,
index: index,
@@ -321,17 +425,22 @@
const offset = ref({
x: 0,
y: (props.sysInfo.windowHeight-70-40)/2
y: (props.sysInfo.windowHeight - 70 - 40) / 2
})
const startPoint = ref({
x: 0,
y: 0
})
watch(()=>props.sysInfo.windowHeight,(newval)=>{
watch(() => props.sysInfo.windowHeight, (newval) => {
console.log('---------');
console.log(newval);
offset.value.y=(newval-70-40)/2
offset.value.y = (newval - 70 - 40) / 2
})
// watch(() => props.data, (n) => {
// shopList.value = uni.getStorageSync('wxList')
// getshopsInfo()
// })
// function
function touchstart(event) {
startPoint.value = {
x: event.touches[0].clientX,
@@ -348,13 +457,14 @@
x: currentPoint.x - startPoint.value.x,
y: currentPoint.y - startPoint.value.y
};
const minY=props.sysInfo.statusBarHeight||0 ,maxY=props.sysInfo.windowHeight-70-40;
let newY=offset.value.y + delta.y
if(newY>maxY){
newY=maxY
const minY = props.sysInfo.statusBarHeight || 0,
maxY = props.sysInfo.windowHeight - 70 - 40;
let newY = offset.value.y + delta.y
if (newY > maxY) {
newY = maxY
}
if(newY<minY){
newY=minY
if (newY < minY) {
newY = minY
}
offset.value = {
// x: offset.value.x + delta.x,
@@ -372,15 +482,22 @@
}
function clear() {
if (modal.type == 'cart') {
hideGoods()
}
setModalShow('clear', false)
edmits('clear')
hideGoods()
edmits('clear', modal.type)
// setModalShow('clear', false)
// edmits('clear')
// hideGoods()
}
onMounted(() => {
onMounted(async () => {
getElRect('car', props.instance).then(res => {
console.log(res);
edmits('updateSafeBottom', res)
}).catch(err=>{
}).catch(err => {
console.log(err);
})
})
@@ -416,6 +533,7 @@
transition: all .2s ease-in-out;
transform: translateX(100%);
z-index: 10;
&.active {
transform: translateX(0);
}