diff --git a/src/views/table/components/table-diancan.vue b/src/views/table/components/table-diancan.vue index e2791ac..543e9f9 100644 --- a/src/views/table/components/table-diancan.vue +++ b/src/views/table/components/table-diancan.vue @@ -7,7 +7,58 @@ :visible.sync="informationdialogshow" @close="onclose" > -
+
+
+
+ {{ title }} +
+ + + {{ postPay ? "后付费" : "先付费" }} + + + + 先付费 + 后付费 + + + + + + +
+ +
+
+ +
+
+
+ + + + +
+
+
+
+
@@ -69,8 +120,12 @@ > @@ -983,13 +1037,15 @@ export default { chooseTable, payType, orderNote, - moneyKeyboard + moneyKeyboard, }, data() { return { - moneyKeyboard:{ - show:true, - title:'支付' + //是否全屏 + isFullScreen:false, + moneyKeyboard: { + show: true, + title: "支付", }, //true后付款false先付款 postPay: true, @@ -1339,9 +1395,42 @@ export default { this.getCategory(); }, methods: { + toggleFullScreen() { + if (!document.fullscreenElement) { + this.enterFullScreen(); + } else { + this.exitFullScreen(); + } + }, + enterFullScreen() { + let element = document.documentElement; + if (element.requestFullscreen) { + element.requestFullscreen(); + } else if (element.mozRequestFullScreen) { /* Firefox */ + element.mozRequestFullScreen(); + } else if (element.webkitRequestFullscreen) { /* Chrome, Safari & Opera */ + element.webkitRequestFullscreen(); + } else if (element.msRequestFullscreen) { /* IE/Edge */ + element.msRequestFullscreen(); + } + this.isFullScreen=true + }, + exitFullScreen() { + if (document.exitFullscreen) { + document.exitFullscreen(); + } else if (document.mozCancelFullScreen) { /* Firefox */ + document.mozCancelFullScreen(); + } else if (document.webkitExitFullscreen) { /* Chrome, Safari and Opera */ + document.webkitExitFullscreen(); + } else if (document.msExitFullscreen) { /* IE/Edge */ + document.msExitFullscreen(); + } + this.isFullScreen=false + + }, //打开输入钱的键盘 - openMoneyKeyboard(){ - this.$refs.refMoneyKeyboard.open() + openMoneyKeyboard() { + this.$refs.refMoneyKeyboard.open(); }, changePostPay(val) { this.postPay = val; @@ -1368,7 +1457,7 @@ export default { masterId: this.masterId, orderId: this.createOrder.data.id, payType: this.order.payType, - vipUserId:this.vipUser.id + vipUserId: this.vipUser.id, }); this.payOrderSuccess(); }, @@ -1607,7 +1696,7 @@ export default { }, //获取挂起订单 async getCacheOrder() { - const res = await $getCacheOrder({tableId:this.table.tableId}); + const res = await $getCacheOrder({ tableId: this.table.tableId }); console.log(res); this.prveOrder.list = res; }, @@ -2236,6 +2325,18 @@ input[type="number"]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } +.full-screen{ + margin-left: 10px; + svg{ + width: 24px; + height: 24px; + } + &:hover{ + path{ + fill: #1890ff; + } + } +} .icon-add { color: rgb(34, 191, 100); @@ -2385,13 +2486,15 @@ input[type="number"]::-webkit-outer-spin-button { .col-baseline { align-items: baseline; } -.flex-x-y-center{ +.flex-x-y-center { display: flex; justify-content: center; align-items: center; background-color: #efefef; } - +::v-deep .el-dialog__body{ + padding: 0 20px; +} .absolute { position: absolute; } @@ -2856,8 +2959,7 @@ input[type="number"]::-webkit-outer-spin-button { .diancan { display: flex; - height: 80vh; - + height: calc(100vh - 75px) ; .choose-user { padding: 10px 0; border-bottom: 1px solid #ebebeb; @@ -3087,9 +3189,8 @@ input[type="number"]::-webkit-outer-spin-button { display: flex; flex-direction: column; box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.07); - .img-box{ + .img-box { width: 136px; - } img { width: 136px; @@ -3148,15 +3249,13 @@ input[type="number"]::-webkit-outer-spin-button { display: none; } } - &.layout-text.sell-out{ + &.layout-text.sell-out { .info { color: #c8c8c8; .name { - color: #c8c8c8; - + color: #c8c8c8; } - } } }