修正一些错误

This commit is contained in:
liyukun 2022-04-09 23:45:38 +08:00
parent 81e16ecec4
commit 4ac4947e06
24 changed files with 23 additions and 26 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/composer.lock /composer.lock
/public/install/install.lock /public/install/install.lock
/.constant /.constant
/public/upload

View File

@ -4,15 +4,19 @@
namespace app\common\model; namespace app\common\model;
use think\db\exception\DataNotFoundException;
use think\db\exception\DbException;
use think\db\exception\ModelNotFoundException;
class SystemConfigTab extends BaseModel class SystemConfigTab extends BaseModel
{ {
/** /**
* 列表 * 列表
* @param $where * @param $where
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws DataNotFoundException
* @throws \think\db\exception\DbException * @throws DbException
* @throws \think\db\exception\ModelNotFoundException * @throws ModelNotFoundException
* @author 李玉坤 * @author 李玉坤
* @date 2022-02-28 9:19 * @date 2022-02-28 9:19
*/ */

View File

@ -440,7 +440,7 @@ function make_detail_url($item)
if ($item['link_str']) { if ($item['link_str']) {
return $item['link_str']; return $item['link_str'];
} else { } else {
return url('article/detail?id=' . $item['id'])->build(); return url('article/detail?id=' . $item['alias']?:$item['id'])->build();
} }
} }

View File

@ -41,7 +41,7 @@
<a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a> <a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a>
</h2> </h2>
<div class="post-item-content"> <div class="post-item-content">
<a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['content'],100)}</a> <a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['description'],100)}</a>
</div> </div>
<div class="post-item-info"> <div class="post-item-info">
<div class="post-item-meta"> <div class="post-item-meta">

View File

@ -41,7 +41,7 @@
<a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a> <a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a>
</h2> </h2>
<div class="post-item-content"> <div class="post-item-content">
<a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['content'],100)}</a> <a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['abstract'],100)}</a>
</div> </div>
<div class="post-item-info"> <div class="post-item-info">
<div class="post-item-meta"> <div class="post-item-meta">

View File

@ -41,7 +41,7 @@
<a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a> <a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a>
</h2> </h2>
<div class="post-item-content"> <div class="post-item-content">
<a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['content'],100)}</a> <a target="_blank" href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['abstract'],100)}</a>
</div> </div>
<div class="post-item-info"> <div class="post-item-info">
<div class="post-item-meta"> <div class="post-item-meta">

View File

@ -25,7 +25,7 @@
<div class="post-item-container"> <div class="post-item-container">
<div class="post-item-thumbnail"> <div class="post-item-thumbnail">
<a href="{$field['url']}"> <a href="{$field['url']}">
<img src="__IMG__/loading.gif" data-original="{:file_cdn($field['cover_path'])}" /> <img src="__IMG__/loading.gif" alt="{$field['title']}" data-original="{:file_cdn($field['cover_path'])}" />
</a> </a>
</div> </div>
{notempty name="$field['tags']"} {notempty name="$field['tags']"}
@ -41,7 +41,7 @@
<a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a> <a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a>
</h2> </h2>
<div class="post-item-content" style="white-space: nowrap;text-overflow: ellipsis;"> <div class="post-item-content" style="white-space: nowrap;text-overflow: ellipsis;">
{:cn_substr($field['content'],100)} {:cn_substr($field['abstract'],100)}
</div> </div>
<div class="post-item-info"> <div class="post-item-info">
<div class="post-item-meta"> <div class="post-item-meta">

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<script>NProgress.start();</script> <script>NProgress.start();</script>
<div id="app"> <div id="app" class="app-show">
{include file="public/header" /} {include file="public/header" /}
<div class="top-divider"></div> <div class="top-divider"></div>
<main class="container"> <main class="container">
@ -103,7 +103,7 @@
<div class="post-item-container"> <div class="post-item-container">
<div class="post-item-thumbnail"> <div class="post-item-thumbnail">
<a href="{$field['url']}"> <a href="{$field['url']}">
<img src="__IMG__/loading.gif" data-original="{:file_cdn($field['cover_path'])}"/> <img src="__IMG__/loading.gif" alt="{$field['title']}" data-original="{:file_cdn($field['cover_path'])}"/>
</a> </a>
</div> </div>
{notempty name="$field['tags']"} {notempty name="$field['tags']"}
@ -119,7 +119,7 @@
<a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a> <a href="{$field['url']}" style="white-space: nowrap;text-overflow: ellipsis;">{:cn_substr($field['title'],20)}</a>
</h2> </h2>
<div class="post-item-content" style="white-space: nowrap;text-overflow: ellipsis;"> <div class="post-item-content" style="white-space: nowrap;text-overflow: ellipsis;">
{:cn_substr($field['content'],100)} {:cn_substr($field['description'],100)}
</div> </div>
<div class="post-item-info"> <div class="post-item-info">
<div class="post-item-meta"> <div class="post-item-meta">

View File

@ -1,2 +1,2 @@
/*! Lazy Load 1.9.3 - MIT license - Copyright 2010-2013 Mika Tuupola */ /*! Lazy Load 1.9.7 - MIT license - Copyright 2010-2015 Mika Tuupola */
!function(a,b,c,d){var e=a(b);a.fn.lazyload=function(f){function g(){var b=0;i.each(function(){var c=a(this);if(!j.skip_invisible||c.is(":visible"))if(a.abovethetop(this,j)||a.leftofbegin(this,j));else if(a.belowthefold(this,j)||a.rightoffold(this,j)){if(++b>j.failure_limit)return!1}else c.trigger("appear"),b=0})}var h,i=this,j={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!0,appear:null,load:null,placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"};return f&&(d!==f.failurelimit&&(f.failure_limit=f.failurelimit,delete f.failurelimit),d!==f.effectspeed&&(f.effect_speed=f.effectspeed,delete f.effectspeed),a.extend(j,f)),h=j.container===d||j.container===b?e:a(j.container),0===j.event.indexOf("scroll")&&h.bind(j.event,function(){return g()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,(c.attr("src")===d||c.attr("src")===!1)&&c.is("img")&&c.attr("src",j.placeholder),c.one("appear",function(){if(!this.loaded){if(j.appear){var d=i.length;j.appear.call(b,d,j)}a("<img />").bind("load",function(){var d=c.attr("data-"+j.data_attribute);c.hide(),c.is("img")?c.attr("src",d):c.css("background-image","url('"+d+"')"),c[j.effect](j.effect_speed),b.loaded=!0;var e=a.grep(i,function(a){return!a.loaded});if(i=a(e),j.load){var f=i.length;j.load.call(b,f,j)}}).attr("src",c.attr("data-"+j.data_attribute))}}),0!==j.event.indexOf("scroll")&&c.bind(j.event,function(){b.loaded||c.trigger("appear")})}),e.bind("resize",function(){g()}),/(?:iphone|ipod|ipad).*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent&&b.originalEvent.persisted&&i.each(function(){a(this).trigger("appear")})}),a(c).ready(function(){g()}),this},a.belowthefold=function(c,f){var g;return g=f.container===d||f.container===b?(b.innerHeight?b.innerHeight:e.height())+e.scrollTop():a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return g=f.container===d||f.container===b?e.width()+e.scrollLeft():a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollTop():a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollLeft():a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!(a.rightoffold(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.abovethetop(b,c))},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})}(jQuery,window,document); !function(a,b,c,d){var e=a(b);a.fn.lazyload=function(f){function g(){var b=0;i.each(function(){var c=a(this);if(!j.skip_invisible||c.is(":visible"))if(a.abovethetop(this,j)||a.leftofbegin(this,j));else if(a.belowthefold(this,j)||a.rightoffold(this,j)){if(++b>j.failure_limit)return!1}else c.trigger("appear"),b=0})}var h,i=this,j={threshold:0,failure_limit:0,event:"scroll",effect:"show",container:b,data_attribute:"original",skip_invisible:!1,appear:null,load:null,placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"};return f&&(d!==f.failurelimit&&(f.failure_limit=f.failurelimit,delete f.failurelimit),d!==f.effectspeed&&(f.effect_speed=f.effectspeed,delete f.effectspeed),a.extend(j,f)),h=j.container===d||j.container===b?e:a(j.container),0===j.event.indexOf("scroll")&&h.bind(j.event,function(){return g()}),this.each(function(){var b=this,c=a(b);b.loaded=!1,(c.attr("src")===d||c.attr("src")===!1)&&c.is("img")&&c.attr("src",j.placeholder),c.one("appear",function(){if(!this.loaded){if(j.appear){var d=i.length;j.appear.call(b,d,j)}a("<img />").bind("load",function(){var d=c.attr("data-"+j.data_attribute);c.hide(),c.is("img")?c.attr("src",d):c.css("background-image","url('"+d+"')"),c[j.effect](j.effect_speed),b.loaded=!0;var e=a.grep(i,function(a){return!a.loaded});if(i=a(e),j.load){var f=i.length;j.load.call(b,f,j)}}).attr("src",c.attr("data-"+j.data_attribute))}}),0!==j.event.indexOf("scroll")&&c.bind(j.event,function(){b.loaded||c.trigger("appear")})}),e.bind("resize",function(){g()}),/(?:iphone|ipod|ipad).*os 5/gi.test(navigator.appVersion)&&e.bind("pageshow",function(b){b.originalEvent&&b.originalEvent.persisted&&i.each(function(){a(this).trigger("appear")})}),a(c).ready(function(){g()}),this},a.belowthefold=function(c,f){var g;return g=f.container===d||f.container===b?(b.innerHeight?b.innerHeight:e.height())+e.scrollTop():a(f.container).offset().top+a(f.container).height(),g<=a(c).offset().top-f.threshold},a.rightoffold=function(c,f){var g;return g=f.container===d||f.container===b?e.width()+e.scrollLeft():a(f.container).offset().left+a(f.container).width(),g<=a(c).offset().left-f.threshold},a.abovethetop=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollTop():a(f.container).offset().top,g>=a(c).offset().top+f.threshold+a(c).height()},a.leftofbegin=function(c,f){var g;return g=f.container===d||f.container===b?e.scrollLeft():a(f.container).offset().left,g>=a(c).offset().left+f.threshold+a(c).width()},a.inviewport=function(b,c){return!(a.rightoffold(b,c)||a.leftofbegin(b,c)||a.belowthefold(b,c)||a.abovethetop(b,c))},a.extend(a.expr[":"],{"below-the-fold":function(b){return a.belowthefold(b,{threshold:0})},"above-the-top":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-screen":function(b){return a.rightoffold(b,{threshold:0})},"left-of-screen":function(b){return!a.rightoffold(b,{threshold:0})},"in-viewport":function(b){return a.inviewport(b,{threshold:0})},"above-the-fold":function(b){return!a.belowthefold(b,{threshold:0})},"right-of-fold":function(b){return a.rightoffold(b,{threshold:0})},"left-of-fold":function(b){return!a.rightoffold(b,{threshold:0})}})}(jQuery,window,document);

View File

@ -39,7 +39,7 @@
<div class="footer-details footer-right"> <div class="footer-details footer-right">
<div> <div>
<div class="footer-aside-box"> <div class="footer-aside-box">
<img width="100" height="50" src="{:file_cdn(web_config('logo'))}" class="image wp-image-352 attachment-200x50 size-200x50" alt="" loading="lazy" style="max-width: 100%; height: auto"/> <img width="100" height="50" src="{:file_cdn(web_config('logo'))}" class="image wp-image-352 attachment-200x50 size-200x50" alt="" style="max-width: 100%; height: auto"/>
</div> </div>
</div> </div>
</div> </div>

View File

@ -125,7 +125,7 @@
<ul class="user-menu"> <ul class="user-menu">
<li> <li>
<a class="user-menu-main"> <a class="user-menu-main">
<img class="user-avatar" width="30" height="30" src="{$user_info.avatar}" onerror="javascript:this.src='__IMG__/avatar.png';"> <img class="user-avatar" width="30" height="30" src="{$user_info.avatar}" onerror="this.src='__IMG__/avatar.png';">
<span class="user-menu-name">{$user_info.username}</span> <span class="user-menu-name">{$user_info.username}</span>
</a> </a>
<ul class="user-sub-menu sub-menu"> <ul class="user-sub-menu sub-menu">

View File

@ -501,7 +501,7 @@
function updateavatar() { function updateavatar() {
if ($("#avatar-view").attr("src") == null) { if ($("#avatar-view").attr("src") == null) {
return;
} else { } else {
addarelt('上传中,请稍后'); addarelt('上传中,请稍后');
var cas = $('#avatar-view').cropper('getCroppedCanvas'); //获取被裁剪后的canvas var cas = $('#avatar-view').cropper('getCroppedCanvas'); //获取被裁剪后的canvas

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB