main
wangmingchuan321@qq.com 3 months ago
parent 5ec453790f
commit 300bb23606
  1. 1
      app/controller/api/v2/activity/StoreCoupons.php
  2. 57
      app/controller/api/v2/activity/UserCode.php
  3. 11
      app/controller/cashier/Table.php
  4. 174
      app/controller/cashier/User.php
  5. 4
      app/controller/store/table/TableCode.php
  6. 1
      app/services/activity/collage/UserCollageCodeServices.php
  7. 31
      收银台/cashier/.idea/workspace.xml
  8. 2
      收银台/cashier/node_modules/.cache/babel-loader/238ee3067c9e04fa117cab418fe7e5f3.json
  9. 2
      收银台/cashier/node_modules/.cache/babel-loader/82cb89508aa248a83f4d7240821b95ff.json
  10. 2
      收银台/cashier/node_modules/.cache/babel-loader/a09a99d6ccba71867044f4b9aa9886f7.json
  11. 2
      收银台/cashier/node_modules/.cache/babel-loader/c9c9c0042bd00946f11b25891c984dac.json
  12. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/01b59a0614f5f0ff8da06a7f48726ec6cad21ff2.json.gz
  13. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/0912d94b45fabd38f16655f412a1150f6f9c61a0.json.gz
  14. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/0d83ce3dc540f6e31ae6ef47cbd4c41388e0742e.json.gz
  15. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/117f2a12d2cf220c5db3cf8e0e021468a90c5a20.json.gz
  16. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/12a892910c490d311637bed0c204ddc26e956628.json.gz
  17. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/19ec3981a846263ec4127ad5ce129d0214b09006.json.gz
  18. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/20bea8d209e875c30538f1dcec8fd9ce8444dbfc.json.gz
  19. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/21aa47ffe426c7b6204f53653c978fb296e4fd62.json.gz
  20. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/258ca21b098c53ce69a925933cd11c8f1d429536.json.gz
  21. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/2b0fd4cd96e47ec39d7e0fe2de6f8764487d9d0d.json.gz
  22. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/2bb31441cb1c6f25626d8a51db7a21b1d330adbc.json.gz
  23. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/2deafe57240ea321da5e9eb900d47ed86ecd17eb.json.gz
  24. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/32b03b3e80b1b46b9a8f133d38a3e7261c908b8a.json.gz
  25. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/35b9c46bbb68c73226668b0105e01f223a9f8b15.json.gz
  26. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/37593909ae9f19da8a2e72f91c703297db015ceb.json.gz
  27. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/37aadfad2f04f4fc0cdd43689d608f5db2d14de9.json.gz
  28. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/39ecc52cccaf5f499ef0987ce5c0a29cca5cfa59.json.gz
  29. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/3b3d1d596611f3119d0404ecbac8cff5c73776ed.json.gz
  30. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/441ea809e428bef5e2fde17ed23de0129ed27876.json.gz
  31. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/446dcacf34b944d824b754bd83978311a86f0861.json.gz
  32. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/4c8bf238f92fc31e5ed7524ba1f6e7617655fa6f.json.gz
  33. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/4dd62bffbcf4beaa882947b3512c6ee3bffde06a.json.gz
  34. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/51a4d63539ddf29f006b9d2ad83c282d9e4e2924.json.gz
  35. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/53a6b6bb2821f234fa3ca0589439e0b6c6320675.json.gz
  36. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/586158f7e8e19834410ef1aa5243ba3fe1f0c12f.json.gz
  37. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/5a974362b4bae25b2273a337304d4443a3aa233f.json.gz
  38. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/5f98f8887742242442b7ff00045de6833d680567.json.gz
  39. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/614d53b7a0774908dcf112c783e5edcaf82c398c.json.gz
  40. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/64155304f368ed4180483eb5ab0ded4cc02913b1.json.gz
  41. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/773120719e7e3af632c722ca7784943de03c15a7.json.gz
  42. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/789d406273cf28b1824ee31c4b2c1890557b6056.json.gz
  43. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/7a9020b8d3d44916b8bedd100b277f070cf96e32.json.gz
  44. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/7b26415e4ec77d34de968b6f6608d701e52deb9e.json.gz
  45. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/7b313cacff07e9f9e3f4d8172f31c32177f5db01.json.gz
  46. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/7e4d96c3ac30c89a47107834dc54ee8beb0cf039.json.gz
  47. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/7f8be0ad574368f1df889bf2b9063a8633fc40ec.json.gz
  48. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/801898710b13eb081393c41255f6000a6c63921d.json.gz
  49. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/86d317d5b39c8828e6125c4e909e23ec3702f4b9.json.gz
  50. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/87137f4627ec73ffbb830c395162c4deb6b3b156.json.gz
  51. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/87a99a5e9ff83aa71150d088f91b02d91b7a45ea.json.gz
  52. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/87f7424576c5122d2eb419d47af306b3884563b9.json.gz
  53. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/8e6866c01ca3bc694bef59d33fa702158e09b85f.json.gz
  54. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/93bd5978097d12ec7ef2c984a8c531f1e637feec.json.gz
  55. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/9452aac2f828f590f8c80c92b5b68ddfc849b981.json.gz
  56. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/956c070ef006fa865e5fd6ca604f568a23aedd7b.json.gz
  57. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/96871b9a9304101f5a610419e65d03124c1e842c.json.gz
  58. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/9a02f2a34aff17fbbeb551a7222a1c0d11d1cd79.json.gz
  59. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/9ced88280feeea1471328da4eae667affa566294.json.gz
  60. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/9e8cad86dc92c97886cd0057777b3d705d1ea22d.json.gz
  61. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/a134825b5415a8fecced78a7499303e8e2324ce2.json.gz
  62. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/a17cddaafbe38b00a6d1b343805a144ee82f7c9c.json.gz
  63. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/a1d16e270922488d521b645565877734a50a2090.json.gz
  64. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/a80777c8235c57f425b525120ecd823f40df43c9.json.gz
  65. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/ab64b42eaeba7377d84e9373f5f7da4568aef59d.json.gz
  66. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/ab73367136b009eab9b4beae3ab4830fd9f805a6.json.gz
  67. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/aed60f2cab9541bfcee5aa3025369e82d7adcc15.json.gz
  68. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/b06cba1c502f0a3373eccc875a32d6da42ed7997.json.gz
  69. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/b8fbf58b6a9b4b6477fae781c8e4f9037e4dcca8.json.gz
  70. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/bc57e633a08508d832189fbd6565510ac1ae8435.json.gz
  71. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/bf25cf0719f05ae618eb23a72a1c4db5f26dc6e9.json.gz
  72. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/bf5477bfd247bff467c7cb930b501d958f68fad8.json.gz
  73. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/bf6c5d4e8f1f201711bf9859edc03f45d479e08f.json.gz
  74. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/c22100043a53b441632e0f4d0b5fff5eff36b603.json.gz
  75. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/c64e7a18b4c0c7a1234c8fe51d49a5d8ca6af2c2.json.gz
  76. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/c80ebf925521190ab593cad2dd21ae1a1c7d1874.json.gz
  77. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/cbe54e2fc636ecea6a897e2a33e9490b46862c33.json.gz
  78. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/cf8fb6482a36ee3a011c5f1f72fe3af6e9a479db.json.gz
  79. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/d0a3fb4ff3d9ce880740b3e0de8d2e59f85d743e.json.gz
  80. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/d0f214559490e657829e8aa798e671765c4b0c6c.json.gz
  81. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/da106fa4d3ec7eb8392a439c056a4aa83072f2d1.json.gz
  82. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/df17f725ccb27232da4516a4b36fff303df43ef0.json.gz
  83. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/e50767384d06580105746b9d9a14468cb99c9801.json.gz
  84. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/eadc92b4a1da5c9ceced7de19574e961913368fd.json.gz
  85. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/f374bda05d1bfa853e87e5a8d2e46b3ebd782494.json.gz
  86. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/f37d64ddac658eefeeb67f258b12147bd068ba7b.json.gz
  87. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/f64a9a7fef997d12ea43e05c6806dc5690992f48.json.gz
  88. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/f8fa8aa2bd452e68f766bf04f66f50266555ed5d.json.gz
  89. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/fd943f2e9eabdde135f2c2b0b70cc4f903f93be4.json.gz
  90. BIN
      收银台/cashier/node_modules/.cache/eslint-loader/ffae362274362c0246bbf9d959140844c20b6321.json.gz
  91. 2
      收银台/cashier/node_modules/.cache/vue-loader/048542fc4eb96b4cc8b0a72c29bb3ffd.json
  92. 2
      收银台/cashier/node_modules/.cache/vue-loader/19bb3468e4b84d574d14b60ed21a789a.json
  93. 2
      收银台/cashier/node_modules/.cache/vue-loader/428df7aebde06bb6bedd55e5fa3b036c.json
  94. 2
      收银台/cashier/node_modules/.cache/vue-loader/45c040fe82ba7680128b54dd3e49b35b.json
  95. 2
      收银台/cashier/node_modules/.cache/vue-loader/4634d0f8f8c16e839435096a0b05b73d.json
  96. 2
      收银台/cashier/node_modules/.cache/vue-loader/52f6993118589c00520faae1966f0225.json
  97. 2
      收银台/cashier/node_modules/.cache/vue-loader/786f6eafe38fa68c0c16230c16cf7a5a.json
  98. 2
      收银台/cashier/node_modules/.cache/vue-loader/89918a061a6b9b01db92b3711d737496.json
  99. 2
      收银台/cashier/node_modules/.cache/vue-loader/9a8fd75e0ee997b8629bf33b2c6349a2.json
  100. 2
      收银台/cashier/node_modules/.cache/vue-loader/aff7f3834458d5ab36f867d456857ca6.json
  101. Some files were not shown because too many files have changed in this diff Show More

@ -173,7 +173,6 @@ class StoreCoupons extends AuthController
//改桌子状态
Db::name('table_qrcode')->where('id',$post['table_id'])->update(['is_use'=>2]);
return app('json')->success('预定成功');
}
//存酒记录

@ -19,6 +19,7 @@ use app\services\store\SystemStoreServices;
use app\services\other\CategoryServices;
use app\services\system\config\SystemConfigServices;
use think\facade\Db;
/**
*桌码
* Class UserCode
@ -34,7 +35,7 @@ class UserCode
}
/**
* 门店桌码配置
* 门店桌码配置
* @param $store_id
* @return \think\Response
*/
@ -47,8 +48,9 @@ class UserCode
$data = $configServices->getConfigAll($configName, 1, (int)$store_id);
return app('json')->successful($data);
}
//获取桌码类型
public function getTableCodeClassify($store_id,CategoryServices $services)
public function getTableCodeClassify($store_id, CategoryServices $services)
{
/** @var TableQrcodeServices $qrcodeService */
$qrcodeService = app()->make(TableQrcodeServices::class);
@ -60,16 +62,17 @@ class UserCode
}
return app('json')->successful($list);
}
//获取房台号
public function getTableCodelist($store_id, $cate_id)
{
/** @var TableQrcodeServices $qrcodeService */
$qrcodeService = app()->make(TableQrcodeServices::class);
$list = $qrcodeService->getlist(['cate_id' => $cate_id, 'store_id' => $store_id],0,10000,[]);
$list = $qrcodeService->getlist(['cate_id' => $cate_id, 'store_id' => $store_id], 0, 10000, []);
foreach ($list as $key => $item) {
//查询是否已经预定
$yuding = Db::table('eb_table_yuding')->where(['table_id' => $item['id'], 'store_id' => $store_id,'is_del'=>0])->select()->toArray();
if(!empty($yuding)) unset($list[$key]);
$yuding = Db::table('eb_table_yuding')->where(['table_id' => $item['id'], 'store_id' => $store_id, 'is_del' => 0])->select()->toArray();
if (!empty($yuding)) unset($list[$key]);
}
return app('json')->successful($list);
}
@ -90,8 +93,9 @@ class UserCode
if (!$data['store_id'] || !$data['qrcode_id']) return app('json')->fail('参数有误!');
}
/**
* 记录桌码
* 记录桌码
* @param Request $request
* @return \think\Response
*/
@ -163,16 +167,39 @@ class UserCode
}
//wmc换桌
public function userChangingTables2($tableId,$y_tableId)
public function userChangingTables2($y_tableId, $uid, $store_id, $qrcode_id)
{
if (!$tableId || !$y_tableId) return app('json')->fail('参数有误!');
$res = $this->services->userChangingTables((int)$tableId, (int)$y_tableId);
if ($res) {
return app('json')->successful('ok');
} else {
return app('json')->fail('换桌失败');
//要换的桌子
// $qrcode_id = 43;
$number = 1;
//原来的coll的id
$qrcodeService = app()->make(TableQrcodeServices::class);
$is_using = $qrcodeService->value(['id' => $qrcode_id], 'is_using');
if (!$is_using) return app('json')->fail('桌码未启用');
$res = $this->services->setUserTableCode($uid, $store_id, $qrcode_id, $number);
$qrcodeService->update($qrcode_id, ['is_use' => 1, 'eat_number' => $number, 'order_time' => time()]);
$res2 = $this->services->userChangingTables((int)$res->id, (int)$y_tableId);
if ($res2) {
$res3 = $this->userPlaceOrder2($res->id, $store_id);
if ($res3 == 1) {
return $res->id;
}
}
return 0;
}
public function userPlaceOrder2($tableId, $storeId)
{
if (!$tableId || !$storeId) return app('json')->fail('参数有误!');
$table = $this->services->collageStatus($tableId);
if ($table['status'] == -1) return app('json')->fail('桌码已取消');
if ($table['status'] >= 2) return app('json')->fail('桌码已结算!');
$this->services->userTablePlaceOrder((int)$tableId, (int)$storeId);
return 1;
}
/**
* 获取桌码记录
* @param Request $request
@ -260,7 +287,7 @@ class UserCode
//1=>合并结账 2=>单独结账
$store_checkout_method = store_config((int)$store_id, 'store_checkout_method', 1);
$whereUid = ['uid' => $uid];
$where = ['collate_code_id' => $tableId, 'store_id' => $store_id, 'status'=> 1, 'is_settle' => 0];
$where = ['collate_code_id' => $tableId, 'store_id' => $store_id, 'status' => 1, 'is_settle' => 0];
if ($store_checkout_method == 2) $where = $where + $whereUid;
/** @var UserCollagePartakeServices $partakeService */
$partakeService = app()->make(UserCollagePartakeServices::class);
@ -283,7 +310,7 @@ class UserCode
//1=>合并结账 2=>单独结账
$store_checkout_method = store_config((int)$store_id, 'store_checkout_method', 1);
$whereUid = ['uid' => $uid];
$where = ['collate_code_id' => $tableId, 'store_id' => $store_id, 'status'=> 1, 'is_settle' => 0];
$where = ['collate_code_id' => $tableId, 'store_id' => $store_id, 'status' => 1, 'is_settle' => 0];
if ($store_checkout_method == 2) $where = $where + $whereUid;
/** @var UserCollagePartakeServices $partakeService */
$partakeService = app()->make(UserCollagePartakeServices::class);

@ -45,13 +45,13 @@ class Table extends AuthController
$where = ['type' => 1, 'relation_id' => $this->storeId, 'group' => 6, 'is_show' => 1];
$list = $services->getTableCodeCateList($where, ['id', 'relation_id', 'name', 'group'], ['tableQrcode']);
foreach ($list as &$v) {
foreach ($v['tableQrcode'] as &$v2) {
if ($v2['is_use'] == 2) {
$yuyue = Db::name('table_yuding')->where('table_id', $v2['id'])->order('id desc')->find();
$v2['yingxiaojingli'] = db::name('user')->where('uid', $yuyue['admin_id'])->value('nickname') ?? '无';
$v2['yuyueshijian'] = $yuyue['yuding_date'] . ' ' . $yuyue['come_date'];
if(!empty($yuyue)){
$v2['yingxiaojingli'] = db::name('user')->where('uid', $yuyue['admin_id'])->value('nickname') ?? '无';
$v2['yuyueshijian'] = $yuyue['yuding_date'] . ' ' . $yuyue['come_date'];
}
}
}
@ -156,12 +156,14 @@ class Table extends AuthController
{
$where = $request->getMore([
['table_id', 0],
['tiaozhuan_table_id', 0]
]);
if (!$where['table_id']) return $this->fail('参数有误!');
if (!empty($request->getMore([
['tiaozhuan_table_id', 0],
])['tiaozhuan_table_id'])) {
//查询这个桌号目前最近的正在用餐的 id
$a = $request->getMore([
['tiaozhuan_table_id', 0],
@ -179,7 +181,6 @@ class Table extends AuthController
$store_id = (int)$this->storeId;
$uids = $services->tableCodeUserAll($where, $store_id);
//桌台信息
$eb_user_collage_code = db::name('user_collage_code')->where('id', $where['table_id'])->value('qrcode_id');
$table = db::name('table_qrcode')->where('id', $eb_user_collage_code)->find();

@ -14,6 +14,7 @@ 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,
@ -39,7 +40,9 @@ 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;
/**
* 收银台用户控制器
*/
@ -65,6 +68,7 @@ class User extends AuthController
'longitude' => '',
'latitude' => ''
];
/**
* 修改收银员信息
* @param Request $request
@ -240,23 +244,23 @@ class User extends AuthController
return $this->fail('缺少参数');
}
$field = ['uid', 'avatar', 'phone', 'nickname', 'now_money', 'integral', 'level', 'is_money_level', 'is_ever_level', 'overdue_time'];
$userInfo = [];
$userInfo = [];
if ($uid) {
$userInfo = $services->getUserInfo($uid, $field);
} elseif ($code) {
$userInfo = $services->get(['uniqid' => $code], $field);
}
if ($userInfo) {
$userInfo = $userInfo->toArray();
$userInfo['vip_name'] = '';
if ($userInfo['level']) {
/** @var SystemUserLevelServices $levelServices */
$levelServices = app()->make(SystemUserLevelServices::class);
$levelInfo = $levelServices->getOne(['id' => $userInfo['level']], 'id,name');
$userInfo['vip_name'] = $levelInfo['name'] ?? '';
}
$userInfo['overdue_time'] = date('Y-m-d H:i:s', $userInfo['overdue_time']);
}
if ($userInfo) {
$userInfo = $userInfo->toArray();
$userInfo['vip_name'] = '';
if ($userInfo['level']) {
/** @var SystemUserLevelServices $levelServices */
$levelServices = app()->make(SystemUserLevelServices::class);
$levelInfo = $levelServices->getOne(['id' => $userInfo['level']], 'id,name');
$userInfo['vip_name'] = $levelInfo['name'] ?? '';
}
$userInfo['overdue_time'] = date('Y-m-d H:i:s', $userInfo['overdue_time']);
}
$cart = $request->post('cart', []);
if ($cart) {
@ -290,6 +294,43 @@ class User extends AuthController
return $this->success($userServices->oneUserInfo((int)$uid, $type));
}
//台桌预定
public function tableYuDing($wtable_id, $wremark, $wphone, $wyuding_date,$come_date,$store_id)
{
$wyuding_date = new DateTimeImmutable($wyuding_date);
$wyuding_date = $wyuding_date->format('Y-m-d');
$post['table_id'] = $wtable_id;
$post['phone'] = $wphone;
$post['yuding_date'] = $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
@ -297,21 +338,58 @@ class User extends AuthController
*/
public function swithUser(Request $request)
{
$table_number = $request->post('table_number', 0);
if(!empty($table_number)){
//wmc换桌
// 创建UserCode的实例
//wmc api
//预定
$wtable_id = $request->post('wtable_id', 0);
if (!empty($wtable_id)) {
$ttttt = Db::name('table_qrcode')->where('id',$wtable_id)->where('is_use',0)->find();
if(!$ttttt){
return $this->fail('预定失败,台桌异常');
}
$wtable_id = $ttttt['id'];
$wremark = $request->post('wremark', 0);
$wphone = $request->post('wphone', 0);
$wyuding_date = $request->post('wyuding_date', 0);
$come_date = $request->post('come_date', 0);
$store_id = $request->post('store_id', 1);
$h = $this->userCode->userChangingTables2(89,87);
var_dump($h);die;
if (empty($wremark) || empty($wphone) || empty($wyuding_date) || empty($come_date)) {
return $this->fail('请填写完整参数');
} else {
$res = $this->tableYuDing($wtable_id, $wremark, $wphone, $wyuding_date,$come_date,$store_id);
if ($res) {
return $this->success('预定成功');
}
}
return $this->fail('预定失败');
}
$table_number = $request->post('table_number', 0);
$uid = $request->post('uid', 0);
$touristUid = $request->post('tourist_uid', 0);
$cashierId = $request->post('cashier_id', 0);
$changePrice = $request->post('change_price', 0);
$changCartRemove = $request->post('chang_cart_remove', 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('换桌失败');
}
if (!$uid && !$touristUid && !$cashierId && !$changePrice && !$changCartRemove) {
return $this->fail('缺少参数');
@ -453,9 +531,9 @@ class User extends AuthController
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
*/
public function payMember(Request $request,\app\services\user\UserServices $services)
public function payMember(Request $request, \app\services\user\UserServices $services)
{
[$uid, $price, $memberId, $payType, $authCode,$libao_id,$libao_products] = $request->postMore([
[$uid, $price, $memberId, $payType, $authCode, $libao_id, $libao_products] = $request->postMore([
['uid', 0],
['price', 0],
['merber_id', 0],
@ -501,11 +579,11 @@ class User extends AuthController
}
}
$cartIds = [];
$cartNum = 0;
$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;
$cartIds[] = $cartId;
}
$cartId = implode(',', $cartIds);
@ -513,35 +591,35 @@ class User extends AuthController
$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,
'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']);
$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);
$re = $OtherOrderServices->payMember($uid, (int)$memberId, (float)$price, (int)$payType, 'store', $this->cashierInfo, $authCode, $order);
if ($re) {
$msg = $re['msg'];
unset($re['msg']);
@ -549,6 +627,7 @@ class User extends AuthController
}
return $this->fail('充值失败');
}
/**
* 订单创建
* @param $key
@ -705,9 +784,10 @@ class User extends AuthController
}
return app('json')->fail($msg ?: '订单生成失败');
}
$orderId = $order['order_id'];
return $orderId;
$orderId = $order['order_id'];
return $orderId;
}
/**显示指定的资源
* @param $id
* @param \app\services\user\UserServices $services

@ -341,13 +341,13 @@ class TableCode extends AuthController
{
$id = input('id');
$info = Db::name('table_yuding')->where('id', $id)->find();
$table = Db::name('table_qrcode')->where('id', $info['table_id'])->find();
if ($table['is_use'] != 2) {
return app('json')->success('操作失败');
}
Db::name('table_qrcode')->where('id', $id)->update(['is_use' => 0]);
Db::name('table_qrcode')->where('id', $info['table_id'])->update(['is_use' => 0]);
Db::name('table_yuding')->where('id', $id)->update(['is_del' => 1]);
return app('json')->success('操作成功');

@ -233,6 +233,7 @@ class UserCollageCodeServices extends BaseServices
*/
public function userChangingTables(int $tableId, int $y_tableId)
{
/** @var UserCollagePartakeServices $partakeService */
$partakeService = app()->make(UserCollagePartakeServices::class);
$res = $partakeService->update(['collate_code_id' => $y_tableId], ['collate_code_id' => $tableId]);

@ -2,20 +2,33 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9136f4ea-e023-4289-81c0-228af5be230a" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/../../app/controller/admin/v1/other/export/ExportExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/admin/v1/other/export/ExportExcel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../app/controller/api/v2/activity/StoreCoupons.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/api/v2/activity/StoreCoupons.php" afterDir="false" />
<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/Table.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/cashier/Table.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$/../../app/controller/store/table/TableCode.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/store/table/TableCode.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../app/services/activity/collage/UserCollageCodeServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/services/activity/collage/UserCollageCodeServices.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../route/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../route/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/admin_dHBzn/src/pages/finance/financialRecords/recharge/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/admin_dHBzn/src/pages/finance/financialRecords/recharge/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/api/supplier.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/api/supplier.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/finance/financialRecords/recharge/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/finance/financialRecords/recharge/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/product/productList/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/product/productList/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/supplier/capital/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/supplier/capital/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/user/grade/record/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../后台管理/admin_dHBzn/src/pages/user/grade/record/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/238ee3067c9e04fa117cab418fe7e5f3.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/238ee3067c9e04fa117cab418fe7e5f3.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/82cb89508aa248a83f4d7240821b95ff.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/82cb89508aa248a83f4d7240821b95ff.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/a09a99d6ccba71867044f4b9aa9886f7.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/a09a99d6ccba71867044f4b9aa9886f7.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/c9c9c0042bd00946f11b25891c984dac.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/c9c9c0042bd00946f11b25891c984dac.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/048542fc4eb96b4cc8b0a72c29bb3ffd.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/048542fc4eb96b4cc8b0a72c29bb3ffd.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/19bb3468e4b84d574d14b60ed21a789a.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/19bb3468e4b84d574d14b60ed21a789a.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/428df7aebde06bb6bedd55e5fa3b036c.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/428df7aebde06bb6bedd55e5fa3b036c.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/45c040fe82ba7680128b54dd3e49b35b.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/45c040fe82ba7680128b54dd3e49b35b.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/4634d0f8f8c16e839435096a0b05b73d.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/4634d0f8f8c16e839435096a0b05b73d.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/52f6993118589c00520faae1966f0225.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/52f6993118589c00520faae1966f0225.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/786f6eafe38fa68c0c16230c16cf7a5a.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/786f6eafe38fa68c0c16230c16cf7a5a.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/89918a061a6b9b01db92b3711d737496.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/89918a061a6b9b01db92b3711d737496.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/9a8fd75e0ee997b8629bf33b2c6349a2.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/9a8fd75e0ee997b8629bf33b2c6349a2.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/aff7f3834458d5ab36f867d456857ca6.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/aff7f3834458d5ab36f867d456857ca6.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/b5fcc5f7b74d72eb66af5b88f5060298.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/b5fcc5f7b74d72eb66af5b88f5060298.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/c0b30b29de96ef1378bfbfafbd153787.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/c0b30b29de96ef1378bfbfafbd153787.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/c4fd8c8f39a675c9d92dc2de50622e76.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/c4fd8c8f39a675c9d92dc2de50622e76.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/cea8e4e24393f8ec29d34dfef1941277.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/cea8e4e24393f8ec29d34dfef1941277.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/table/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/table/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" />
@ -54,7 +67,7 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1730184114621</updated>
<workItem from="1730184115875" duration="14115000" />
<workItem from="1730184115875" duration="26813000" />
</task>
<servers />
</component>

@ -1 +1 @@
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\babel-loader\\lib\\index.js!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\router\\modules\\cashier.js","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\router\\modules\\cashier.js","mtime":1730185590443},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\babel-loader\\lib\\index.js","mtime":1729046433231},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["// +----------------------------------------------------------------------\n// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]\n// +----------------------------------------------------------------------\n// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.\n// +----------------------------------------------------------------------\n// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权\n// +----------------------------------------------------------------------\n// | Author: CRMEB Team <admin@crmeb.com>\n// +----------------------------------------------------------------------\nimport BasicLayout from '@/layouts/basic-layout';\nimport Setting from '@/setting';\nvar meta = {\n auth: true\n};\nvar pre = 'home_';\nexport default {\n path: Setting.roterPre,\n name: 'home',\n header: 'home',\n redirect: {\n name: \"\".concat(pre, \"index\")\n },\n meta: meta,\n component: BasicLayout,\n children: [{\n path: 'cashier/index',\n name: \"\".concat(pre, \"index\"),\n meta: {\n auth: ['cashier-cashier-index'],\n title: '收银'\n },\n component: function component() {\n return import('@/pages/cashier/index');\n }\n }, {\n path: 'hang/index',\n name: \"\".concat(pre, \"hang\"),\n meta: {\n auth: ['cashier-hang-index'],\n title: '挂单'\n },\n component: function component() {\n return import('@/pages/hang/index');\n }\n }, {\n path: 'hang/index2',\n name: \"\".concat(pre, \"hang\"),\n meta: {\n auth: ['cashier-hang-index'],\n title: '挂单'\n },\n component: function component() {\n return import('@/pages/hang/index2');\n }\n }, {\n path: 'order/index',\n name: \"\".concat(pre, \"order\"),\n meta: {\n auth: ['cashier-order-index'],\n title: '订单'\n },\n component: function component() {\n return import('@/pages/order/index');\n }\n }, {\n path: 'verify/index',\n name: \"\".concat(pre, \"verify\"),\n meta: {\n auth: ['cashier-verify-index'],\n title: '核销'\n },\n component: function component() {\n return import('@/pages/verify/index');\n }\n }, {\n path: 'refund/index',\n name: \"\".concat(pre, \"refund\"),\n meta: {\n auth: ['cashier-refund-index'],\n title: '退款'\n },\n component: function component() {\n return import('@/pages/refund/index');\n }\n }, {\n path: 'recharge/index',\n name: \"\".concat(pre, \"recharge\"),\n meta: {\n auth: ['cashier-recharge-index'],\n title: '用户'\n },\n component: function component() {\n return import('@/pages/recharge/index');\n }\n }, {\n path: 'cunqu/index',\n name: \"\".concat(pre, \"recharge\"),\n meta: {\n auth: ['cashier-cunqu-index'],\n title: '用户'\n },\n component: function component() {\n return import('@/pages/cunqu/index');\n }\n }, {\n path: 'table/index',\n name: \"\".concat(pre, \"table\"),\n meta: {\n auth: ['cashier-table-index'],\n title: '桌码'\n },\n component: function component() {\n return import('@/pages/table/index');\n }\n }]\n};",null]}
{"remainingRequest":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\babel-loader\\lib\\index.js!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\router\\modules\\cashier.js","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\router\\modules\\cashier.js","mtime":1730186166403},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046433412},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\babel-loader\\lib\\index.js","mtime":1729046433231},{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\node_modules\\eslint-loader\\index.js","mtime":1729046434667}],"contextDependencies":[],"result":["// +----------------------------------------------------------------------\n// | CRMEB [ CRMEB赋能开发者,助力企业发展 ]\n// +----------------------------------------------------------------------\n// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.\n// +----------------------------------------------------------------------\n// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权\n// +----------------------------------------------------------------------\n// | Author: CRMEB Team <admin@crmeb.com>\n// +----------------------------------------------------------------------\nimport BasicLayout from '@/layouts/basic-layout';\nimport Setting from '@/setting';\nvar meta = {\n auth: true\n};\nvar pre = 'home_';\nexport default {\n path: Setting.roterPre,\n name: 'home',\n header: 'home',\n redirect: {\n name: \"\".concat(pre, \"index\")\n },\n meta: meta,\n component: BasicLayout,\n children: [{\n path: 'cashier/index',\n name: \"\".concat(pre, \"index\"),\n meta: {\n auth: ['cashier-cashier-index'],\n title: '收银'\n },\n component: function component() {\n return import('@/pages/cashier/index');\n }\n }, {\n path: 'hang/index',\n name: \"\".concat(pre, \"hang\"),\n meta: {\n auth: ['cashier-hang-index'],\n title: '挂单'\n },\n component: function component() {\n return import('@/pages/hang/index');\n }\n }, {\n path: 'order/index',\n name: \"\".concat(pre, \"order\"),\n meta: {\n auth: ['cashier-order-index'],\n title: '订单'\n },\n component: function component() {\n return import('@/pages/order/index');\n }\n }, {\n path: 'verify/index',\n name: \"\".concat(pre, \"verify\"),\n meta: {\n auth: ['cashier-verify-index'],\n title: '核销'\n },\n component: function component() {\n return import('@/pages/verify/index');\n }\n }, {\n path: 'refund/index',\n name: \"\".concat(pre, \"refund\"),\n meta: {\n auth: ['cashier-refund-index'],\n title: '退款'\n },\n component: function component() {\n return import('@/pages/refund/index');\n }\n }, {\n path: 'recharge/index',\n name: \"\".concat(pre, \"recharge\"),\n meta: {\n auth: ['cashier-recharge-index'],\n title: '用户'\n },\n component: function component() {\n return import('@/pages/recharge/index');\n }\n }, {\n path: 'cunqu/index',\n name: \"\".concat(pre, \"recharge\"),\n meta: {\n auth: ['cashier-cunqu-index'],\n title: '用户'\n },\n component: function component() {\n return import('@/pages/cunqu/index');\n }\n }, {\n path: 'table/index',\n name: \"\".concat(pre, \"table\"),\n meta: {\n auth: ['cashier-table-index'],\n title: '桌码'\n },\n component: function component() {\n return import('@/pages/table/index');\n }\n }, {\n path: 'table/index2',\n name: \"\".concat(pre, \"table\"),\n meta: {\n auth: ['cashier-table-index'],\n title: '桌码'\n },\n component: function component() {\n return import('@/pages/table/index2');\n }\n }]\n};",null]}

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

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":1730278943886},{"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":1730357550313},{"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

@ -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\\hang\\index.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\hang\\index.vue","mtime":1730185913923},{"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=fc8df00e&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=fc8df00e&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 \"fc8df00e\",\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('fc8df00e')) {\n api.createRecord('fc8df00e', component.options)\n } else {\n api.reload('fc8df00e', component.options)\n }\n module.hot.accept(\"./index.vue?vue&type=template&id=fc8df00e&scoped=true&\", function () {\n api.rerender('fc8df00e', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/hang/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\\hang\\index.vue","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\收银台\\cashier\\src\\pages\\hang\\index.vue","mtime":1730185945509},{"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=fc8df00e&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=fc8df00e&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 \"fc8df00e\",\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('fc8df00e')) {\n api.createRecord('fc8df00e', component.options)\n } else {\n api.reload('fc8df00e', component.options)\n }\n module.hot.accept(\"./index.vue?vue&type=template&id=fc8df00e&scoped=true&\", function () {\n api.rerender('fc8df00e', {\n render: render,\n staticRenderFns: staticRenderFns\n })\n })\n }\n}\ncomponent.options.__file = \"src/pages/hang/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

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save