nothing is important

taoyu65 · Dec 2, 2016 · bf486b1 · bf486b1
1 parent 3e18fd7
commit bf486b1
Show file tree

Hide file tree

Showing 7 changed files with 407 additions and 401 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,12 @@ Homestead.json
 *.xml
 Command Prompt.lnk
 *.xml
-/public/uploads
+/public/uploads
+*.iml
+desktop.ini
+.idea/workspace.xml
+public/json/profit2016.json
+public/json/profitAll.json
+*.json
+.idea/workspace.xml
+*.iml
diff --git a/.idea/laravel.iml b/.idea/laravel.iml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git 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 "]}}
+{"custom":{"relationship":["\u5bb6\u4eba","\u540c\u5b66","\u5bb6\u4eba\u7684","dsaf","sa","ds","sdfggfhd"],"from":["\u6d9b\u54e5","\u707f\u707f","\u707f\u707f ","sdaf","sa","ds","trye"]}}
diff --git 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
+63.58,60.00,,21.98,70,7.70,3.30,99.00,42.00,37,336.15,33.00
diff --git a/public/json/profitAll.json b/public/json/profitAll.json
@@ -1 +1 @@
-33, 19
+63.58,60.00,12.00,21.98,70,7.70,3.30,99.00,42.00,37,236.65,33.00
diff --git 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次加税!~价格已经是税后!',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"custom":{"relationship":["\u5bb6\u4eba","\u540c\u5b66","\u5bb6\u4eba\u7684"],"from":["\u6d9b\u54e5","\u707f\u707f","\u707f\u707f "]}}
		{"custom":{"relationship":["\u5bb6\u4eba","\u540c\u5b66","\u5bb6\u4eba\u7684","dsaf","sa","ds","sdfggfhd"],"from":["\u6d9b\u54e5","\u707f\u707f","\u707f\u707f ","sdaf","sa","ds","trye"]}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		66.00,77.00,,22.00,71,-7.70,3.30,99.00,42.00,97.6,72.3,33.00
		63.58,60.00,,21.98,70,7.70,3.30,99.00,42.00,37,336.15,33.00
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		33, 19
		63.58,60.00,12.00,21.98,70,7.70,3.30,99.00,42.00,37,236.65,33.00