diff --git a/app/admin/controller/Category.php b/app/admin/controller/Category.php
index 42cd712..261f88a 100644
--- a/app/admin/controller/Category.php
+++ b/app/admin/controller/Category.php
@@ -64,7 +64,7 @@ class Category extends AuthController
['link_str', ''],
['content', ''],
['sort', 0],
- ['display', 1]
+ ['status', 1]
]);
if ($data['title'] == "") return app("json")->fail("分类名称不能为空");
if ($data['type'] == "") return app("json")->fail("类型不能为空");
diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html
index c0d622c..dde80f5 100644
--- a/app/admin/view/article/add.html
+++ b/app/admin/view/article/add.html
@@ -31,9 +31,9 @@
diff --git a/app/admin/view/public/notice.html b/app/admin/view/public/notice.html
index 1c488b6..a22e24d 100644
--- a/app/admin/view/public/notice.html
+++ b/app/admin/view/public/notice.html
@@ -4,14 +4,10 @@
页面提醒 - {:system_config("title")}后台管理系统
-
-
-
-
+
+
+
+
@@ -56,8 +52,7 @@
This page will be re-directed in 3
seconds
{/if}
- 返回页面
+ 返回页面
diff --git a/app/admin/view/system_config/base.html b/app/admin/view/system_config/base.html
index 435ca1f..0a53f24 100644
--- a/app/admin/view/system_config/base.html
+++ b/app/admin/view/system_config/base.html
@@ -68,7 +68,7 @@
$tmp = explode("=>",$v);
$checked = $tmp[0] == $vo["value"] ? 'checked' : '';
echo '';
}
diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php
index 2ede941..42b97b7 100644
--- a/app/index/controller/Article.php
+++ b/app/index/controller/Article.php
@@ -188,10 +188,10 @@ class Article extends Base
if ($data['email'] == "") $this->error("邮箱不能为空");
if ($data['url'] == "") $this->error("url不能为空");
if ($data['content'] == "") $this->error("内容能为空");
- $data['status'] = 0;
+ $data['status'] = web_config('comment_review')?0:1;
$res = commentModel::create($data);
if ($res) {
- $this->success('申请成功，请耐心等待审核');
+ $this->success('提交成功');
} else {
$this->error('提交失败，请联系站长查看', null);
}
diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php
index 71b7b33..37acf76 100644
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@@ -80,7 +80,7 @@ class Index extends Base
}
/**
- * 友链申请
+ * 留言
* @param Request $request
* @return string
* @throws \think\db\exception\DataNotFoundException
diff --git a/public/template/default/pc/article/article.html b/public/template/default/pc/article/article.html
index 3e8a558..0ee952e 100644
--- a/public/template/default/pc/article/article.html
+++ b/public/template/default/pc/article/article.html
@@ -206,7 +206,6 @@
沙发空余
{/if}
-
{/ape:comment}
@@ -260,32 +258,29 @@
diff --git a/public/template/default/pc/js/TagCloud.js b/public/template/default/pc/js/TagCloud.js
index defd82e..8e379a9 100644
--- a/public/template/default/pc/js/TagCloud.js
+++ b/public/template/default/pc/js/TagCloud.js
@@ -3,478 +3,4 @@
* Copyright (c) 2016-2021 @ Cong Min & applek
* WordPress CorePress Theme
*/
-(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
- typeof define === 'function' && define.amd ? define(factory) :
- (global = global || self, global.TagCloud = factory());
-}(this, (function () {
- 'use strict';
-
- function _classCallCheck(instance, Constructor) {
- if (!(instance instanceof Constructor)) {
- throw new TypeError("Cannot call a class as a function");
- }
- }
-
- function _defineProperties(target, props) {
- for (var i = 0; i < props.length; i++) {
- var descriptor = props[i];
- descriptor.enumerable = descriptor.enumerable || false;
- descriptor.configurable = true;
- if ("value" in descriptor) descriptor.writable = true;
- Object.defineProperty(target, descriptor.key, descriptor);
- }
- }
-
- function _createClass(Constructor, protoProps, staticProps) {
- if (protoProps) _defineProperties(Constructor.prototype, protoProps);
- if (staticProps) _defineProperties(Constructor, staticProps);
- return Constructor;
- }
-
- function _defineProperty(obj, key, value) {
- if (key in obj) {
- Object.defineProperty(obj, key, {
- value: value,
- enumerable: true,
- configurable: true,
- writable: true
- });
- } else {
- obj[key] = value;
- }
-
- return obj;
- }
-
- function _extends() {
- _extends = Object.assign || function (target) {
- for (var i = 1; i < arguments.length; i++) {
- var source = arguments[i];
-
- for (var key in source) {
- if (Object.prototype.hasOwnProperty.call(source, key)) {
- target[key] = source[key];
- }
- }
- }
-
- return target;
- };
-
- return _extends.apply(this, arguments);
- }
-
- function ownKeys(object, enumerableOnly) {
- var keys = Object.keys(object);
-
- if (Object.getOwnPropertySymbols) {
- var symbols = Object.getOwnPropertySymbols(object);
- if (enumerableOnly) symbols = symbols.filter(function (sym) {
- return Object.getOwnPropertyDescriptor(object, sym).enumerable;
- });
- keys.push.apply(keys, symbols);
- }
-
- return keys;
- }
-
- function _objectSpread2(target) {
- for (var i = 1; i < arguments.length; i++) {
- var source = arguments[i] != null ? arguments[i] : {};
-
- if (i % 2) {
- ownKeys(Object(source), true).forEach(function (key) {
- _defineProperty(target, key, source[key]);
- });
- } else if (Object.getOwnPropertyDescriptors) {
- Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
- } else {
- ownKeys(Object(source)).forEach(function (key) {
- Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
- });
- }
- }
-
- return target;
- }
-
- /**
- * TagCloud.js (c) 2016-2019 @ Cong Min
- * MIT License - https://github.com/mcc108/TagCloud
- */
- var TagCloud = /*#__PURE__*/function () {
- /* constructor */
- function TagCloud() {
- var container = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document.body;
- var texts = arguments.length > 1 ? arguments[1] : undefined;
- var options = arguments.length > 2 ? arguments[2] : undefined;
- var clors = arguments.length > 3 ? arguments[3] : undefined;
-
-
- _classCallCheck(this, TagCloud);
-
- var self = this;
- if (!container || container.nodeType !== 1) return new Error('Incorrect element type'); // params
-
- self.$container = container;
- self.texts = texts || [];
- self.clors = clors || [];
- self.config = _objectSpread2(_objectSpread2({}, TagCloud._defaultConfig), options || {}); // calculate config
-
- self.radius = self.config.radius; // rolling radius
-
- self.depth = 2 * self.radius; // rolling depth
-
- self.size = 1.5 * self.radius; // rolling area size with mouse
-
- self.maxSpeed = TagCloud._getMaxSpeed(self.config.maxSpeed); // rolling max speed
-
- self.initSpeed = TagCloud._getInitSpeed(self.config.initSpeed); // rolling init speed
-
- self.direction = self.config.direction; // rolling init direction
-
- self.keep = self.config.keep; // whether to keep rolling after mouse out area
-
- self.paused = false; // keep state to pause the animation
- // create element
-
- self._createElment(); // init
-
-
- self._init(); // set elements and instances
-
-
- TagCloud.list.push({
- el: self.$el,
- container: container,
- instance: self
- });
- }
-
- /* static method */
- // all TagCloud list
-
-
- _createClass(TagCloud, [{
- key: "_createElment",
-
- /* instance property method */
- // create elment
- value: function _createElment() {
- var self = this; // create container
-
- var $el = document.createElement('div');
- $el.className = self.config.containerClass;
-
- if (self.config.useContainerInlineStyles) {
- $el.style.position = 'relative';
- //$el.style.width = "".concat(2 * self.radius, "px");
- $el.style.height = "".concat(2 * self.radius, "px");
- } // create texts
- self.items = [];
- self.texts.forEach(function (text, index) {
- var item = self._createTextItem(text, index);
-
- $el.appendChild(item.el);
- self.items.push(item);
- });
- self.$container.appendChild($el);
- self.$el = $el;
- } // create a text
- }, {
- key: "_createTextItem",
- value: function _createTextItem(text) {
- var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
- var self = this;
- var itemEl = document.createElement('span');
- itemEl.className = self.config.itemClass;
-
- itemEl.setAttribute('tag_id', index);
- var backcolor = self.clors[Math.floor((Math.random() * self.clors.length))];
-
- if (self.config.useItemInlineStyles) {
- itemEl.style.willChange = 'transform, opacity, filter';
- itemEl.style.position = 'absolute';
- itemEl.style.top = '50%';
- itemEl.style.backgroundColor = backcolor;
- itemEl.style.left = '50%';
- itemEl.style.zIndex = index + 1;
- itemEl.style.filter = 'alpha(opacity=0)';
- itemEl.style.opacity = 0;
- }
-
- //itemEl.innerText = text;
- itemEl.innerHTML = '' + text.text + '';
- return _objectSpread2({
- el: itemEl
- }, self._computePosition(index));
- } // calculate appropriate place
-
- }, {
- key: "_computePosition",
- value: function _computePosition(index) {
- var random = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
- var self = this;
- var textsLength = self.texts.length; // if random `true`, It means that a random appropriate place is generated, and the position will be independent of `index`
-
- if (random) index = Math.floor(Math.random() * (textsLength + 1));
- var phi = Math.acos(-1 + (2 * index + 1) / textsLength);
- var theta = Math.sqrt((textsLength + 1) * Math.PI) * phi;
- return {
- x: self.size * Math.cos(theta) * Math.sin(phi) / 2,
- y: self.size * Math.sin(theta) * Math.sin(phi) / 2,
- z: self.size * Math.cos(phi) / 2
- };
- }
- }, {
- key: "_requestInterval",
- value: function _requestInterval(fn, delay) {
- var requestAnimFrame = (function () {
- return window.requestAnimationFrame;
- } || function (callback, element) {
- window.setTimeout(callback, 1000 / 60);
- })();
-
- var start = new Date().getTime();
- var handle = {};
-
- function loop() {
- handle.value = requestAnimFrame(loop);
- var current = new Date().getTime(),
- delta = current - start;
-
- if (delta >= delay) {
- fn.call();
- start = new Date().getTime();
- }
- }
-
- handle.value = requestAnimFrame(loop);
- return handle;
- } // init
-
- }, {
- key: "_init",
- value: function _init() {
- var self = this;
- self.active = false; // whether the mouse is activated
-
- self.mouseX0 = self.initSpeed * Math.sin(self.direction * (Math.PI / 180)); // init distance between the mouse and rolling center x axis
-
- self.mouseY0 = -self.initSpeed * Math.cos(self.direction * (Math.PI / 180)); // init distance between the mouse and rolling center y axis
-
- self.mouseX = self.mouseX0; // current distance between the mouse and rolling center x axis
-
- self.mouseY = self.mouseY0; // current distance between the mouse and rolling center y axis
- // mouseover
-
- TagCloud._on(self.$el, 'mouseover', function () {
- self.active = true;
- }); // mouseout
-
- TagCloud._on(self.$el, 'click', function (e) {
- if (e.target.className == self.config.itemClass) {
- console.log(e.target.getAttribute('tag_id'));
- }
- });
-
- TagCloud._on(self.$el, 'mouseout', function () {
- self.active = false;
- }); // mousemove
-
-
- TagCloud._on(self.keep ? window : self.$el, 'mousemove', function (ev) {
- ev = ev || window.event;
- var rect = self.$el.getBoundingClientRect();
- self.mouseX = (ev.clientX - (rect.left + rect.width / 2)) / 5;
- self.mouseY = (ev.clientY - (rect.top + rect.height / 2)) / 5;
- }); // update state regularly
-
-
- self._next(); // init update state
-
-
- self.interval = self._requestInterval(function () {
- self._next.call(self);
- }, 10);
- } // calculate the next state
-
- }, {
- key: "_next",
- value: function _next() {
- var self = this;
-
- if (self.paused) {
- return;
- } // if keep `false`, pause rolling after moving mouse out area
-
-
- if (!self.keep && !self.active) {
- self.mouseX = Math.abs(self.mouseX - self.mouseX0) < 1 ? self.mouseX0 : (self.mouseX + self.mouseX0) / 2; // reset distance between the mouse and rolling center x axis
-
- self.mouseY = Math.abs(self.mouseY - self.mouseY0) < 1 ? self.mouseY0 : (self.mouseY + self.mouseY0) / 2; // reset distance between the mouse and rolling center y axis
- }
-
- var a = -(Math.min(Math.max(-self.mouseY, -self.size), self.size) / self.radius) * self.maxSpeed;
- var b = Math.min(Math.max(-self.mouseX, -self.size), self.size) / self.radius * self.maxSpeed;
- if (Math.abs(a) <= 0.01 && Math.abs(b) <= 0.01) return; // pause
- // calculate offset
-
- var l = Math.PI / 180;
- var sc = [Math.sin(a * l), Math.cos(a * l), Math.sin(b * l), Math.cos(b * l)];
- self.items.forEach(function (item) {
- var rx1 = item.x;
- var ry1 = item.y * sc[1] + item.z * -sc[0];
- var rz1 = item.y * sc[0] + item.z * sc[1];
- var rx2 = rx1 * sc[3] + rz1 * sc[2];
- var ry2 = ry1;
- var rz2 = rz1 * sc[3] - rx1 * sc[2];
- var per = 2 * self.depth / (2 * self.depth + rz2); // todo
-
- item.x = rx2;
- item.y = ry2;
- item.z = rz2;
- item.scale = per.toFixed(3);
- var alpha = per * per - 0.25;
- alpha = (alpha > 1 ? 1 : alpha).toFixed(3);
- var itemEl = item.el;
- var left = (item.x - itemEl.offsetWidth / 2).toFixed(2);
- var top = (item.y - itemEl.offsetHeight / 2).toFixed(2);
- var transform = "translate3d(".concat(left, "px, ").concat(top, "px, 0) scale(").concat(item.scale, ")");
- itemEl.style.WebkitTransform = transform;
- itemEl.style.MozTransform = transform;
- itemEl.style.OTransform = transform;
- itemEl.style.transform = transform;
- itemEl.style.filter = "alpha(opacity=".concat(100 * alpha, ")");
- itemEl.style.opacity = alpha;
- });
- }
- /* export instance properties and methods */
- // update
-
- }, {
- key: "update",
- value: function update(texts) {
- var self = this; // params
-
- self.texts = texts || []; // judging and processing items based on texts
-
- self.texts.forEach(function (text, index) {
- var item = self.items[index];
-
- if (!item) {
- // if not had, then create
- item = self._createTextItem(text, index);
- _extends(item, self._computePosition(index, true)); // random place
- self.$el.appendChild(item.el);
- self.items.push(item);
- } // if had, replace text
- item.el.innerText = text;
- }); // remove redundant self.items
-
- var textsLength = self.texts.length;
- var itemsLength = self.items.length;
-
- if (textsLength < itemsLength) {
- var removeList = self.items.splice(textsLength, itemsLength - textsLength);
- removeList.forEach(function (item) {
- self.$el.removeChild(item.el);
- });
- }
- } // destroy
-
- }, {
- key: "destroy",
- value: function destroy() {
- var self = this;
- self.interval = null; // clear in TagCloud.list
-
- var index = TagCloud.list.findIndex(function (e) {
- return e.el === self.$el;
- });
- if (index !== -1) TagCloud.list.splice(index, 1); // clear element
-
- if (self.$container && self.$el) {
- self.$container.removeChild(self.$el);
- }
- }
- }, {
- key: "pause",
- value: function pause() {
- var self = this;
- self.paused = true;
- }
- }, {
- key: "resume",
- value: function resume() {
- var self = this;
- self.paused = false;
- }
- }], [{
- key: "_on",
- // event listener
- value: function _on(el, ev, handler, cap) {
- if (el.addEventListener) {
- el.addEventListener(ev, handler, cap);
- } else if (el.attachEvent) {
- el.attachEvent("on".concat(ev), handler);
- } else {
- el["on".concat(ev)] = handler;
- }
- }
- }]);
-
- return TagCloud;
- }();
-
- TagCloud.list = [];
- TagCloud._defaultConfig = {
- radius: 100,
- // rolling radius, unit `px`
- maxSpeed: 'normal',
- // rolling max speed, optional: `slow`, `normal`(default), `fast`
- initSpeed: 'normal',
- // rolling init speed, optional: `slow`, `normal`(default), `fast`
- direction: 135,
- // rolling init direction, unit clockwise `deg`, optional: `0`(top) , `90`(left), `135`(right-bottom)(default)...
- keep: true,
- // whether to keep rolling after mouse out area, optional: `false`, `true`(default)(decelerate to rolling init speed, and keep rolling with mouse)
- useContainerInlineStyles: true,
- useItemInlineStyles: true,
- containerClass: 'corepress-tagcloud',
- itemClass: 'tagcloud--item'
- };
-
- TagCloud._getMaxSpeed = function (name) {
- return {
- slow: 0.5,
- normal: 1,
- fast: 2
- }[name] || 1;
- };
-
- TagCloud._getInitSpeed = function (name) {
- return {
- slow: 16,
- normal: 32,
- fast: 80
- }[name] || 32;
- };
-
- var index = (function (els, texts, options, colors) {
- if (typeof els === 'string') els = document.querySelectorAll(els);
- if (!els.forEach) els = [els];
- var instances = [];
- els.forEach(function (el) {
- if (el) {
- instances.push(new TagCloud(el, texts, options, colors));
- }
- });
-
- return instances.length <= 1 ? instances[0] : instances;
- });
-
- return index;
-
-})));
+(function(g,k){"object"===typeof exports&&"undefined"!==typeof module?module.exports=k():"function"===typeof define&&define.amd?define(k):(g=g||self,g.TagCloud=k())})(this,function(){function g(c,a){for(var b=0;b=b&&(a.call(),f=(new Date).getTime())}var c=window.requestAnimationFrame,f=(new Date).getTime(),h={};h.value=c(d);return h}},{key:"_init",value:function(){var a=this;a.active=!1;a.mouseX0=a.initSpeed*Math.sin(Math.PI/180*a.direction);a.mouseY0=-a.initSpeed*Math.cos(Math.PI/180*a.direction);a.mouseX=a.mouseX0;a.mouseY=a.mouseY0;c._on(a.$el,"mouseover",function(){a.active=!0});c._on(a.$el,"click",function(b){b.target.className==a.config.itemClass&&console.log(b.target.getAttribute("tag_id"))});c._on(a.$el,"mouseout",function(){a.active=!1});c._on(a.keep?window:a.$el,"mousemove",function(b){b=b||window.event;var d=a.$el.getBoundingClientRect();a.mouseX=(b.clientX-(d.left+d.width/2))/5;a.mouseY=(b.clientY-(d.top+d.height/2))/5});a._next();a.interval=a._requestInterval(function(){a._next.call(a)},10)}},{key:"_next",value:function(){var a=this;if(!a.paused){a.keep||a.active||(a.mouseX=1>Math.abs(a.mouseX-a.mouseX0)?a.mouseX0:(a.mouseX+a.mouseX0)/2,a.mouseY=1>Math.abs(a.mouseY-a.mouseY0)?a.mouseY0:(a.mouseY+a.mouseY0)/2);var b=-(Math.min(Math.max(-a.mouseY,-a.size),a.size)/a.radius)*a.maxSpeed,d=Math.min(Math.max(-a.mouseX,-a.size),a.size)/a.radius*a.maxSpeed;if(!(.01>=Math.abs(b)&&.01>=Math.abs(d))){var c=Math.PI/180,f=[Math.sin(b*c),Math.cos(b*c),Math.sin(d*c),Math.cos(d*c)];a.items.forEach(function(b){var d=b.x,c=b.y*f[1]+b.z*-f[0],e=b.y*f[0]+b.z*f[1],h=e*f[3]-d*f[2],g=2*a.depth/(2*a.depth+h);b.x=d*f[3]+e*f[2];b.y=c;b.z=h;b.scale=g.toFixed(3);d=g*g-.25;d=(1=e.length?e[0]:e}});
\ No newline at end of file
diff --git a/public/template/default/pc/public/header.html b/public/template/default/pc/public/header.html
index 1c53624..1dc7fab 100644
--- a/public/template/default/pc/public/header.html
+++ b/public/template/default/pc/public/header.html
@@ -3,16 +3,15 @@