diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html index 9b12aeb..b22c2db 100644 --- a/app/admin/view/index/main.html +++ b/app/admin/view/index/main.html @@ -267,17 +267,23 @@ success: function (e) { if (e.code == 0) { var html = ''; - $.each(e.data, function (key, value) { - html += '\ - '+value.username+'\ - \ - \ - \ - '+value.login_num+'\ - '+value.last_login_time+'\ - '; - }); - console.log(html); + if(e.data.length==0){ + html +='\ + 暂无用户\ + '; + } + else{ + $.each(e.data, function (key, value) { + html += '\ + '+value.username+'\ + \ + \ + \ + '+value.login_num+'\ + '+value.last_login_time+'\ + '; + }); + } $('#UserList').append(html); } } @@ -291,13 +297,20 @@ success: function (e) { if (e.code == 0) { var html = ''; - $.each(e.data, function (key, value) { - html += '\ - '+value.title+'\ - ' + value.cate_title + '\ - '+value.create_time+'\ - '; - }); + if(e.data.length==0){ + html +='\ + 暂无文章\ + '; + } + else{ + $.each(e.data, function (key, value) { + html += '\ + '+value.title+'\ + ' + value.cate_title + '\ + '+value.create_time+'\ + '; + }); + } $('#Article').append(html); } } diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php index d29d3d6..e625f1b 100644 --- a/app/home/controller/Index.php +++ b/app/home/controller/Index.php @@ -17,9 +17,8 @@ class Index extends BaseController public function index() { add_user_log('view', '首页'); - $version = get_system_config('other','version'); $count = \think\facade\Db::name('UserLog')->where(array('type' => 'down'))->count(); - return View('',['version'=>$version,'count'=>$count]); + return View('',['count'=>$count]); } public function logs() @@ -30,7 +29,7 @@ class Index extends BaseController public function down() { - $version = get_system_config('other','version'); + $version = CMS_VERSION; add_user_log('down', $version.'版本代码'); header("Location: https://www.gougucms.com/storage/gougucms_".$version."_full.zip"); //确保重定向后，后续代码不会被执行 diff --git a/app/home/view/index/index.html b/app/home/view/index/index.html index feb2871..e70454e 100644 --- a/app/home/view/index/index.html +++ b/app/home/view/index/index.html @@ -17,7 +17,7 @@ 立即下载
- 当前版本：{$version} + 当前版本：v{:CMS_VERSION} 更新日志 下载量：{$count}
diff --git a/app/install/view/index/step1.html b/app/install/view/index/step1.html index 1c56357..6ef39c4 100644 --- a/app/install/view/index/step1.html +++ b/app/install/view/index/step1.html @@ -24,11 +24,10 @@ -
勾股CMS安装
+
勾股CMS安装
-
+
  • v{:CMS_VERSION}
    • diff --git a/app/install/view/index/step2.html b/app/install/view/index/step2.html index 0db657c..8f4c6c4 100644 --- a/app/install/view/index/step2.html +++ b/app/install/view/index/step2.html @@ -28,7 +28,7 @@ width="200">
-
+
  • v{:CMS_VERSION}
    • diff --git a/app/install/view/index/step3.html b/app/install/view/index/step3.html index 9fbffdb..3eea3a4 100644 --- a/app/install/view/index/step3.html +++ b/app/install/view/index/step3.html @@ -28,7 +28,7 @@ width="200">
-
+
  • v{:CMS_VERSION}
    • diff --git a/public/index.php b/public/index.php index 840875d..d674e03 100644 --- a/public/index.php +++ b/public/index.php @@ -15,10 +15,10 @@ if (empty(file_exists(__DIR__ . '/../vendor/autoload.php'))) { require __DIR__ . '/../vendor/autoload.php'; // 定义当前版本号 -define('CMS_VERSION','1.21'); +define('CMS_VERSION','1.1.9'); // 定义ThinkPHP版本号 -define('TP_VERSION','6.0.5'); +define('TP_VERSION','6.0.9'); // 定义Layui版本号 define('LAYUI_VERSION','2.6.8');