项目初始化

sebastiankennedy · Jan 19, 2017 · a8bf8f8 · a8bf8f8
1 parent 355b3a5
commit a8bf8f8
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 1,660 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
-APP_KEY=
+APP_KEY=rmlFaGq9GYwl2D7evBHcUTCEn5Q4IrYv
 
 DB_HOST=localhost
 DB_DATABASE=cowcat

diff --git a/gulpfile.js b/gulpfile.js
@@ -103,11 +103,11 @@ elixir(function (mix) {
     mix.scripts([
             'jquery.min.js',
             'bootstrap.min.js',
+            'adminlte.min.js',
             'select2.full.min.js',
             'moment.min.js',
-            'daterangepicker.js',
-            'adminlte.min.js',
             'sweetalert.min.js',
+            'daterangepicker.js',
             'common.js'
         ],
         'public/assets/backend/js/app.min.js',

diff --git a/public/assets/backend/js/app.min.js b/public/assets/backend/js/app.min.js
diff --git a/public/assets/backend/js/app.min.js.map b/public/assets/backend/js/app.min.js.map
diff --git a/public/assets/backend/plugins/daterangepicker/daterangepicker.js b/public/assets/backend/plugins/daterangepicker/daterangepicker.js
@@ -324,7 +324,7 @@
                 // after the maximum, don't display this range option at all.
                 if ((this.minDate && end.isBefore(this.minDate)) || (maxDate && start.isAfter(maxDate)))
                     continue;
-                
+
                 //Support unicode chars in the range names.
                 var elem = document.createElement('textarea');
                 elem.innerHTML = range;
@@ -548,7 +548,7 @@
                 } else {
                     this.rightCalendar.month = this.startDate.clone().date(2).add(1, 'month');
                 }
-                
+
             } else {
                 if (this.leftCalendar.month.format('YYYY-MM') != this.startDate.format('YYYY-MM') && this.rightCalendar.month.format('YYYY-MM') != this.startDate.format('YYYY-MM')) {
                     this.leftCalendar.month = this.startDate.clone().date(2);
@@ -1154,7 +1154,7 @@
                 this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.locale.format));
                 this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.locale.format));
             }
-            
+
         },
 
         clickRange: function(e) {
@@ -1286,7 +1286,7 @@
                 this.endDate = null;
                 this.setStartDate(date.clone());
             } else if (!this.endDate && date.isBefore(this.startDate)) {
-                //special case: clicking the same date for start/end, 
+                //special case: clicking the same date for start/end,
                 //but the time of the end date is before the start date
                 this.setEndDate(this.startDate.clone());
             } else {
@@ -1536,7 +1536,7 @@
         });
         return this;
     };
-    
+
     return DateRangePicker;
 
 }));
diff --git a/public/build/assets/backend/js/app.min-e4950e58ff.js b/public/build/assets/backend/js/app.min-e4950e58ff.js
diff --git a/public/build/assets/backend/js/app.min.js.map b/public/build/assets/backend/js/app.min.js.map
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,6 +1,6 @@
 {
   "assets/backend/css/app.min.css": "assets/backend/css/app.min-050d52373e.css",
-  "assets/backend/js/app.min.js": "assets/backend/js/app.min-e4950e58ff.js",
+  "assets/backend/js/app.min.js": "assets/backend/js/app.min-5259fdaa0d.js",
   "assets/frontend/css/app.min.css": "assets/frontend/css/app.min-048a0a7fb7.css",
   "assets/frontend/js/app.min.js": "assets/frontend/js/app.min-c8884bf9a8.js"
 }
diff --git a/resources/assets/backend/js/daterangepicker.js b/resources/assets/backend/js/daterangepicker.js
@@ -324,7 +324,7 @@
                 // after the maximum, don't display this range option at all.
                 if ((this.minDate && end.isBefore(this.minDate)) || (maxDate && start.isAfter(maxDate)))
                     continue;
-                
+
                 //Support unicode chars in the range names.
                 var elem = document.createElement('textarea');
                 elem.innerHTML = range;
@@ -548,7 +548,7 @@
                 } else {
                     this.rightCalendar.month = this.startDate.clone().date(2).add(1, 'month');
                 }
-                
+
             } else {
                 if (this.leftCalendar.month.format('YYYY-MM') != this.startDate.format('YYYY-MM') && this.rightCalendar.month.format('YYYY-MM') != this.startDate.format('YYYY-MM')) {
                     this.leftCalendar.month = this.startDate.clone().date(2);
@@ -1154,7 +1154,7 @@
                 this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.locale.format));
                 this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.locale.format));
             }
-            
+
         },
 
         clickRange: function(e) {
@@ -1286,7 +1286,7 @@
                 this.endDate = null;
                 this.setStartDate(date.clone());
             } else if (!this.endDate && date.isBefore(this.startDate)) {
-                //special case: clicking the same date for start/end, 
+                //special case: clicking the same date for start/end,
                 //but the time of the end date is before the start date
                 this.setEndDate(this.startDate.clone());
             } else {
@@ -1536,7 +1536,7 @@
         });
         return this;
     };
-    
+
     return DateRangePicker;
 
 }));
diff --git a/resources/views/backend/components/search.blade.php b/resources/views/backend/components/search.blade.php
@@ -35,4 +35,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/resources/views/backend/layout/main.blade.php b/resources/views/backend/layout/main.blade.php
@@ -41,7 +41,45 @@
         }
 
         if ($('#created_at').length == 1) {
-            $('#created_at').daterangepicker({timePickerIncrement: 30, format: 'YYYY/MM/DD HH:mm:ss'});
+            $('#created_at').daterangepicker({
+                startDate: '{{date('Y/m/d')}}',
+                endDate: '{{date('Y/m/d',time()+86400)}}',
+                "opens": "left",
+                "locale": {
+                    format: 'YYYY/MM/DD',
+                    "separator": " - ",
+                    "applyLabel": "选择",
+                    "cancelLabel": "关闭",
+                    "fromLabel": "From",
+                    "toLabel": "To",
+                    "customRangeLabel": "Custom",
+                    "weekLabel": "W",
+                    "linkedCalendars": true,
+                    "daysOfWeek": [
+                        "日",
+                        "一",
+                        "二",
+                        "三",
+                        "四",
+                        "五",
+                        "六"
+                    ],
+                    "monthNames": [
+                        "一月",
+                        "二月",
+                        "三月",
+                        "四月",
+                        "五月",
+                        "六月",
+                        "七月",
+                        "八月",
+                        "九月",
+                        "十月",
+                        "十一月",
+                        "十二月"
+                    ]
+                },
+            });
         }
 
         @if(Session::has('success'))