From ee0ac234b256c1f9d02093d1d1c8c14d412f1c36 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:19:11 +0800 Subject: [PATCH 1/2] * finish task #4220. --- module/custom/view/set.html.php | 10 +++++----- module/score/model.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index ac39c8385e..200f290431 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -21,9 +21,9 @@ $itemRow = << - - - + + + EOT; @@ -54,9 +54,9 @@ EOT; - + - + > diff --git a/module/score/model.php b/module/score/model.php index e3d394f7a0..881642ff13 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -221,7 +221,7 @@ class scoreModel extends model $data->time = empty($time) ? helper::now() : $time; $this->dao->insert(TABLE_SCORE)->data($data)->exec(); - $this->dao->update(TABLE_USER)->set("`score`=`score` + " . $rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec(); + $this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec(); } /** From 057f94defaad88984c14520c4744b99b63f5a8f1 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:20:46 +0800 Subject: [PATCH 2/2] * finish task #4219. --- module/cron/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php index 5bcb8d189c..a769b15faf 100644 --- a/module/cron/lang/zh-cn.php +++ b/module/cron/lang/zh-cn.php @@ -37,7 +37,7 @@ $lang->cron->confirmDelete = '是否删除该计划任务?'; $lang->cron->confirmTurnon = '是否关闭计划任务?'; $lang->cron->introduction = <<计划任务功能可以定时执行诸如更新燃尽图、备份等操作,免除自己布置计划任务。

-

该功能还有待完善,所以默认关闭该功能

+

该功能还有待完善,所以默认关闭该功能。

EOD; $lang->cron->confirmOpen = <<是否开启该功能?打开计划任务

custom->storyReview;?>custom->storyReview;?> custom->reviewList, $needReview);?>
custom->forceReview;?>