molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

路由兼容3.x版本

Browse Source
This commit is contained in:
tensent
2020-04-06 15:18:03 +08:00
parent a8619c61fb
commit 209af6285a
3 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -31,7 +31,6 @@
"sent/think-jwt": "^1.0.0",
"xin/helper": "^1.0.0",
"sent/tree": "^1.0.0",
"lotofbadcode/phpspirit_dbskeleton": "^1.0",
"sent/think-addons": "^1.0.0",
"overtrue/wechat": "^4.2"
},

60
public/static/common/js/app.js
View File

@@ -8,56 +8,58 @@
// 当前资源URL目录
var baseRoot = (function () {
var scripts = document.scripts, src = scripts[scripts.length - 1].src;
return src.substring(0, src.lastIndexOf("/") - 2);
var scripts = document.scripts, src = scripts[0].src;
return src.substring(0, src.lastIndexOf("/") - 9);
})();
// 配置参数
require.config({
waitSeconds: 60,
baseUrl: baseRoot,
map: {'*': {css: baseRoot + 'plugs/require/require.css.js'}},
map: {'*': {css: baseRoot + 'plugins/require/require.css.js'}},
paths: {
'template': ['plugs/template/template'],
'pcasunzips': ['plugs/jquery/pcasunzips'],
'template': ['plugins/template/template'],
'pcasunzips': ['plugins/jquery/pcasunzips'],
// openSource
'json': ['plugs/jquery/json2.min'],
'layui': ['plugs/layui/layui'],
'base64': ['plugs/jquery/base64.min'],
'angular': ['plugs/angular/angular.min'],
'ckeditor': ['plugs/ckeditor/ckeditor'],
'websocket': ['plugs/socket/websocket'],
'layui': ['plugins/layui/layui'],
'base64': ['plugins/jquery/base64.min'],
'angular': ['plugins/angular/angular.min'],
'ckeditor': ['plugins/ckeditor/ckeditor'],
'websocket': ['plugins/socket/websocket'],
// jQuery
'jquery.ztree': ['plugs/ztree/jquery.ztree.all.min'],
'jquery.masonry': ['plugs/jquery/masonry.min'],
'jquery.cookies': ['plugs/jquery/jquery.cookie'],
'jquery': ['plugins/jquery/jquery.min'],
'json': ['plugins/jquery/json2.min'],
'jquery.ztree': ['plugins/ztree/jquery.ztree.all.min'],
'jquery.masonry': ['plugins/jquery/masonry.min'],
'jquery.cookies': ['plugins/jquery/jquery.cookie'],
// bootstrap
'bootstrap': ['plugs/bootstrap/js/bootstrap.min'],
'bootstrap.typeahead': ['plugs/bootstrap/js/bootstrap3-typeahead.min'],
'bootstrap.multiselect': ['plugs/bootstrap-multiselect/bootstrap-multiselect'],
'bootstrap': ['plugins/bootstrap/js/bootstrap.min'],
'bootstrap.typeahead': ['plugins/bootstrap/js/bootstrap3-typeahead.min'],
'bootstrap.multiselect': ['plugins/bootstrap-multiselect/bootstrap-multiselect'],
// distpicker
'distpicker': ['plugs/distpicker/distpicker'],
'distpicker': ['plugins/distpicker/distpicker'],
// nanoscroller
'nanoscroller': ['plugs/nanoscroller/jquery.nanoscroller.min']
'nanoscroller': ['plugins/nanoscroller/jquery.nanoscroller.min']
},
shim: {
// open-source
'websocket': {deps: [baseRoot + 'plugs/socket/swfobject.min.js']},
'websocket': {deps: [baseRoot + 'plugins/socket/swfobject.min.js']},
// jquery
'jquery.ztree': {deps: ['css!' + baseRoot + 'plugs/ztree/zTreeStyle/zTreeStyle.css']},
// bootstrap
'jquery.ztree': {deps: ['css!' + baseRoot + 'plugins/ztree/zTreeStyle/zTreeStyle.css']},
// bootstrap
'bootstrap':{deps: ['jquery', 'css!' + baseRoot + 'plugins/bootstrap/css/bootsrap.min.css']},
'bootstrap.typeahead': {deps: ['bootstrap']},
'bootstrap.multiselect': {deps: ['bootstrap', 'css!' + baseRoot + 'plugs/bootstrap-multiselect/bootstrap-multiselect.css']},
'distpicker': {deps: [baseRoot + 'plugs/distpicker/distpicker.data.js']},
'nanoscroller': {deps: ['css!' + baseRoot + 'plugs/nanoscroller/nanoscroller.css']}
'bootstrap.multiselect': {deps: ['bootstrap', 'css!' + baseRoot + 'plugins/bootstrap-multiselect/bootstrap-multiselect.css']},
'distpicker': {deps: [baseRoot + 'plugins/distpicker/distpicker.data.js']},
'nanoscroller': {deps: ['css!' + baseRoot + 'plugins/nanoscroller/nanoscroller.css']}
},
deps: ['json', 'bootstrap'],
deps: ['json'],
// 开启debug模式，不缓存资源
// urlArgs: "ver=" + (new Date()).getTime()
urlArgs: "ver=" + (new Date()).getTime()
});
// 注册jquery到require模块
define('jquery', function () {
return layui.$;
define(['jquery'], function ($) {
});

6
route/app.php
View File

@@ -15,14 +15,14 @@ $model = Model::where('status', '>', 0)->field(['id', 'name'])->select()->toArra
foreach ($model as $value) {
Route::rule('/admin/' . $value['name'] . '/:function', 'admin.content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
Route::rule('/front/' . $value['name'] . '/:function', 'front.content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
Route::rule($value['name'] . '/index', 'front.content/index')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
Route::rule($value['name'] . '/list/[:id]', 'front.content/lists')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
Route::rule($value['name'] . '/detail-:id', 'front.content/detail')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
Route::rule('/user/' . $value['name'] . '/:function', 'user.content/:function')->append(['name'=>$value['name'], 'model_id' => $value['id']]);
}
Route::rule('/', 'front.Index/index');
Route::rule('search', 'front.Content/search');
Route::rule('lists', 'front.Content/lists');
Route::rule('detail-:id', 'front.Content/detail');
Route::rule('category', 'front.Content/category');
Route::rule('topic-:id', 'front.Content/topic');
Route::rule('form/:id/:name', 'front.Form/index');