wangmingchuan321@qq.com 6 months ago
parent 7b792b1f2e
commit 441711382d
  1. 5
      app/controller/api/v2/activity/UserCode.php
  2. 5
      app/controller/cashier/User.php
  3. 493
      app/controller/cashier/User2.php
  4. 4
      route/cashier.php
  5. 84
      收银台/cashier/.idea/workspace.xml
  6. 2
      收银台/cashier/node_modules/.cache/babel-loader/1d34139a486d4b064b562df0d9274e7a.json
  7. 2
      收银台/cashier/node_modules/.cache/babel-loader/82cb89508aa248a83f4d7240821b95ff.json
  8. 2
      收银台/cashier/node_modules/.cache/babel-loader/8f21cf126cf4603dbe1ffc14e83c7ca0.json
  9. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/1c29d26dc57e768103899442b58bfbbe9422cece.json.gz
  10. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/2509e80402467a47a96ca36a68dc8f8dfe6f5ace.json.gz
  11. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/637af28a2ac80e181cf0edb8b7394b2469f60b51.json.gz
  12. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/63a2bcdd43d1ccdba911b04908cfae7aebfd55b8.json.gz
  13. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/810359667499eb5e4e90f9913aa82a95e78391ab.json.gz
  14. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/99e85fdd3dc10b00e23ba9f3cc33cd32cd952a6e.json.gz
  15. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/ab66d75d0140ab29995f0d6db8473531503077d2.json.gz
  16. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/dbb484c2455e97f26afe70f8d39edc5875ba5948.json.gz
  17. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/efe001e1ac1bdbeaf368df409fca68fdf6addf7b.json.gz
  18. 2
      收银台/cashier/node_modules/.cache/vue-loader/01191426301dc381f3b6fbd65e91e243.json
  19. 2
      收银台/cashier/node_modules/.cache/vue-loader/19bb3468e4b84d574d14b60ed21a789a.json
  20. 2
      收银台/cashier/node_modules/.cache/vue-loader/52f6993118589c00520faae1966f0225.json
  21. 2
      收银台/cashier/node_modules/.cache/vue-loader/5510ae7f5ee42a37808843fc885a8ac8.json
  22. 2
      收银台/cashier/node_modules/.cache/vue-loader/786f6eafe38fa68c0c16230c16cf7a5a.json
  23. 2
      收银台/cashier/node_modules/.cache/vue-loader/7c8e55c3f4c6b51d915e21a7ed2d1a33.json
  24. 2
      收银台/cashier/node_modules/.cache/vue-loader/95b0f76ad6c339e9689a609f15ad40a7.json
  25. 2
      收银台/cashier/node_modules/.cache/vue-loader/af8e81b1fce40604159e0ccf1191617f.json
  26. 2
      收银台/cashier/node_modules/.cache/vue-loader/b5fcc5f7b74d72eb66af5b88f5060298.json
  27. 2
      收银台/cashier/node_modules/.cache/vue-loader/cea8e4e24393f8ec29d34dfef1941277.json
  28. 54
      收银台/cashier/src/api/order.js
  29. 3
      收银台/cashier/src/pages/cunqu/index.vue
  30. 11
      收银台/cashier/src/pages/table/index2.vue

@ -34,6 +34,11 @@ class UserCode
$this->services = $services;
}
public function setServices(UserCollageCodeServices $services)
{
$this->services = $services;
}
/**
* 门店桌码配置
* @param $store_id

@ -79,9 +79,8 @@ class User extends AuthController
// public function __construct(UserCollageCodeServices $services)
// {
// // 创建UserCode的实例
//// $this->userCode = new UserCode($services);
// $this->services = $services;
// // 创建UserCode的实例1
// $this->userCode = new UserCode($services);
// }
public function updatePwd(Request $request, SystemStoreStaffServices $services)

@ -0,0 +1,493 @@
<?php
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
namespace app\controller\cashier;
use app\Request;
use app\services\cashier\UserServices;
use app\services\store\StoreUserServices;
use app\controller\api\v2\activity\UserCode;
use DateTimeImmutable;
use app\services\order\{OtherOrderServices,
StoreCartServices,
StoreDeliveryOrderServices,
StoreOrderCartInfoServices,
StoreOrderCommentServices,
StoreOrderComputedServices,
StoreOrderCreateServices,
StoreOrderEconomizeServices,
StoreOrderRefundServices,
StoreOrderServices,
StoreOrderStatusServices,
StoreOrderSuccessServices,
StoreOrderTakeServices,
StoreOrderPromotionsServices,
StoreOrderWriteOffServices
};
use app\services\store\SystemStoreStaffServices;
use app\services\user\level\SystemUserLevelServices;
use app\services\user\member\MemberCardServices;
use app\services\activity\discounts\StoreDiscountsServices;
use app\services\activity\collage\UserCollageCodeServices;
use app\webscoket\SocketPush;
use crmeb\services\CacheService;
use think\exception\ValidateException;
use think\facade\Db;
use think\facade\Log;
/**
* 收银台用户控制器
*/
class User2 extends AuthController
{
private $userCode;
protected $getChennel = [
'weixin' => 0,
'routine' => 1,
'weixinh5' => 2,
'pc' => 3,
'app' => 4
];
protected $addressInfo = [
'id' => 0,
'real_name' => '',
'phone' => '',
'province' => '',
'city' => '',
'district' => '',
'street' => '',
'detail' => '',
'longitude' => '',
'latitude' => ''
];
/**
* 修改收银员信息
* @param Request $request
* @param SystemStoreStaffServices $services
* @return mixed
*/
public function __construct(UserCollageCodeServices $services)
{
// 创建UserCode的实例1
$this->userCode = new UserCode($services);
}
/**
* 收银台用户记录
* @param Request $request
* @param \app\services\user\UserServices $userServices
* @param $uid
* @return mixed
*/
public function userRecord(Request $request, \app\services\user\UserServices $userServices, $uid)
{
$type = $request->get('type', '');
return $this->success($userServices->oneUserInfo((int)$uid, $type));
}
//台桌预定
public function tableYuDing($wtable_id, $wremark, $wphone, $wyuding_date,$come_date,$store_id)
{
$post['table_id'] = $wtable_id;
$post['phone'] = $wphone;
$post['yuding_date'] = date("Y-m-d", strtotime($wyuding_date));
$post['come_date'] = $come_date;
$post['remark'] = $wremark;
$post['store_id'] = $store_id;
$post['create'] = time();
//校验这个桌子有无在使用
$info = Db::name('table_qrcode')
->where('id', $post['table_id'])
->find();
if (!$info) {
return app('json')->fail('预定失败');
}
if ($info['is_use'] != 0) {
return app('json')->fail('预定失败,台桌正在使用中');
}
//插入预定表
Db::name('table_yuding')->insert($post);
//改桌子状态
$up = Db::name('table_qrcode')->where('id', $post['table_id'])->update(['is_use' => 2]);
if($up){
return 1;
}
return 0;
}
/**
* 切换用户、用户切换到其他用户、用户切换到游客
* @param Request $request
* @return mixed
*/
public function changeTable(Request $request)
{
//wmc api
$table_number = $request->post('table_number', 0);
$uid = $request->post('uid', 0);
$store_id = $request->post('store_id', 1);
$collage_id = $request->post('collage_id', 0);
if (!empty($table_number)) {
$table = Db::name('table_qrcode')->where('table_number', $table_number)->where('is_use', 0)->find();
if (!$table) {
return $this->fail('桌码输入错误或状态错误');
}
$h = $this->userCode->userChangingTables2($collage_id, $uid, $store_id, $table['id']);
if ($h) {
return $this->success('换桌成功', ['res' => $table['id']]);
}
}
return $this->fail('换桌失败');
}
/**
* 获取副屏用户信息
* @return mixed
*/
public function getAuxScreenInfo()
{
$res = CacheService::redisHandler()->get('aux_screen_' . $this->cashierId);
$data = [];
$key = ['cashier_id' => 0, 'tourist_uid' => 0, 'uid' => 0, 'tourist' => false];
foreach ($key as $k => $v) {
$data[$k] = $res[$k] ?? $v;
}
return $this->success($data);
}
/**
* 获取会员类型
* @param Request $request
* @return mixed
*/
public function getMemberCard(Request $request)
{
[$is_money_level, $overdue_time] = $request->getMore([
['is_money_level', 0],
['overdue_time', 0],
], true);
/** @var MemberCardServices $memberCardServices */
$memberCardServices = app()->make(MemberCardServices::class);
$member_type = $memberCardServices->DoMemberType(0, false);
if (!$is_money_level) $overdue_time = time();
foreach ($member_type as $key => &$item) {
if (!$overdue_time || $item['type'] == 'ever' && $item['vip_day'] == -1) {
$item['overdue_time'] = '';
} else {
$item['overdue_time'] = date('Y-m-d H:i:s', $overdue_time + $item['vip_day'] * 86400);
}
}
return $this->success($member_type);
}
/**
* 购买会员
* @param Request $request
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
*/
public function payMember(Request $request, \app\services\user\UserServices $services)
{
[$uid, $price, $memberId, $payType, $authCode, $libao_id, $libao_products] = $request->postMore([
['uid', 0],
['price', 0],
['merber_id', 0],
[['pay_type', 'd'], 2], //2=用户扫码支付,3=付款码扫码支付, 4=现金支付
['auth_code', ''],
['libao_id', ''],
['libao_products', []],
], true);
if (!(int)$memberId) {
return $this->fail('缺少购买会员类型ID');
}
if (!$authCode && $payType == 3) {
return $this->fail('缺少付款码二维码CODE');
}
if (!$price || $price <= 0) {
return $this->fail('充值金额不能为0元!');
}
$storeMinRecharge = sys_config('store_user_min_recharge');
if ($price < $storeMinRecharge) return $this->fail('充值金额不能低于' . $storeMinRecharge);
// 创建会员礼包订单
if ($libao_id) {
$discountId = $libao_id;
//添加购物车
/** @var StoreDiscountsServices $StoreDiscountsServices */
$discountService = app()->make(StoreDiscountsServices::class);
/** @var StoreOrderServices $StoreOrderServices */
$StoreOrderServices = app()->make(StoreOrderServices::class);
/** @var StoreCartServices $StoreCartServices */
$StoreCartServices = app()->make(StoreCartServices::class);
$discounts = $discountService->get((int)$discountId, ['id', 'is_limit', 'limit_num']);
if (!$discounts) {
return app('json')->fail('套餐商品未找到!');
}
//套餐限量
if ($discounts['is_limit']) {
if ($discounts['limit_num'] <= 0) {
return app('json')->fail('套餐限量不足');
}
if (!CacheService::checkStock(md5($discounts['id']), 1, 5)) {
return app('json')->fail('套餐限量不足');
}
}
$cartIds = [];
$cartNum = 0;
$activityId = (int)$discountId;
foreach ($libao_products as $info) {
[$cartId, $cartNum] = $StoreCartServices->setCart($uid, (int)$info['product_id'], $info['pnum'], '', 5, 1, $activityId, (int)$info['id']);
$cartIds[] = $cartId;
}
$cartId = implode(',', $cartIds);
$user = $services->getUserInfo($uid);
$querendingdan = $StoreOrderServices->getOrderConfirmData($user->toArray(), $cartId, 1, 0, 2, 0, 0);
$orderarray = array(
'addressId' => 0,
'bargainId' => 0,
'collate_code_id' => 0,
'combinationId' => 0,
'couponId' => 0,
'custom_form' => [],
'discountId' => $libao_id,
'formId' => "",
'from' => "routine",
'invoice_id' => "",
'mark' => "",
'new' => 1,
'payType' => "weixin",
'phone' => $user['phone'],
'pinkId' => 0,
'real_name' => $user['real_name'] ?? $user['nickname'],
'seckill_id' => 0,
'shipping_type' => 2,
'store_id' => 1,
'useIntegral' => false,
'uid' => $uid,
'user' => $user->toArray()
);
$order = $this->create($orderarray, $querendingdan['orderKey']);
}
/** @var OtherOrderServices $OtherOrderServices */
$OtherOrderServices = app()->make(OtherOrderServices::class);
$re = $OtherOrderServices->payMember($uid, (int)$memberId, (float)$price, (int)$payType, 'store', $this->cashierInfo, $authCode, $order);
if ($re) {
$msg = $re['msg'];
unset($re['msg']);
return $this->success($msg, $re);
}
return $this->fail('充值失败');
}
/**
* 订单创建
* @param $key
* @return mixed
* @throws \Psr\SimpleCache\InvalidArgumentException
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function create($orderinfo, $key)
{
/** @var StoreOrderServices $StoreOrderServices */
$StoreOrderServices = app()->make(StoreOrderServices::class);
/** @var StoreOrderCreateServices $createServices */
$createServices = app()->make(StoreOrderCreateServices::class);
if (!$key) return app('json')->fail('参数错误!');
$uid = $orderinfo['uid'];
if ($checkOrder = $StoreOrderServices->getOne(['unique' => $key, 'uid' => $orderinfo['uid'], 'is_del' => 0], 'id,order_id'))
return app('json')->status('extend_order', '订单已创建,请点击查看完成支付', ['orderId' => $checkOrder['order_id'], 'key' => $key]);
$addressId = $orderinfo['addressId'];
$bargainId = $orderinfo['bargainId'];
$collate_code_id = $orderinfo['collate_code_id'];
$combinationId = $orderinfo['combinationId'];
$couponId = $orderinfo['couponId'];
$customForm = $orderinfo['custom_form'];
$discountId = $orderinfo['discountId'];
$formId = $orderinfo['formId'];
$from = $orderinfo['from'];
$invoice_id = $orderinfo['invoice_id'];
$mark = $orderinfo['mark'];
$news = $orderinfo['new'];
$payType = $orderinfo['payType'];
$phone = $orderinfo['phone'];
$pinkId = $orderinfo['pinkId'];
$real_name = $orderinfo['real_name'];
$seckill_id = $orderinfo['seckill_id'];
$shipping_type = $orderinfo['shipping_type'];
$newcomerId = 0;
$quitUrl = '';
$storeId = $orderinfo['store_id'];
$useIntegral = $orderinfo['useIntegral'];
$user = $orderinfo['user'];
$cartGroup = $StoreOrderServices->getCacheOrderInfo($uid, $key);
if (!$cartGroup) {
return app('json')->fail('请勿重复提交或订单已过期 请刷新当前页面!');
}
$cartInfo = $cartGroup['cartInfo'];
if (!$cartInfo) {
return app('json')->fail('订单已过期或提交的商品不在送达区域,请刷新当前页面或重新选择商品下单!123');
}
$payType = strtolower($payType);
if ($shipping_type == 1) {
$cartInfo = $cartGroup['cartInfo'];
$product_type = $cartInfo[0]['productInfo']['product_type'] ?? 0;
//普通商品 验证地址
if ($product_type == 0 && !$addressId) {
return app('json')->fail('请选择收货地址!');
}
$addressInfo = ($cartGroup['addr'] ?? []) ?: $this->addressInfo;
if ($addressId && (!$addressInfo || !isset($addressInfo['id']) || $addressInfo['id'] != $addressId)) {
/** @var UserAddressServices $addressServices */
$addressServices = app()->make(UserAddressServices::class);
if (!$addressInfo = $addressServices->getOne(['uid' => $uid, 'id' => $addressId, 'is_del' => 0]))
return app('json')->fail('地址选择有误!');
$addressInfo = $addressInfo->toArray();
}
} elseif ($shipping_type == 4) {
$addressInfo = $this->addressInfo;
} else {
if (!$real_name || !$phone) {
return app('json')->fail('请填写姓名和电话');
}
$addressInfo = $this->addressInfo;
$addressInfo['real_name'] = $real_name;
$addressInfo['phone'] = $phone;
}
//下单前砍价验证
if ($bargainId) {
/** @var StoreBargainServices $bargainServices */
$bargainServices = app()->make(StoreBargainServices::class);
$bargainServices->checkBargainUser((int)$bargainId, $uid);
}
//下单前发票验证
if ($invoice_id) {
/** @var UserInvoiceServices $userInvoiceServices */
$userInvoiceServices = app()->make(UserInvoiceServices::class);
$userInvoiceServices->checkInvoice((int)$invoice_id, $uid);
}
if ($pinkId) {
$pinkId = (int)$pinkId;
/** @var StorePinkServices $pinkServices */
$pinkServices = app()->make(StorePinkServices::class);
if ($pinkServices->isPink($pinkId, $uid))
return app('json')->status('ORDER_EXIST', '订单生成失败,你已经在该团内不能再参加了', ['orderId' => $StoreOrderServices->getStoreIdPink($pinkId, $uid)]);
if ($StoreOrderServices->getIsOrderPink($pinkId, $uid))
return app('json')->status('ORDER_EXIST', '订单生成失败,你已经参加该团了,请先支付订单', ['orderId' => $StoreOrderServices->getStoreIdPink($pinkId, $uid)]);
if (!CacheService::checkStock(md5($pinkId), 1, 3) || !CacheService::popStock(md5($pinkId), 1, 3)) {
return app('json')->fail('该团人员已满');
}
}
if ($from != 'pc') {
if (!$StoreOrderServices->checkPaytype($payType)) {
return app('json')->fail('暂不支持该支付方式,请刷新页面或者联系管理员');
}
}
$isChannel = $this->getChennel[$from] ?? 1;
if ($seckill_id || $combinationId || $discountId || $bargainId) {
//套餐限量库
if ($discountId) {
/** @var StoreDiscountsServices $discountService */
$discountService = app()->make(StoreDiscountsServices::class);
$discounts = $discountService->get((int)$discountId);
if (!$discounts) {
return app('json')->fail('套餐商品未找到!');
}
//套餐限量
if ($discounts['is_limit'] && !CacheService::popStock(md5($discountId), 1, 5)) {
return app('json')->fail('您购买的套餐不足');
}
}
foreach ($cartInfo as $item) {
if (!isset($item['product_attr_unique']) || !$item['product_attr_unique']) continue;
$type = $item['type'];
if (in_array($type, [1, 2, 3, 4]) && (!CacheService::checkStock($item['product_attr_unique'], (int)$item['cart_num'], $type) || !CacheService::popStock($item['product_attr_unique'], (int)$item['cart_num'], $type))) {
return app('json')->fail('您购买的商品库存已不足' . $item['cart_num'] . $item['productInfo']['unit_name']);
}
}
}
try {
$msg = '';
$order = $createServices->createOrder($uid, $key, $cartGroup, (int)$addressId, $payType, $addressInfo, $user, !!$useIntegral, $couponId, $mark, $pinkId, $isChannel, $shipping_type, $storeId, !!$news, $customForm, (int)$invoice_id, $from, (int)$collate_code_id);
} catch (\Throwable $e) {
$order = false;
$msg = $e->getMessage();
\think\facade\Log::error('订单生成失败,原因:' . $msg . $e->getFile() . $e->getLine());
}
if ($order === false) {
if ($seckill_id || $combinationId || $discountId || $bargainId) {
//回退套餐限量库
if ($discountId) CacheService::setStock(md5($discountId), 1, 5, false);
foreach ($cartInfo as $item) {
if (!isset($item['product_attr_unique']) || !$item['product_attr_unique']) continue;
$type = $item['type'];
if (in_array($type, [1, 2, 3, 4])) CacheService::setStock($item['product_attr_unique'], (int)$item['cart_num'], $type, false);
}
}
return app('json')->fail($msg ?: '订单生成失败');
}
$orderId = $order['order_id'];
return $orderId;
}
/**显示指定的资源
* @param $id
* @param \app\services\user\UserServices $services
* @return mixed
*/
public function read($id, \app\services\user\UserServices $services)
{
return $this->success($services->read((int)$id));
}
/**获取单个用户信息
* @param Request $request
* @param $id
* @param \app\services\user\UserServices $services
* @return mixed
*/
public function oneUserInfo(Request $request, $id, \app\services\user\UserServices $services)
{
$data = $request->getMore([
['type', ''],
]);
$id = (int)$id;
if ($data['type'] == '') return $this->fail('缺少参数');
return $this->success($services->oneUserInfo($id, $data['type']));
}
}

@ -50,7 +50,7 @@ Route::group('cashierapi', function () {
//获取版权
Route::get('copyright', 'Common/getCopyright')->option(['real_name' => '获取版权']);
Route::post('store_discounts/getList', 'Product/getList');
});
/**
@ -109,6 +109,8 @@ Route::group('cashierapi', function () {
Route::get('user/get_list', 'User/getUserList')->option(['real_name' => '收银台选择用户列表']);
//收银台切换购物车用户
Route::post('user/switch/:cashierId', 'User/switchCartUser')->option(['real_name' => '收银台切换购物车用户']);
//收银台切换购物车用户
Route::post('user2/changeTable', 'User2/changeTable')->option(['real_name' => '换桌']);
//获取收银台用户信息
Route::post('user/user_Info', 'User/getUserInfo')->option(['real_name' => '获取收银台用户信息']);
//收银台获取当前用户信息

@ -2,85 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9136f4ea-e023-4289-81c0-228af5be230a" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/../../app/controller/api/v2/activity/UserCode.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/api/v2/activity/UserCode.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../app/controller/cashier/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/cashier/User.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../route/cashier.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../route/cashier.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/cashier.html" beforeDir="false" afterPath="$PROJECT_DIR$/dist/cashier.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/app.242cd2cf.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-0b64a2dc.ad6c4b47.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-13476cb6.c15577e6.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-17ae4534.c64139cd.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-2ad197b0.8df2e5d4.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-2b2f6a3a.7dc33ce5.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-2f486618.6e832b56.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-3c7f2e58.c7d4006b.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-5b908a3e.ecb15a51.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-66ba43e4.a5f9fdf4.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-78b16666.d1c088fe.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-7fe120ce.80485dad.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-85904156.fc01623f.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-b3f3bf20.689c27ac.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-bcc1832c.57b6753a.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-d4d0a456.4dfb22bd.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-de592f34.5106a9e1.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-e1b56708.4727bd0a.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-e3f056ce.e65161ae.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-ef7d850e.128b3135.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-f0918996.170a02e4.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-f3dc4144.69211c93.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-f3e92b68.60447afd.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/css/chunk-vendors.dca943f0.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/header-theme-dark.1606ed02.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/header-theme-primary.babcd2f1.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/iconfont.ce37fd6b.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/iconfont.e48d5fe1.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/iconfontYI.2ade83ca.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/ionicons.a2c4a261.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/nav-theme-dark.da07f9c2.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/img/nav-theme-light.262af236.svg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/app.465a728f.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-07a31743.52d52dec.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-0b64a2dc.0b53143f.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-13476cb6.c4c3c481.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-17ae4534.55e1219c.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-28e3093e.76c0d546.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-2ad197b0.0d0113c5.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-2b2f6a3a.de0d2d25.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-2f486618.df0874b4.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-3c7f2e58.f074d57c.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-4e010672.45b40aaf.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-5b908a3e.522daca4.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-66ba43e4.70ff9375.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-78b16666.8acccede.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-7fe120ce.64318954.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-85904156.59074a1a.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-b3f3bf20.f8382e0f.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-bcc1832c.56dd1123.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-d4d0a456.b7e3af15.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-de592f34.e4e6003d.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-e1b56708.a0bdbb81.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-e3f056ce.b9648230.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-ef7d850e.cf561d04.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-f0918996.57f6d4f0.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-f3dc4144.ba498c73.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-f3e92b68.c50ad302.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/dist/view_cashier/js/chunk-vendors.e2d7a9e3.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/06f4b29b34ae3e20e37a4d8a91715386.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/06f4b29b34ae3e20e37a4d8a91715386.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/4f16026008c7a2a9a3985e76c8a03786.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/4f16026008c7a2a9a3985e76c8a03786.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/5fb4a9e4c29be8171ed8eb2a5f43aad2.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/5fb4a9e4c29be8171ed8eb2a5f43aad2.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/ba97c14a4e15670aec4561e32a34074f.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/ba97c14a4e15670aec4561e32a34074f.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/d97fc99472a4dff49df1beb4d8aae893.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/d97fc99472a4dff49df1beb4d8aae893.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/ec9c7c0dbb8d5e44d40f310d202cf02e.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/ec9c7c0dbb8d5e44d40f310d202cf02e.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/06ab8853544f04f5c16324d3ba2816f2.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/06ab8853544f04f5c16324d3ba2816f2.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/2a91f196f52a49c0129aa5bcd5322125.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/2a91f196f52a49c0129aa5bcd5322125.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/3d73d58b2f4929155cb97a007f60d052.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/3d73d58b2f4929155cb97a007f60d052.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/43b08a3f392d79437e4e29a2bfc7d0af.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/43b08a3f392d79437e4e29a2bfc7d0af.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/503f8f4597d9c50266cf666800cad48a.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/503f8f4597d9c50266cf666800cad48a.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/63aa62a005f73d2a2ec08d30ca138444.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/63aa62a005f73d2a2ec08d30ca138444.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/79dad8b7c55545c51550fd3eafe161e5.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/79dad8b7c55545c51550fd3eafe161e5.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/829a59de171dbc7a62949d4c89649a59.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/829a59de171dbc7a62949d4c89649a59.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/87f2c642b734fc5cdd7d35c2f91003dd.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/87f2c642b734fc5cdd7d35c2f91003dd.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/ab08a72f3efeded0ed57c52db1856b54.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/ab08a72f3efeded0ed57c52db1856b54.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/e46701c31d0755295f56ee1f47538002.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/e46701c31d0755295f56ee1f47538002.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/api/order.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/order.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/cunqu/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/cunqu/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/table/index2.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/table/index2.vue" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -126,7 +54,7 @@
<option name="presentableId" value="Default" />
<updated>1730184114621</updated>
<workItem from="1730184115875" duration="28451000" />
<workItem from="1730423475845" duration="591000" />
<workItem from="1730423475845" duration="1647000" />
</task>
<servers />
</component>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\table\\index2.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\table\\index2.vue","mtime":1730359168134},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046438314},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js","mtime":1729046435335},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index2.vue?vue&type=template&id=aa254df6&scoped=true&\"\nimport script from \"./index2.vue?vue&type=script&lang=js&\"\nexport * from \"./index2.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index2.vue?vue&type=style&index=0&id=aa254df6&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"aa254df6\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\codeeeeee\\\\酒水代码\\\\收银台\\\\cashier\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('aa254df6')) {\n api.createRecord('aa254df6', component.options)\n } else {\n api.reload('aa254df6', component.options)\n }\n module.hot.accept(\"./index2.vue?vue&type=template&id=aa254df6&scoped=true&\", function () {\n api.rerender('aa254df6', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/table/index2.vue\"\nexport default component.exports"]}
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\table\\index2.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\table\\index2.vue","mtime":1730429216730},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046438314},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js","mtime":1729046435335},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index2.vue?vue&type=template&id=aa254df6&scoped=true&\"\nimport script from \"./index2.vue?vue&type=script&lang=js&\"\nexport * from \"./index2.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index2.vue?vue&type=style&index=0&id=aa254df6&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"aa254df6\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\codeeeeee\\\\酒水代码\\\\收银台\\\\cashier\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('aa254df6')) {\n api.createRecord('aa254df6', component.options)\n } else {\n api.reload('aa254df6', component.options)\n }\n module.hot.accept(\"./index2.vue?vue&type=template&id=aa254df6&scoped=true&\", function () {\n api.rerender('aa254df6', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/table/index2.vue\"\nexport default component.exports"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\cunqu\\index.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\cunqu\\index.vue","mtime":1730365612192},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046438314},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js","mtime":1729046435335},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=1c5db70f&scoped=true&\"\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index.vue?vue&type=style&index=0&id=1c5db70f&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"1c5db70f\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\codeeeeee\\\\酒水代码\\\\收银台\\\\cashier\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('1c5db70f')) {\n api.createRecord('1c5db70f', component.options)\n } else {\n api.reload('1c5db70f', component.options)\n }\n module.hot.accept(\"./index.vue?vue&type=template&id=1c5db70f&scoped=true&\", function () {\n api.rerender('1c5db70f', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/cunqu/index.vue\"\nexport default component.exports"]}
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\cunqu\\index.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\cunqu\\index.vue","mtime":1730428256827},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046438314},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\iview-loader\\index.js","mtime":1729046435335},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=1c5db70f&scoped=true&\"\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index.vue?vue&type=style&index=0&id=1c5db70f&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n \"1c5db70f\",\n null\n \n)\n\n/* hot reload */\nif (module.hot) {\n var api = require(\"D:\\\\codeeeeee\\\\酒水代码\\\\收银台\\\\cashier\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n api.install(require('vue'))\n if (api.compatible) {\n module.hot.accept()\n if (!api.isRecorded('1c5db70f')) {\n api.createRecord('1c5db70f', component.options)\n } else {\n api.reload('1c5db70f', component.options)\n }\n module.hot.accept(\"./index.vue?vue&type=template&id=1c5db70f&scoped=true&\", function () {\n api.rerender('1c5db70f', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/cunqu/index.vue\"\nexport default component.exports"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -763,10 +763,16 @@ export function swithUser(data) {
data
});
}
export function changeTable(data) {
return request({
url: `user2/changeTable`,
method: 'post',
data
});
}
/**
* 桌码管理
* @returns
* @returns
*/
export function getCodeList() {
return request({
@ -788,7 +794,7 @@ export function orderWriteForm(id, params) {
/**
* 桌码订单列表
* @returns
* @returns
*/
export function getTableList(params) {
return request({
@ -800,8 +806,8 @@ export function getTableList(params) {
/**
* 获取全部点餐用户信息
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export function getTableUidAll(params) {
return request({
@ -813,8 +819,8 @@ export function getTableUidAll(params) {
/**
* 购物车处理
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export function getCartList(params) {
return request({
@ -826,8 +832,8 @@ export function getCartList(params) {
/**
* 取消桌码
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export function cancelTable(params) {
return request({
@ -839,8 +845,8 @@ export function cancelTable(params) {
/**
* 收银台购物车数量操作
* @param {*} data
* @returns
* @param {*} data
* @returns
*/
export function editTableCart(data) {
return request({
@ -852,8 +858,8 @@ export function editTableCart(data) {
/**
* 手动打单
* @param {*} params
* @returns
* @param {*} params
* @returns
*/
export function staffPlace(params) {
return request({
@ -865,8 +871,8 @@ export function staffPlace(params) {
/**
* 桌码订单购物车信息
* @param {*} oid
* @returns
* @param {*} oid
* @returns
*/
export function getTableOrderInfo(oid) {
return request({
@ -877,8 +883,8 @@ export function getTableOrderInfo(oid) {
/**
* 线下支付
* @param {*} id
* @returns
* @param {*} id
* @returns
*/
export function payOffline(id) {
return request({
@ -889,9 +895,9 @@ export function payOffline(id) {
/**
* 退款
* @param {*} id
* @param {*} data
* @returns
* @param {*} id
* @param {*} data
* @returns
*/
export function orderRefund(id, data) {
return request({
@ -903,9 +909,9 @@ export function orderRefund(id, data) {
/**
* 分单退款
* @param {*} id
* @param {*} data
* @returns
* @param {*} id
* @param {*} data
* @returns
*/
export function openRefund(id, data) {
return request({
@ -913,4 +919,4 @@ export function openRefund(id, data) {
method: 'post',
data
});
}
}

@ -199,7 +199,8 @@
</FormItem>
<FormItem label="取酒数量">
<InputNumber :min="0.01" :max="formItem.num" v-model="formItem.num" controls-outside />
<InputNumber :min="0" v-model="formItem.num" controls-outside @on-change="onchange"/>
<!-- <InputNumber :min="0.01" :max="formItem.num" v-model="formItem.num" controls-outside />-->
</FormItem>
<FormItem label="到期日期">
<Row>

@ -490,6 +490,7 @@ import {
editTableCart,
staffPlace,
swithUser,
changeTable,
cashierCreate,
getTableOrderInfo,
payOffline,
@ -959,6 +960,14 @@ export default {
getSwithUser(data){
swithUser(data).then(res=>{
this.$Message.success(res.msg);
}).catch(err=>{
this.$Message.error(err.msg);
})
},
getSwithUser2(data){
changeTable(data).then(res=>{
this.$Message.success(res.msg);
console.log(123,res.data.res)
this.modal3 = false;
var currentUrl = window.location.href;
@ -1042,7 +1051,7 @@ export default {
},
onSubmit3() {
if (this.table_number != null) {
this.getSwithUser({
this.getSwithUser2({
table_number: this.table_number,
collage_id: this.table_id,
uid:this.uid,

Loading…
Cancel
Save