增加抖音美团核销
This commit is contained in:
@@ -83,6 +83,13 @@
|
||||
{{ table ? "桌台号:" + table.name : "选择桌号" }}
|
||||
</div>
|
||||
</el-popover>
|
||||
|
||||
<div class="u-m-l-28">
|
||||
<el-button
|
||||
type="warning"
|
||||
@click="refQuanHexiaoOpen"
|
||||
>扫码验券</el-button>
|
||||
</div>
|
||||
<!-- 先付后付start -->
|
||||
<!-- <el-dropdown @command="changePostPay">
|
||||
<el-button plain type="primary" size="mini">
|
||||
@@ -100,6 +107,7 @@
|
||||
</el-button> -->
|
||||
|
||||
<!-- 先付后付end -->
|
||||
|
||||
<span
|
||||
@click="toggleFullScreen"
|
||||
class="flex flex-xy-center cur-pointer full-screen"
|
||||
@@ -808,7 +816,10 @@
|
||||
<span>{{ item | returntypeName }}</span>
|
||||
</div>
|
||||
<div class="info">
|
||||
<div class="name">{{ item.name }}</div>
|
||||
<div class="name u-flex u-flex-wrap">
|
||||
<span class="weight" v-if="item.type=='weigh'">称重</span>
|
||||
<span> {{ item.name }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<template v-if="layout.sel === 'text'">
|
||||
<div class="text-sell-out flex">
|
||||
@@ -1473,18 +1484,28 @@
|
||||
:vipUser="vipUser"
|
||||
@updateCart="updateCartItem"
|
||||
></cart-change-price>
|
||||
<!-- 团购券 -->
|
||||
<!-- 用户选择团购券 -->
|
||||
<pop-tuan-quan
|
||||
:cartGoods="createOrder.data.detailList || []"
|
||||
ref="refPopTuanQuan"
|
||||
@confirm="tuanQuanConfirm"
|
||||
></pop-tuan-quan>
|
||||
<!-- 美团/抖音团购券核销 -->
|
||||
<pop-quan-hexiao ref="refQuanHexiao">
|
||||
</pop-quan-hexiao>
|
||||
<!-- 挂账 -->
|
||||
<popup-choose-guazhang
|
||||
ref="refGuaZhang"
|
||||
:payMoney="yinFuJinE"
|
||||
@confirm="guazhangPayConfirm"
|
||||
></popup-choose-guazhang>
|
||||
|
||||
<!-- 称重商品 -->
|
||||
<popup-weight-goods
|
||||
ref="refWeightGoods"
|
||||
@confirm="refWeightGoodsConfirm"
|
||||
>
|
||||
</popup-weight-goods>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1504,8 +1525,10 @@ import moneyKeyboard from "./components/money-keyboard.vue";
|
||||
import caiAdd from "./components/popup-linshiCai.vue";
|
||||
import cartChangePrice from "./components/popup-cart-changePrice.vue";
|
||||
import popTuanQuan from "./components/popup-tuan-quan.vue";
|
||||
import popQuanHexiao from "./components/popup-quan-hexiao.vue";
|
||||
import tuanQuanTable from "./components/tuan-quan-table.vue";
|
||||
import popupChooseGuazhang from "./components/popup-choose-guazhang.vue";
|
||||
import popupWeightGoods from "./components/popup-weight-goods.vue";
|
||||
|
||||
import dayjs from "dayjs";
|
||||
import { tbShopInfo } from "@/api/user";
|
||||
@@ -1562,7 +1585,7 @@ import PopupChooseGuazhang from "./components/popup-choose-guazhang.vue";
|
||||
|
||||
let $originTableList = [];
|
||||
export default {
|
||||
components: {
|
||||
components: {popupWeightGoods,popQuanHexiao,
|
||||
popupChooseGuazhang,
|
||||
cartChangePrice,
|
||||
popTuanQuan,
|
||||
@@ -2328,6 +2351,18 @@ export default {
|
||||
this.open(this.$route.query);
|
||||
},
|
||||
methods: {
|
||||
//美团抖音团购券核销弹窗
|
||||
refQuanHexiaoOpen(){
|
||||
this.$refs.refQuanHexiao.open()
|
||||
},
|
||||
//称重商品弹窗
|
||||
refWeightGoodsShow() {
|
||||
this.$refs.refWeightGoods.open();
|
||||
},
|
||||
//称重商品确认
|
||||
refWeightGoodsConfirm(){
|
||||
|
||||
},
|
||||
//挂账人支付确认
|
||||
guazhangPayConfirm(guazhangren, price) {
|
||||
this.guazhangRen = guazhangren;
|
||||
@@ -4027,6 +4062,9 @@ export default {
|
||||
// if (!this.table) {
|
||||
// return this.$message.error("暂不支持无桌台下单,请先选择桌台");
|
||||
// }
|
||||
if(item.type=='weigh'){
|
||||
return this.refWeightGoodsShow()
|
||||
}
|
||||
if (item.typeEnum === "sku") {
|
||||
this.selGoods.data = item;
|
||||
this.selGoods.skuMap = {};
|
||||
@@ -5476,7 +5514,16 @@ input[type="number"]::-webkit-outer-spin-button {
|
||||
border-radius: 4px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.weight{
|
||||
height: 15px;
|
||||
background: linear-gradient(124deg, rgb(115, 201, 105) 6%, rgb(39, 146, 27) 93%);
|
||||
border-radius: 2px;
|
||||
font-size: 12px;
|
||||
text-align: center;
|
||||
line-height: 15px;
|
||||
padding: 0px 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
.cashier_left .el-form-item {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user