11

app/controller/cashier/Table.php

@@ -23,6 +23,7 @@ use app\services\other\queue\QueueServices;
 use app\services\other\QrcodeServices;
 use app\services\activity\collage\UserCollageCodeServices;
 use app\services\activity\collage\UserCollagePartakeServices;
+use think\facade\Db;
 
 /**
  * 收银台桌码
@@ -43,7 +44,19 @@ 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'];
+                }
+
+            }
+
+        }
         return $this->success($list);
     }
 

view/store/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

view/store/.idea/workspace.xml

@@ -2,32 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="12822943-fe9c-4b5b-8a98-673c8d57ebcd" name="变更" comment="">
-      <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/store/table/TableCode.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/store/table/TableCode.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../route/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../route/api.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../route/store.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../route/store.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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/store.html" beforeDir="false" afterPath="$PROJECT_DIR$/dist/store.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/app.7062477d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-1d77140c.866f4166.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-1e494c6a.923fa002.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-24fdc56c.d448e6a1.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-2d0a4477.a1675ba9.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-3f394228.fc0a2227.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-47104510.4119530d.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-47faecc2.3a6d2465.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-5a9d1c2a.7eca0723.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-6d97ff27.777f936f.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-728cabf6.168190cd.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-769e8726.37838c48.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-81a598ee.9f81a0e2.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-8d95f6c6.ee476524.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/view_store/js/chunk-vendors.f807b2f3.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/4d6f1e4756d37052b2544d3680c336a6.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/4d6f1e4756d37052b2544d3680c336a6.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/646d3af4711e0cd4aebf93200be54d17.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/646d3af4711e0cd4aebf93200be54d17.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/node_modules/.cache/babel-loader/9c631b3689014d208b3589bc3d2af55c.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/9c631b3689014d208b3589bc3d2af55c.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/api/setting.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/api/setting.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/router/modules/set.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router/modules/set.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../收银台/cashier/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../收银台/cashier/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../收银台/cashier/src/pages/table/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../收银台/cashier/src/pages/table/index.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

view/store/dist/view_store/css/chunk-d98b4464.af973a07.css

@@ -0,0 +1 @@
+[data-v-2beb38ea] .ivu-modal-content{border-radius:10px}[data-v-2beb38ea] .ivu-modal-header{border-radius:10px 10px 0 0;background-color:#fff}[data-v-2beb38ea] .ivu-modal-body{padding:30px 25px 29px 0}.ivu-modal-wrap .tag[data-v-2beb38ea]{width:80px;border-color:#ddd;margin:0 10px 10px 0;background:none;text-align:center}.ivu-modal-wrap .input[data-v-2beb38ea]{width:80px;margin:0 10px 10px 0}.ivu-modal-wrap .btn[data-v-2beb38ea]{margin:0 10px 10px 0}.ivu-modal-wrap .footer[data-v-2beb38ea]{text-align:right}.tabBox_img[data-v-2beb38ea]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-2beb38ea]{width:100%;height:100%}

view/store/dist/view_store/js/chunk-2d0a4477.0567e2f0.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0a4477"],{"0683":function(e,t,i){"use strict";i.r(t);var n=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",[i("Card",{staticClass:"ivu-mt",attrs:{bordered:!1,"dis-hover":"",padding:0}},[i("div",{staticClass:"new_card_pd"},[i("Form",{ref:"levelFrom",attrs:{model:e.levelFrom,inline:"","label-width":e.labelWidth,"label-position":e.labelPosition},nativeOn:{submit:function(e){e.preventDefault()}}},[i("FormItem",{attrs:{label:"搜索：","label-for":"keyword"}},[i("Input",{staticClass:"input-add mr14",attrs:{placeholder:"请输入模板名称"},model:{value:e.levelFrom.name,callback:function(t){e.$set(e.levelFrom,"name",t)},expression:"levelFrom.name"}}),i("Button",{staticClass:"btnOn",attrs:{type:"primary"},on:{click:e.userSearchs}},[e._v("查询")])],1)],1)],1)]),i("Card",{staticClass:"ivu-mt",attrs:{bordered:!1,"dis-hover":""}},[i("Button",{attrs:{type:"primary"},on:{click:e.freight}},[e._v("添加运费模板")]),i("Table",{ref:"table",staticClass:"mt25",attrs:{columns:e.columns1,data:e.levelLists,loading:e.loading,"highlight-row":"","no-userFrom-text":"暂无数据","no-filtered-userFrom-text":"暂无筛选结果"},scopedSlots:e._u([{key:"icons",fn:function(e){var t=e.row;return[i("viewer",[i("div",{staticClass:"tabBox_img"},[i("img",{directives:[{name:"lazy",rawName:"v-lazy",value:t.icon,expression:"row.icon"}]})])])]}},{key:"action",fn:function(t){var n=t.row,r=t.index;return[i("a",{on:{click:function(t){return e.edit(n.id)}}},[e._v("修改")]),1!==n.id?i("Divider",{attrs:{type:"vertical"}}):e._e(),1!==n.id?i("a",{on:{click:function(t){return e.del(n,"删除运费模板",r)}}},[e._v("删除")]):e._e()]}}])}),i("div",{staticClass:"acea-row row-right page"},[i("Page",{attrs:{total:e.total,current:e.levelFrom.page,"show-elevator":"","show-total":"","page-size":e.levelFrom.limit},on:{"on-change":e.pageChange}})],1)],1),i("freight-template",{ref:"template"})],1)},r=[],a=i("a34a"),o=i.n(a),l=i("2f62"),s=i("90e7"),c=i("5334");function u(e,t,i,n,r,a,o){try{var l=e[a](o),s=l.value}catch(c){return void i(c)}l.done?t(s):Promise.resolve(s).then(n,r)}function d(e){return function(){var t=this,i=arguments;return new Promise((function(n,r){var a=e.apply(t,i);function o(e){u(a,n,r,o,l,"next",e)}function l(e){u(a,n,r,o,l,"throw",e)}o(void 0)}))}}function m(e,t){var i=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),i.push.apply(i,n)}return i}function p(e){for(var t=1;t<arguments.length;t++){var i=null!=arguments[t]?arguments[t]:{};t%2?m(i,!0).forEach((function(t){h(e,t,i[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(i)):m(i).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(i,t))}))}return e}function h(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}var f={name:"setting_templates",components:{freightTemplate:c["a"]},data:function(){return{grid:{xl:7,lg:7,md:12,sm:24,xs:24},loading:!1,columns1:[{title:"ID",key:"id",width:80},{title:"模板名称",key:"name",minWidth:100},{title:"计费方式",key:"type",minWidth:120},{title:"指定包邮",key:"appoint",minWidth:120},{title:"排序",key:"sort",minWidth:120},{title:"添加时间",key:"add_time",minWidth:120},{title:"操作",slot:"action",fixed:"right",minWidth:120}],levelFrom:{name:"",page:1,limit:15},levelLists:[],total:0,FromData:null}},created:function(){this.getList()},computed:p({},Object(l["e"])("admin/layout",["isMobile"]),{labelWidth:function(){return this.isMobile?void 0:75},labelPosition:function(){return this.isMobile?"top":"right"}}),methods:{freight:function(){this.$refs.template.id=0,this.$refs.template.isTemplate=!0},del:function(e,t,i){var n=this,r={title:t,num:i,url:"setting/shipping_templates/del/".concat(e.id),method:"DELETE",ids:""};this.$modalSure(r).then((function(e){n.$Message.success(e.msg),n.levelLists.splice(i,1),n.levelLists.length||(n.levelFrom.page=1==n.levelFrom.page?1:n.levelFrom.page-1),n.getList()})).catch((function(e){n.$Message.error(e.msg)}))},getList:function(){var e=this;this.loading=!0,Object(s["J"])(this.levelFrom).then(function(){var t=d(o.a.mark((function t(i){var n;return o.a.wrap((function(t){while(1)switch(t.prev=t.next){case 0:n=i.data,e.levelLists=n.data,e.total=n.count,e.loading=!1;case 4:case"end":return t.stop()}}),t)})));return function(e){return t.apply(this,arguments)}}()).catch((function(t){e.loading=!1,e.$Message.error(t.msg)}))},pageChange:function(e){this.levelFrom.page=e,this.getList()},edit:function(e){this.$refs.template.isTemplate=!0,this.$refs.template.editFrom(e)},userSearchs:function(){this.levelFrom.page=1,this.getList()}}},v=f,g=i("2877"),b=Object(g["a"])(v,n,r,!1,null,null,null);t["default"]=b.exports}}]);

view/store/node_modules/.cache/babel-loader/93affe72f92530ed9660fa2495c3f881.json

@@ -0,0 +1 @@
+{"remainingRequest":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\thread-loader\\dist\\cjs.js!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\babel-loader\\lib\\index.js!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js??ref--0-0!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\view\\store\\src\\pages\\setting\\tableCode\\yuding.vue?vue&type=script&lang=js&","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\src\\pages\\setting\\tableCode\\yuding.vue","mtime":1729842960291},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046406806},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\thread-loader\\dist\\cjs.js","mtime":1729046413043},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\babel-loader\\lib\\index.js","mtime":1729046406587},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046406806},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046413411},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1729046409925}],"contextDependencies":[],"result":["//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nimport { getyuding } from '@/api/setting';\nexport default {\n  data: function data() {\n    return {\n      columns: [{\n        type: 'selection',\n        width: 60,\n        align: 'center'\n      }, {\n        title: '桌码名称',\n        key: 'table_number'\n      }, {\n        title: '预定用户',\n        key: 'user_name'\n      }, {\n        title: '手机号',\n        key: 'phone'\n      }, {\n        title: '预定时间',\n        key: 'yuding_date'\n      }, {\n        title: '来店时间',\n        key: 'come_date'\n      }, {\n        title: '营销经理',\n        key: 'admin_name'\n      }, {\n        title: '备注',\n        key: 'remark'\n      }, {\n        title: '状态',\n        key: 'status'\n      }, {\n        title: '操作',\n        slot: 'caozuo'\n      }],\n      tableQRCodeList: [],\n      total: 0,\n      limit: 10,\n      page: 1,\n      modal: false,\n      tableCateList: [],\n      tableSeatsList: [],\n      formValidate: {\n        cate_id: 0,\n        seat_num: 0,\n        number: [],\n        is_using: 0,\n        remarks: ''\n      },\n      number: 1,\n      id: 0,\n      loading: false,\n      QRCodeSelected: []\n    };\n  },\n  created: function created() {\n    this.getTableQRCodeList();\n  },\n  methods: {\n    onSelectionChange: function onSelectionChange(selection) {\n      this.QRCodeSelected = selection;\n    },\n    // 获取桌码列表\n    getTableQRCodeList: function getTableQRCodeList() {\n      var _this = this;\n\n      this.loading = true;\n      getyuding({\n        page: this.page,\n        limit: this.limit\n      }).then(function (res) {\n        _this.loading = false;\n        _this.tableQRCodeList = res.data.data;\n        _this.total = res.data.count;\n      });\n    },\n    // 分页\n    onChange: function onChange(page) {\n      this.page = page;\n      this.getTableQRCodeList();\n    },\n    // 取消预约\n    quxiao: function quxiao(id) {\n      var _this2 = this;\n\n      this.$modalSure({\n        title: '取消预约',\n        url: \"/table/getyuding2?id=\" + id,\n        method: 'get',\n        ids: {\n          id: id\n        }\n      }).then(function (res) {\n        if (res.msg == '操作失败') {\n          _this2.$Message.error(res.msg);\n\n          return;\n        }\n\n        _this2.$Message.success(res.msg);\n\n        if (_this2.page > 1 && _this2.tableQRCodeList.length == 1) {\n          _this2.page--;\n        }\n\n        _this2.getTableQRCodeList();\n      });\n    }\n  }\n};",null]}

view/store/node_modules/.cache/babel-loader/a6e4bea0634e6f2dd005740aa39a1a0a.json

@@ -0,0 +1 @@
+{"remainingRequest":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\babel-loader\\lib\\index.js!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js??ref--0-0!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\codeeeeee\\酒水代码\\view\\store\\src\\pages\\setting\\tableCode\\yuding.vue?vue&type=script&lang=js&","dependencies":[{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\src\\pages\\setting\\tableCode\\yuding.vue","mtime":1729842546629},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046406806},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\babel-loader\\lib\\index.js","mtime":1729046406587},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":1729046406806},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":1729046413411},{"path":"D:\\codeeeeee\\酒水代码\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1729046409925}],"contextDependencies":[],"result":["//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nimport { getyuding } from '@/api/setting';\nexport default {\n  data: function data() {\n    return {\n      columns: [{\n        type: 'selection',\n        width: 60,\n        align: 'center'\n      }, {\n        title: '桌码名称',\n        key: 'table_number'\n      }, {\n        title: '预定用户',\n        key: 'user_name'\n      }, {\n        title: '手机号',\n        key: 'phone'\n      }, {\n        title: '预定时间',\n        key: 'yuding_date'\n      }, {\n        title: '来店时间',\n        key: 'come_date'\n      }, {\n        title: '营销经理',\n        key: 'admin_name'\n      }, {\n        title: '备注',\n        key: 'remark'\n      }, {\n        title: '操作',\n        slot: 'caozuo'\n      }],\n      tableQRCodeList: [],\n      total: 0,\n      limit: 10,\n      page: 1,\n      modal: false,\n      tableCateList: [],\n      tableSeatsList: [],\n      formValidate: {\n        cate_id: 0,\n        seat_num: 0,\n        number: [],\n        is_using: 0,\n        remarks: ''\n      },\n      number: 1,\n      id: 0,\n      loading: false,\n      QRCodeSelected: []\n    };\n  },\n  created: function created() {\n    this.getTableQRCodeList();\n  },\n  methods: {\n    onSelectionChange: function onSelectionChange(selection) {\n      this.QRCodeSelected = selection;\n    },\n    // 获取桌码列表\n    getTableQRCodeList: function getTableQRCodeList() {\n      var _this = this;\n\n      this.loading = true;\n      getyuding({\n        page: this.page,\n        limit: this.limit\n      }).then(function (res) {\n        _this.loading = false;\n        _this.tableQRCodeList = res.data.data;\n        _this.total = res.data.count;\n      });\n    },\n    // 分页\n    onChange: function onChange(page) {\n      this.page = page;\n      this.getTableQRCodeList();\n    },\n    // 取消预约\n    quxiao: function quxiao(id) {\n      var _this2 = this;\n\n      this.$modalSure({\n        title: '取消预约',\n        url: \"/table/getyuding2?id=\" + id,\n        method: 'get',\n        ids: {\n          id: id\n        }\n      }).then(function (res) {\n        if (res.status == 400) {\n          _this2.$Message.error(res.msg);\n\n          return;\n        }\n\n        _this2.$Message.success(res.msg);\n\n        if (_this2.page > 1 && _this2.tableQRCodeList.length == 1) {\n          _this2.page--;\n        }\n\n        _this2.getTableQRCodeList();\n      });\n    }\n  }\n};",null]}