问题修复
This commit is contained in:
@@ -94,7 +94,7 @@
|
||||
<view class="u-p-l-30 u-p-r-30 color-333" style="">
|
||||
{{ item.number }}
|
||||
</view>
|
||||
<template v-if="item.type != 'package'">
|
||||
<template v-if="item.type != 'package' || (item.type == 'package'&&item.groupType==0)">
|
||||
<view class="u-flex" @tap="updateNumber(true, index, item)">
|
||||
<image
|
||||
src="/pagesCreateOrder/static/images/icon-add-black.svg"
|
||||
@@ -199,6 +199,9 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view style="height: 100px;"></view>
|
||||
|
||||
</scroll-view>
|
||||
|
||||
<view
|
||||
@@ -286,12 +289,14 @@
|
||||
|
||||
<ServingStyleModal
|
||||
v-model="servingStyleModalShow"
|
||||
v-model:servingSel="subStatus"
|
||||
@confirm="servingStyleConfirm"
|
||||
></ServingStyleModal>
|
||||
|
||||
<!-- 下单确认 -->
|
||||
<Modal
|
||||
v-model="orderConfirmModalShow"
|
||||
|
||||
title="下单确认"
|
||||
confirmText="确定"
|
||||
@confirm="workerConfirm"
|
||||
@@ -531,7 +536,6 @@ function setModalShow(key = "show", show = true, type = "", title = "") {
|
||||
}
|
||||
modal.key = key;
|
||||
modal[key] = show;
|
||||
console.log(modal, 123);
|
||||
}
|
||||
|
||||
function nullFun() {}
|
||||
@@ -585,6 +589,7 @@ async function workerConfirm() {
|
||||
return infoBox.showToast("请输入当前登录员工账号");
|
||||
}
|
||||
let newOldRes = null;
|
||||
console.log('props.orderInfo',props.orderInfo);
|
||||
if (props.data.length >= 1) {
|
||||
newOldRes = await createOrder({
|
||||
shopId: uni.getStorageSync("shopId"), //店铺Id
|
||||
@@ -600,6 +605,7 @@ async function workerConfirm() {
|
||||
vipPrice: false, //是否使用会员价
|
||||
limitRate: null,
|
||||
subStatus: subStatus.value,
|
||||
orderId: props.orderInfo.id?props.orderInfo.id:"",
|
||||
});
|
||||
if (!newOldRes) {
|
||||
return infoBox.showToast("创建订单失败");
|
||||
@@ -607,6 +613,7 @@ async function workerConfirm() {
|
||||
}
|
||||
|
||||
form.workerAccount = "";
|
||||
subStatus.value = servingStyles[0].value
|
||||
go.to("PAGES_TABLE_ORDER", {
|
||||
orderId: newOldRes ? newOldRes.id : props.orderInfo.id,
|
||||
});
|
||||
@@ -729,11 +736,12 @@ function touchend(e) {
|
||||
}
|
||||
|
||||
function clear() {
|
||||
edmits("clear", modal.key);
|
||||
setModalShow("clear", false);
|
||||
if (modal.type == "cart") {
|
||||
hideGoods();
|
||||
}
|
||||
setModalShow("clear", false);
|
||||
edmits("clear", modal.type);
|
||||
|
||||
|
||||
// setModalShow('clear', false)
|
||||
// edmits('clear')
|
||||
|
||||
Reference in New Issue
Block a user