diff --git a/.gitignore b/.gitignore index 5514e87..2d661b2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,12 @@ Homestead.json *.xml Command Prompt.lnk *.xml -/public/uploads \ No newline at end of file +/public/uploads +*.iml +desktop.ini +.idea/workspace.xml +public/json/profit2016.json +public/json/profitAll.json +*.json +.idea/workspace.xml +*.iml \ No newline at end of file diff --git a/.idea/laravel.iml b/.idea/laravel.iml index c956989..46c64da 100644 --- a/.idea/laravel.iml +++ b/.idea/laravel.iml @@ -4,5 +4,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cfec50f..229be13 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,9 +3,6 @@ - - - @@ -19,6 +16,9 @@ + + + @@ -28,102 +28,93 @@ - - + + - - - - - - - - - - - - + + - + + + + + - - + + - - - - - + + + - - + + - - + + - - + + - - - - - - - - + + + - - + + - - + + - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -148,45 +139,57 @@ @@ -200,19 +203,25 @@ + - + + + - + - + + + + - @@ -325,7 +334,7 @@ - + @@ -536,18 +495,34 @@ - + + + + + + + - - + + - + + + + + + + + + + + @@ -567,6 +542,9 @@ + + + @@ -589,13 +567,20 @@ - - - + + + + + + - - + + + + + + @@ -612,34 +597,82 @@ + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + - - + + + - + - - + + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - + + - + - - + + + + + - + - - + + + - + - - + + - + - - + + + - + - - + + + - + - + + - + - - + + + - - - - - - - - - - - - - - - - + + + - + - - - - - - - + + - + - - + + + - + - - + + + - + - - + + - + - - + + + - + - - - - - - - - + + - + - - + + + - + - + - + - - + + + - + - - - - - + + + - + - - + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + + - + - - + + - + - - + + - - + + - + - - + + - + - - + + - + - - - - - - - - + + + - + - - + + - - - - - + + + - + - - + + - + + + + + - - - - - - - - - + - - + + - + - - + + - + + + + + - + - - + + diff --git a/public/json/ccbuy.json b/public/json/ccbuy.json index f0172e3..0ee0363 100644 --- a/public/json/ccbuy.json +++ b/public/json/ccbuy.json @@ -1 +1 @@ -{"custom":{"relationship":["\u5bb6\u4eba","\u540c\u5b66","\u5bb6\u4eba\u7684"],"from":["\u6d9b\u54e5","\u707f\u707f","\u707f\u707f "]}} \ No newline at end of file +{"custom":{"relationship":["\u5bb6\u4eba","\u540c\u5b66","\u5bb6\u4eba\u7684","dsaf","sa","ds","sdfggfhd"],"from":["\u6d9b\u54e5","\u707f\u707f","\u707f\u707f ","sdaf","sa","ds","trye"]}} \ No newline at end of file diff --git a/public/json/profit2016.json b/public/json/profit2016.json index 4c5bfb1..918fd99 100644 --- a/public/json/profit2016.json +++ b/public/json/profit2016.json @@ -1 +1 @@ -66.00,77.00,,22.00,71,-7.70,3.30,99.00,42.00,97.6,72.3,33.00 \ No newline at end of file +63.58,60.00,,21.98,70,7.70,3.30,99.00,42.00,37,336.15,33.00 \ No newline at end of file diff --git a/public/json/profitAll.json b/public/json/profitAll.json index f2205be..f75fdc3 100644 --- a/public/json/profitAll.json +++ b/public/json/profitAll.json @@ -1 +1 @@ -33, 19 \ No newline at end of file +63.58,60.00,12.00,21.98,70,7.70,3.30,99.00,42.00,37,236.65,33.00 \ No newline at end of file diff --git a/resources/lang/en/add.php b/resources/lang/en/add.php index d155635..a5ee56f 100644 --- a/resources/lang/en/add.php +++ b/resources/lang/en/add.php @@ -3,7 +3,6 @@ 'error' => '发生未知错误! 请连续涛哥!', 'success' => '上传成功', 'selectCart' => '选择所属于的订单', - 'addCart' => '添加新订单', 'addStore' => '添加商店', 'addCustomer' => '用户添加', 'error_tax' => '不能连续2次加税!~价格已经是税后!',