Merge branch 'master' of https://github.com/joey2017/LLmobile

app/Http/Controllers/PurchaseController.php

@@ -33,6 +33,8 @@ public function index(Request $request)
 
             $t=$request->input('t')==0 ? 2 : intval($request->input('t'));
 
+            $t = $request->t==0 ? 2 : intval($request->t);
+            // dd($request->t);
             // $class_list=M('pms_class')->where('is_del=0')->order('sort asc')->select();
             $class_list = DB::table('pms_class')->where('is_del','0')->orderBy('sort', 'asc')->get();
             $class_list = objectToArray($class_list);
@@ -64,7 +66,6 @@ public function index(Request $request)
             // $this->assign('attr_list',$attr_list);
             // $this->display();
             return view('purchase/index',['title'=>$title,'t'=>$t,'class_name'=>$class_name,'class_list'=>$cl,'attr_list'=>$attr_list,'no_include'=>$no_include]);
-
 
     }
 

composer.json

@@ -6,6 +6,7 @@
     "type": "project",
     "require": {
         "php": ">=5.6.4",
+        "barryvdh/laravel-debugbar": "^2.4",
         "encore/laravel-admin": "1.3.x-dev",
         "laravel/framework": "5.3.*"
     },

config/app.php

@@ -177,7 +177,8 @@
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        Encore\Admin\Providers\AdminServiceProvider::class
+        Encore\Admin\Providers\AdminServiceProvider::class,
+        Barryvdh\Debugbar\ServiceProvider::class,
 
     ],
 

note.txt

@@ -170,4 +170,26 @@ public function boot() {
 
 ��̬�ļ�·��ʹ��asset('js/app.js');
 
-���빫��ͷ�ļ�@include('layouts.header') 
+���빫��ͷ�ļ�@include('layouts.header') 
+
+��ӡsql���
+
+����һ������vendor\laravel\framework\src\Illuminate\Database\Query��toSql������
+$query->toSql();
+
+������������DB::enableQueryLog();
+
+���������getLastSql()
+
+��ӡ����dd(getLastSql());
+==============================================================================
+
+Laravel��ܿ������Թ���Laravel Debugbarʹ��
+
+1������package����
+
+composer require barryvdh/laravel-debugbar
+
+2����config/app.php��providers������һ��ע��
+
+Barryvdh\Debugbar\ServiceProvider::class,

resources/views/purchase/index.blade.php

@@ -158,7 +158,6 @@
 		</div>
 
 		<div class="sort_sele2">
-
 	    	<ul class="metismenu " id="menu">
 	        @foreach ($class_list as $c)
 	          	<li>
@@ -170,7 +169,7 @@
 	            	<ul aria-expanded="false" class="collapse">
 	                  @foreach ($c['item'] as $ci)
 	                		<li @if ($ci['id'] == $t)class="select"@endif>
-	                  			<a href="{{url('Purchase/index',array('t'=>$ci['id']))}}" class="present">{{$ci['class_name']}} <i class="fa fa-angle-right pull-right"></i></a>
+	                  			<a href="{{url('purchase/index',array('t'=>$ci['id']))}}" class="present">{{$ci['class_name']}} <i class="fa fa-angle-right pull-right"></i></a>
 	                		</li>
 	                  @endforeach             	
 	            	</ul>

routes/web.php

@@ -29,8 +29,12 @@
 Route::get('/pay/purchase_go_pay','PayController@purchase_go_pay');
 Route::post('/purchase/create_order','PurchaseController@create_order');
 Route::get('/purchase/ajax_get_qualitygoods', 'PurchaseController@ajax_get_qualitygoods');
+<<<<<<< HEAD
 Route::get('/purchase/index', 'PurchaseController@index');
 Route::get('/purchase', 'PurchaseController@index');
+=======
+Route::get('/purchase/index/{t?}', 'PurchaseController@index');
+>>>>>>> 003c6168160d8664757529ea542e32e4100b8efa
 /*Route::get('/biz/ajax_login', function() {
   return View::make('/ajax_login');
 });*/

storage/debugbar/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

vendor/barryvdh/laravel-debugbar/.gitignore

@@ -0,0 +1,4 @@
+/vendor
+composer.phar
+composer.lock
+.DS_Store

vendor/barryvdh/laravel-debugbar/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2013-2014 Barry vd. Heuvel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

vendor/barryvdh/laravel-debugbar/changelog.md

@@ -0,0 +1,86 @@
+# Changelog for Laravel Debugbar
+
+## 1.8.4 (2014-10-31)
+
+- Add Redis/PDO storage options
+
+## 1.8.3 (2014-11-23)
+
+- Base EventCollector on TimeData Collector
+
+## 1.8.2 (2014-11-18)
+
+- Use XHR handler instead of jQuery handler
+
+## 1.8.1 (2014-11-14)
+
+- Fix compatability with Symfony 2.3 (Laravel 4.)
+
+## 1.8.0 (2014-10-31)
+
+- Fix L5 compatability
+- add hints + explain options to QueryLogger
+- update to Debugbar 1.10.x
+- new ViewCollector layout with more information
+
+## 1.7.7 (2014-09-15)
+
+- Make it compatible with Laravel 5.0-dev
+- Allow anonymous function as `enabled` setting (for IP checks etc)
+- Escape query bindings, to prevent executing of scripts/html
+
+## 1.7.6 (2014-09-12)
+
+- Fix reflash bug
+- Fix caching of debugbar assets
+
+## 1.7.5 (2014-09-12)
+
+- Reflash data for all debugbar requests
+
+## 1.7.4 (2014-09-08)
+
+- Rename assets routes to prevent Nginx conflicts
+
+## 1.7.3 (2014-09-05)
+
+- Add helper functions (debug(), add/start/stop_measure() and measure()
+- Collect data on responses that are not redirect/ajax/html also.
+
+## 1.7.2 (2014-09-04)
+
+- Fix 4.0 compatibility (problem with Controller namespace)
+- Give deprecation notice instead of publishing assets.
+
+## 1.7.1 (2014-09-03)
+
+- Deprecated `debugbar:publish` command in favor of AssetController
+- Fixed issue with detecting absolute paths in Windows
+
+## 1.7.0 (2014-09-03)
+
+- Use AssetController instead of publishing assets to the public folder.
+- Inline fonts + images to base64 Data-URI
+- Use PSR-4 file structure
+
+## 1.6.8 (2014-08-27)
+
+- Change OpenHandler layout
+- Add backtrace option for query origin
+
+## 1.6.7 (2014-08-09)
+
+- Add Twig extensions for better integration with rcrowe/TwigBridge
+
+## 1.6.6 (2014-07-08)
+
+- Check if Requests wantsJSON instead of only isXmlHttpRequest
+- Make sure closure for timing is run, even when disabled 
+
+## 1.6.5 (2014-06-24)
+
+- Add Laravel style
+
+## 1.6.4 (2014-06-15)
+
+- Work on non-UTF-8 handling

vendor/barryvdh/laravel-debugbar/composer.json

@@ -0,0 +1,26 @@
+{
+    "name": "barryvdh/laravel-debugbar",
+    "description": "PHP Debugbar integration for Laravel",
+    "keywords": ["laravel", "debugbar", "profiler", "debug", "webprofiler"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Barry vd. Heuvel",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.9",
+        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*",
+        "symfony/finder": "~2.7|~3.0",
+        "maximebf/debugbar": "~1.13.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Barryvdh\\Debugbar\\": "src/"
+        },
+        "files": [
+            "src/helpers.php"
+        ]
+    }
+}