123123

app/controller/admin/v1/other/export/ExportExcel.php

@@ -365,7 +365,9 @@ class ExportExcel extends AuthController
         }
         return $this->success($this->service->storeOrder($truedata, $type));
     }
-
+    public function productcount(StoreOrderServices $services){
+        
+    }
     /**
      * 获取提货点
      * @return mixed

app/controller/admin/v1/statistic/ProductStatistic.php

@@ -90,7 +90,9 @@ class ProductStatistic extends AuthController
         $where = $this->request->getMore([
 			['cate_id', ''],
             ['data', '', '', 'time'],
-            ['sort', '']
+            ['sort', ''],
+            ['type', ''],
+            ['paid',1],
         ]);
         //查询所有已支付的订单
         /** @var StoreOrderServices $StoreOrderServices */
@@ -101,38 +103,115 @@ class ProductStatistic extends AuthController
         //门店服务层
         /** @var SystemStoreServices $SystemStoreServices */
         $SystemStoreServices = app()->make(SystemStoreServices::class);
-        
-        $payOrder = $StoreOrderServices->getOrderList(['paid'=>1]);
+        $payOrder = $StoreOrderServices->getOrderList($where);
         $products = [];
+        $products['data'] = [];
+        $products['allpay'] = 0;
+        $products['allsum'] = 0;
+        $products['allyouhui'] = 0;
+        $products['allshiji'] = 0;
+        $cateId = $where['cate_id'];
+		if ($cateId) {
+			$cateId = is_string($cateId) ? [$cateId] : $cateId;
+			$cateId = array_merge($cateId, $storeProductCategoryServices->getColumn(['pid' => $cateId], 'id'));
+			$cateId = array_unique(array_diff($cateId, [0]));
+		}
         foreach($payOrder['data'] as $key => $val){
             $val['pink_name'] = !empty($val['other_order'])?'[会员礼包]':$val['pink_name'];
             //获取门店名称
             $val['storename'] = empty($val['store_id'])?'平台':$SystemStoreServices->getFieldValue($val['store_id'],'id', 'name');
             foreach($val['_info'] as $k => $v){
                 $v['cart_info']['productInfo']['pnum'] = empty($v['cart_info']['productInfo']['pnum'])?$v['cart_info']['cart_num']:$v['cart_info']['productInfo']['pnum'];
+                $products['allsum'] = $products['allsum']+$v['cart_info']['productInfo']['pnum'];
                 $v['cart_info']['productInfo']['pink_name'] = $val['pink_name'];
                 $v['cart_info']['productInfo']['order_no'] = $val['order_id'];
                 $v['cart_info']['productInfo']['sum_true_price'] = empty($v['cart_info']['sum_true_price'])?'0.00':$v['cart_info']['sum_true_price'];
-                $v['cart_info']['productInfo']['sum_price'] = $v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['price'];
-                $v['cart_info']['productInfo']['youhui'] = $v['cart_info']['productInfo']['sum_price']-$v['cart_info']['productInfo']['sum_true_price'];
-                $v['cart_info']['productInfo']['cost'] = $v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['cost'];
+                $products['allshiji'] = round($products['allshiji']+$v['cart_info']['productInfo']['sum_true_price'],2);
+
+                $v['cart_info']['productInfo']['sum_price'] = round($v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['price'],2);
+                $products['allpay'] = round($products['allpay']+$v['cart_info']['productInfo']['sum_price'],2);
+
+                $v['cart_info']['productInfo']['youhui'] = round($v['cart_info']['productInfo']['sum_price']-$v['cart_info']['productInfo']['sum_true_price'],2);
+                $products['allyouhui'] = round($products['allyouhui']+$v['cart_info']['productInfo']['youhui'],2);
+
+                $v['cart_info']['productInfo']['cost'] = round($v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['cost'],2);
                 $v['cart_info']['productInfo']['code'] = $v['cart_info']['productInfo']['attrInfo']['code'];
                 $v['cart_info']['productInfo']['cate_name'] = $storeProductCategoryServices->getColumn(['id' => $v['cart_info']['productInfo']['cate_id']], 'cate_name')[0];
                 $v['cart_info']['productInfo']['storename'] = $val['storename'];
                 // print_r($v['cart_info']['sum_true_price']);die;
                 //获取商品单位
                 if(empty($v['cart_info']['productInfo']['unit_name'])) $v['cart_info']['productInfo']['unit_name'] = $StoreProductServices->getColumn(['id'=>$v['cart_info']['productInfo']['product_id']], 'unit_name')[0];
-                $products[] = $v['cart_info']['productInfo'];
+                $products['data'][] = $v['cart_info']['productInfo'];
             }
         }
-		$cateId = $where['cate_id'];
+		
+        return $this->success($products);
+    }
+    public function getProductcatecount(StoreProductCategoryServices $storeProductCategoryServices)
+    {
+        $where = $this->request->getMore([
+			['cate_id', ''],
+            ['data', '', '', 'time'],
+            ['sort', ''],
+            ['type', ''],
+            ['paid',1],
+        ]);
+        //查询所有已支付的订单
+        /** @var StoreOrderServices $StoreOrderServices */
+        $StoreOrderServices = app()->make(StoreOrderServices::class);
+        //商品服务层
+        /** @var StoreProductServices $StoreProductServices */
+        $StoreProductServices = app()->make(StoreProductServices::class);
+        //门店服务层
+        /** @var SystemStoreServices $SystemStoreServices */
+        $SystemStoreServices = app()->make(SystemStoreServices::class);
+        $payOrder = $StoreOrderServices->getOrderList($where);
+        $products = [];
+        $cateinfo = [];
+        $products['data'] = [];
+        $products['allpay'] = 0;
+        $products['allsum'] = 0;
+        $products['allyouhui'] = 0;
+        $products['allshiji'] = 0;
+        $cateId = $where['cate_id'];
 		if ($cateId) {
 			$cateId = is_string($cateId) ? [$cateId] : $cateId;
 			$cateId = array_merge($cateId, $storeProductCategoryServices->getColumn(['pid' => $cateId], 'id'));
 			$cateId = array_unique(array_diff($cateId, [0]));
 		}
-		$where['cate_id'] = $cateId;
-        $where['time'] = $this->getDay($where['time']);
+        foreach($payOrder['data'] as $key => $val){
+            $val['pink_name'] = !empty($val['other_order'])?'[会员礼包]':$val['pink_name'];
+            //获取门店名称
+            $val['storename'] = empty($val['store_id'])?'平台':$SystemStoreServices->getFieldValue($val['store_id'],'id', 'name');
+            foreach($val['_info'] as $k => $v){
+                if(in_array($v['cart_info']['productInfo']['cate_id'],$cateId)){
+                    $cateinfo[$v['cart_info']['productInfo']['cate_id']] = $cateinfo[$v['cart_info']['productInfo']['cate_id']][];
+                    $cateinfo[$v['cart_info']['productInfo']['cate_id']] = $cateinfo[$v['cart_info']['productInfo']['cate_id']][];
+                }
+                $v['cart_info']['productInfo']['pnum'] = empty($v['cart_info']['productInfo']['pnum'])?$v['cart_info']['cart_num']:$v['cart_info']['productInfo']['pnum'];
+                $products['allsum'] = $products['allsum']+$v['cart_info']['productInfo']['pnum'];
+                $v['cart_info']['productInfo']['pink_name'] = $val['pink_name'];
+                $v['cart_info']['productInfo']['order_no'] = $val['order_id'];
+                $v['cart_info']['productInfo']['sum_true_price'] = empty($v['cart_info']['sum_true_price'])?'0.00':$v['cart_info']['sum_true_price'];
+                $products['allshiji'] = round($products['allshiji']+$v['cart_info']['productInfo']['sum_true_price'],2);
+
+                $v['cart_info']['productInfo']['sum_price'] = round($v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['price'],2);
+                $products['allpay'] = round($products['allpay']+$v['cart_info']['productInfo']['sum_price'],2);
+
+                $v['cart_info']['productInfo']['youhui'] = round($v['cart_info']['productInfo']['sum_price']-$v['cart_info']['productInfo']['sum_true_price'],2);
+                $products['allyouhui'] = round($products['allyouhui']+$v['cart_info']['productInfo']['youhui'],2);
+
+                $v['cart_info']['productInfo']['cost'] = round($v['cart_info']['productInfo']['pnum']*$v['cart_info']['productInfo']['attrInfo']['cost'],2);
+                $v['cart_info']['productInfo']['code'] = $v['cart_info']['productInfo']['attrInfo']['code'];
+                $v['cart_info']['productInfo']['cate_name'] = $storeProductCategoryServices->getColumn(['id' => $v['cart_info']['productInfo']['cate_id']], 'cate_name')[0];
+                $v['cart_info']['productInfo']['storename'] = $val['storename'];
+                // print_r($v['cart_info']['sum_true_price']);die;
+                //获取商品单位
+                if(empty($v['cart_info']['productInfo']['unit_name'])) $v['cart_info']['productInfo']['unit_name'] = $StoreProductServices->getColumn(['id'=>$v['cart_info']['productInfo']['product_id']], 'unit_name')[0];
+                $products['data'][] = $v['cart_info']['productInfo'];
+            }
+        }
+		
         return $this->success($products);
     }
     /**

app/controller/cashier/User.php

@@ -297,12 +297,10 @@ class User extends AuthController
     //台桌预定
     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['yuding_date'] = date("Y-m-d", strtotime($wyuding_date));
         $post['come_date'] = $come_date;
         $post['remark'] = $wremark;
         $post['store_id'] = $store_id;

route/admin.php

@@ -574,6 +574,8 @@ Route::group('adminapi', function () {
         Route::get('storeProduct', 'v1.other.export.ExportExcel/storeProduct')->option(['real_name' => '商品导出']);
         //订单
         Route::get('storeOrder', 'v1.other.export.ExportExcel/storeOrder')->option(['real_name' => '订单导出']);
+        Route::get('productcount', 'v1.other.export.ExportExcel/productcount')->option(['real_name' => '商品销售统计导出']);
+        
         //提货点
         Route::get('storeMerchant', 'v1.other.export.ExportExcel/storeMerchant')->option(['real_name' => '提货点导出']);
         //导出会员卡

view/store/node_modules/.cache/terser-webpack-plugin/index-v5/07/a7/b08738f1ffea46eec62331b7d142f560c6dce4eb8953dbdf809714187724

@@ -0,0 +1,2 @@
+
+e7cf112580f664406aaad07469b9131ed0d7a1a2	{"key":"{\"terser\":\"4.3.8\",\"node_version\":\"v14.15.5\",\"terser-webpack-plugin\":\"1.4.1\",\"terser-webpack-plugin-options\":{\"test\":/\\.m?js(\\?.*)?$/i,\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":false,\"sourceMap\":false,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"terserOptions\":{\"output\":{\"comments\":/^\\**!|@preserve|@license|@cc_on/i},\"compress\":{\"arrows\":false,\"collapse_vars\":false,\"comparisons\":false,\"computed_props\":false,\"hoist_funs\":false,\"hoist_props\":false,\"hoist_vars\":false,\"inline\":false,\"loops\":false,\"negate_iife\":false,\"properties\":false,\"reduce_funcs\":false,\"reduce_vars\":false,\"switches\":false,\"toplevel\":false,\"typeofs\":false,\"booleans\":true,\"if_return\":true,\"sequences\":true,\"unused\":true,\"conditionals\":true,\"dead_code\":true,\"evaluate\":true},\"mangle\":{\"safari10\":true}}},\"hash\":\"58b326725bf2a1d7fe9de38f55cc2f56\"}","integrity":"sha512-ccUD5D4+CzCNgCTfmOTePmErNHXbPV00dkcrfXD+NjK3tSBa+3dUBfFVbM8y+cYO6+JuK0duRhdc1NEVacuNig==","time":1730268547512,"size":3555478}

view/store/node_modules/.cache/terser-webpack-plugin/index-v5/94/3f/c12668db29dac197bf9abb2d734d1a7bdee94c302f862379d2eed0446850

@@ -0,0 +1,2 @@
+
+fe324ca040f9d3a8e60f7b1d93d0f776ebab298f	{"key":"{\"terser\":\"4.3.8\",\"node_version\":\"v14.15.5\",\"terser-webpack-plugin\":\"1.4.1\",\"terser-webpack-plugin-options\":{\"test\":/\\.m?js(\\?.*)?$/i,\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":false,\"sourceMap\":false,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"terserOptions\":{\"output\":{\"comments\":/^\\**!|@preserve|@license|@cc_on/i},\"compress\":{\"arrows\":false,\"collapse_vars\":false,\"comparisons\":false,\"computed_props\":false,\"hoist_funs\":false,\"hoist_props\":false,\"hoist_vars\":false,\"inline\":false,\"loops\":false,\"negate_iife\":false,\"properties\":false,\"reduce_funcs\":false,\"reduce_vars\":false,\"switches\":false,\"toplevel\":false,\"typeofs\":false,\"booleans\":true,\"if_return\":true,\"sequences\":true,\"unused\":true,\"conditionals\":true,\"dead_code\":true,\"evaluate\":true},\"mangle\":{\"safari10\":true}}},\"hash\":\"39faacb53315f7d2e72deeeecf597576\"}","integrity":"sha512-SH7FmabAfa6mPyaBqWyl3GFTfa6N7zd+k3FgZY6e/hsyydSB8dW3aR6z0S4MMntHCm5Lk8XoZ0MklmJ9HJ4Khw==","time":1730268543594,"size":2663032}

view/store/node_modules/.cache/terser-webpack-plugin/index-v5/d3/8e/ebedac267f0679ff4a740a65f058695731bb33b335466ceafdfa9b3655a0

@@ -0,0 +1,2 @@
+
+ebe05d3a4a6f5d7dfd1f40e558699ffa2b10d00b	{"key":"{\"terser\":\"4.3.8\",\"node_version\":\"v14.15.5\",\"terser-webpack-plugin\":\"1.4.1\",\"terser-webpack-plugin-options\":{\"test\":/\\.m?js(\\?.*)?$/i,\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":false,\"sourceMap\":false,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"terserOptions\":{\"output\":{\"comments\":/^\\**!|@preserve|@license|@cc_on/i},\"compress\":{\"arrows\":false,\"collapse_vars\":false,\"comparisons\":false,\"computed_props\":false,\"hoist_funs\":false,\"hoist_props\":false,\"hoist_vars\":false,\"inline\":false,\"loops\":false,\"negate_iife\":false,\"properties\":false,\"reduce_funcs\":false,\"reduce_vars\":false,\"switches\":false,\"toplevel\":false,\"typeofs\":false,\"booleans\":true,\"if_return\":true,\"sequences\":true,\"unused\":true,\"conditionals\":true,\"dead_code\":true,\"evaluate\":true},\"mangle\":{\"safari10\":true}}},\"hash\":\"8a13d8c738ff0c40500106db80b82254\"}","integrity":"sha512-Lv+Od9MycRMM9uiqzZDk/wA3lglBfrpcHx1hM/GRr/GbXJa8nrVJAT8e7ke0jgVQ+mK9NVyW2DNv6d0jltjfSw==","time":1730268530186,"size":133558}

view/store/node_modules/.cache/terser-webpack-plugin/index-v5/ef/d1/fc0c8050cdb683748ae81159fef631ea25df658685515129f74f7544986d

@@ -0,0 +1,2 @@
+
+756b8a23188e17baa01fc7a88f193910ff82d16c	{"key":"{\"terser\":\"4.3.8\",\"node_version\":\"v14.15.5\",\"terser-webpack-plugin\":\"1.4.1\",\"terser-webpack-plugin-options\":{\"test\":/\\.m?js(\\?.*)?$/i,\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":false,\"sourceMap\":false,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"terserOptions\":{\"output\":{\"comments\":/^\\**!|@preserve|@license|@cc_on/i},\"compress\":{\"arrows\":false,\"collapse_vars\":false,\"comparisons\":false,\"computed_props\":false,\"hoist_funs\":false,\"hoist_props\":false,\"hoist_vars\":false,\"inline\":false,\"loops\":false,\"negate_iife\":false,\"properties\":false,\"reduce_funcs\":false,\"reduce_vars\":false,\"switches\":false,\"toplevel\":false,\"typeofs\":false,\"booleans\":true,\"if_return\":true,\"sequences\":true,\"unused\":true,\"conditionals\":true,\"dead_code\":true,\"evaluate\":true},\"mangle\":{\"safari10\":true}}},\"hash\":\"f2ccded30c8c6f732abeeeb4c909ab1c\"}","integrity":"sha512-rZjidur1rjAtBdtQjVN3YAMejGWzo7rRQo6DQp+RpXyUB8iBWacmloigNpf/GEvOLcZjP88FHMt01Bg9/9HZnw==","time":1730268528995,"size":23003}

view/store/node_modules/.cache/terser-webpack-plugin/index-v5/f5/35/89836617f44e8e94d164c28e2de007a5736fc9f695c7b607f26d63fcd621

@@ -0,0 +1,2 @@
+
+119ec280d1dac01eb1d37e85e67d806333975b69	{"key":"{\"terser\":\"4.3.8\",\"node_version\":\"v14.15.5\",\"terser-webpack-plugin\":\"1.4.1\",\"terser-webpack-plugin-options\":{\"test\":/\\.m?js(\\?.*)?$/i,\"chunkFilter\":() => true,\"warningsFilter\":() => true,\"extractComments\":false,\"sourceMap\":false,\"cache\":true,\"cacheKeys\":defaultCacheKeys => defaultCacheKeys,\"parallel\":true,\"terserOptions\":{\"output\":{\"comments\":/^\\**!|@preserve|@license|@cc_on/i},\"compress\":{\"arrows\":false,\"collapse_vars\":false,\"comparisons\":false,\"computed_props\":false,\"hoist_funs\":false,\"hoist_props\":false,\"hoist_vars\":false,\"inline\":false,\"loops\":false,\"negate_iife\":false,\"properties\":false,\"reduce_funcs\":false,\"reduce_vars\":false,\"switches\":false,\"toplevel\":false,\"typeofs\":false,\"booleans\":true,\"if_return\":true,\"sequences\":true,\"unused\":true,\"conditionals\":true,\"dead_code\":true,\"evaluate\":true},\"mangle\":{\"safari10\":true}}},\"hash\":\"6d6638b27e1a27ed6a9ecd9c0cf5cf72\"}","integrity":"sha512-UrvFyjDyzSCOxG9WZebuinbl+dTbMeyXlu6BEOeaY9JknWquoi2mtSDW62tlzyw9i6fMmGSYwh6SJoPsDqkBpQ==","time":1730268531872,"size":387930}

view/store/node_modules/.cache/vue-loader/730f1465883a854079ee53df6d0f9c44.json

@@ -1 +1 @@
-{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1717396015000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=11e45062&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=11e45062&scoped=true&lang=less&\"\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  \"11e45062\",\n  null\n  \n)\n\nexport default component.exports"]}
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1730268338274},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=e78278ac&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=e78278ac&scoped=true&lang=less&\"\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  \"e78278ac\",\n  null\n  \n)\n\nexport default component.exports"]}

view/store/node_modules/.cache/vue-loader/a4a408a0f2e386ef5dc002181abfe005.json

@@ -0,0 +1 @@
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue?vue&type=style&index=0&id=e78278ac&scoped=true&lang=less&","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1730268338274},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\css-loader\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\loaders\\stylePostLoader.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\less-loader\\dist\\cjs.js","mtime":1728455681676},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000}],"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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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\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/deep/.el-cascader {\n\t.el-input__inner {\n\t  font-size: 12px;\n\t  min-height: 32px !important;\n\t}\n\t.el-input{\n\t\t.el-icon-arrow-down{\n\t\t\tfont-size: 12px;\n\t\t\tcolor: #000;\n\t\t}\n\t}\n\t.el-cascader__search-input{\n\t\tmargin-left: 7px !important;\n\t}\n}\n/deep/.ivu-page-header,\n/deep/.ivu-tabs-bar {\n  margin-bottom: 0px !important;\n  border-bottom: 1px solid #E9E9E9;\n}\n\n/deep/.ivu-card-body {\n  padding: 14px 20px 0 20px !important;\n}\n\n\n/deep/.ivu-tabs-nav {\n  height: 45px;\n}\n\n.bg {\n  z-index: 100;\n  position: fixed;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  background: rgba(0, 0, 0, 0.5);\n}\n\n.tabbox {\n  padding: 0px 20px 0px;\n  // border-bottom: 1px solid #DCDFE6;\n}\n\n.box {\n  padding: 20px;\n  padding-bottom: 0px;\n}\n\n.tablebox {\n  margin-top: 15px;\n}\n\n.btnbox {\n  padding: 20px 0px 0px 30px;\n\n  .btns {\n    width: 99px;\n    height: 32px;\n    background: #1890ff;\n    border-radius: 4px;\n    text-align: center;\n    line-height: 32px;\n    color: #ffffff;\n    cursor: pointer;\n  }\n}\n\n.table {\n  padding: 0px 30px 15px 30px;\n}\n.ivu-table {\n  background-color: #182328;\n  color: #fff;\n}\n.tabBox_img {\n  width: 36px;\n  height: 36px;\n  border-radius: 4px;\n  cursor: pointer;\n\n  img {\n    width: 100%;\n    height: 100%;\n  }\n}\n\n.search {\n  width: 86px;\n  height: 32px;\n  background: #1890ff;\n  border-radius: 4px;\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  color: #ffffff;\n  cursor: pointer;\n}\n\n.reset {\n  width: 86px;\n  height: 32px;\n  border-radius: 4px;\n  border: 1px solid rgba(151, 151, 151, 0.36);\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  font-weight: 500;\n  color: #515a6e;\n  // background: #2D8CF0;\n\n  cursor: pointer;\n}\n",null]}

收银台/cashier/.idea/workspace.xml

@@ -2,33 +2,50 @@
 <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/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 afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-43975136.7579aa38.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-7762cc12.4f56d17a.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/eslint-loader/29bad2a70df37bd2782e9dc0c3356b190c0e85f8.json.gz" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/content-v2/sha512/2e/ff/8e77d33271130cf6e8aacd90e4ff00379609417eba5c1f1d6133f191aff19b5c96bc9eb549013f1eee47b48e0550fa62bd355c96d8336fe9dd2396d8df4b" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/content-v2/sha512/48/7e/c599a6c07daea63f2681a96ca5dc61537dae8def377e937160658e9efe1b32c9d481f1d5b7691eb3d12e0c327b470a6e4b93c5e867432496627d1c9e0a87" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/content-v2/sha512/52/bb/c5ca30f2cd208ec46f5665e6ee8a76e5f9d4db31ec9796ee8110e79a63d2649d6aaea22da6b520d6eb6b65cf2c3d8ba7cc986498c21e922683ec0ea901a5" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/content-v2/sha512/71/c5/03e43e3e0b308d8024df98e4de3e612b3475db3d5d3476472b7d70fe3632b7b5205afb775405f1556ccf32f9c60eebe26e2b476e46175cd4d11569cb8d8a" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/content-v2/sha512/ad/98/e276eaf5ae302d05db508d537760031e8c65b3a3bad1428e83429f91a57c9407c88159a7269688a03697ff184bce2dc6633fcf051ccb74d4183dffd1d99f" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/index-v5/07/a7/b08738f1ffea46eec62331b7d142f560c6dce4eb8953dbdf809714187724" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/index-v5/94/3f/c12668db29dac197bf9abb2d734d1a7bdee94c302f862379d2eed0446850" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/index-v5/d3/8e/ebedac267f0679ff4a740a65f058695731bb33b335466ceafdfa9b3655a0" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/index-v5/ef/d1/fc0c8050cdb683748ae81159fef631ea25df658685515129f74f7544986d" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/terser-webpack-plugin/index-v5/f5/35/89836617f44e8e94d164c28e2de007a5736fc9f695c7b607f26d63fcd621" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/2712892644a1a395ba63a19cb771020b.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/5c60110d413d598b418380752a91957a.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/a4a408a0f2e386ef5dc002181abfe005.json" afterDir="false" />
+      <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/admin/v1/statistic/ProductStatistic.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../app/controller/admin/v1/statistic/ProductStatistic.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../route/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/../../route/admin.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/css/chunk-6be680f3.b0c5326d.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/css/chunk-7762cc12.15c73c61.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/css/chunk-6ffac9cb.2bdb43d6.css" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/css/chunk-43975136.2bdb43d6.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/js/app.77834e93.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/js/app.910610d2.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-6be680f3.1abcbd9e.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-6ffac9cb.d86ed9ed.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-8b629e46.91c6527c.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-8b629e46.dfecf666.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-vendors.27556395.js" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/dist/view_store/js/chunk-vendors.cc9211cc.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/node_modules/.cache/babel-loader/9ec49534a9b0b032640fefaa1df4f17a.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/babel-loader/9ec49534a9b0b032640fefaa1df4f17a.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/730f1465883a854079ee53df6d0f9c44.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/730f1465883a854079ee53df6d0f9c44.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/a54c6c5c6c25b860f554eb095f1d7635.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../view/store/node_modules/.cache/vue-loader/a54c6c5c6c25b860f554eb095f1d7635.json" 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/1d34139a486d4b064b562df0d9274e7a.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/babel-loader/1d34139a486d4b064b562df0d9274e7a.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/01191426301dc381f3b6fbd65e91e243.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/01191426301dc381f3b6fbd65e91e243.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/5510ae7f5ee42a37808843fc885a8ac8.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/5510ae7f5ee42a37808843fc885a8ac8.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/7c8e55c3f4c6b51d915e21a7ed2d1a33.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/7c8e55c3f4c6b51d915e21a7ed2d1a33.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/node_modules/.cache/vue-loader/95b0f76ad6c339e9689a609f15ad40a7.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/95b0f76ad6c339e9689a609f15ad40a7.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/af8e81b1fce40604159e0ccf1191617f.json" beforeDir="false" afterPath="$PROJECT_DIR$/node_modules/.cache/vue-loader/af8e81b1fce40604159e0ccf1191617f.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/cunqu/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/cunqu/index.vue" 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" />
@@ -41,6 +58,12 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/cashier/src/api/order.js" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/cashier/src/pages/setting/index.vue" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/pages/table/index.vue" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/pages/table/index2.vue" root0="FORCE_HIGHLIGHTING" />
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
@@ -67,7 +90,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1730184114621</updated>
-      <workItem from="1730184115875" duration="26813000" />
+      <workItem from="1730184115875" duration="27621000" />
     </task>
     <servers />
   </component>

收银台/cashier/node_modules/.cache/vue-loader/95b0f76ad6c339e9689a609f15ad40a7.json

@@ -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":1729668293270},{"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":1730365560763},{"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"]}

收银台/cashier/node_modules/.cache/vue-loader/c4fd8c8f39a675c9d92dc2de50622e76.json

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

收银台/cashier/src/pages/cunqu/index.vue

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

收银台/cashier/src/pages/table/index.vue

@@ -493,13 +493,9 @@
         </FormItem>
 
         <FormItem label="到店时间：" label-for="yuding_date" prop="yuding_date">
-        <DatePicker
-            type="date"
-            v-model="wyuding_date"
-            format="yyyy-MM-dd"
-            placeholder="请选择日期"
-            class="inputW"
-        ></DatePicker>
+
+          <DatePicker format="yyyy-MM-dd" type="date" placeholder="日期" v-model="wyuding_date"></DatePicker>
+
         </FormItem>
 
         <FormItem label="到店时间：" label-for="come_date" prop="come_date">