diff --git a/control/admin.php b/control/admin.php index 47983c5..ce38146 100644 --- a/control/admin.php +++ b/control/admin.php @@ -103,7 +103,7 @@ class admin extends publicBase { $condition['uid'] = 0; } if ($status == 0) { - $condition['is_delete'] = array(0, 2); + $condition['is_delete'] = array(0, 2, 3); } elseif ($status == 1) { $condition['is_delete'] = 2; } elseif ($status == 2) { @@ -153,7 +153,7 @@ class admin extends publicBase { $id = $mformula->saveFormula(0, $id, $name, $source, $method, $herbs); if (!$id) $this->ajax_json(false, $mformula->getError()); - $this->ajax_json(true, '请求成功', array('id' => $id)); + $this->ajax_json(true, '操作成功', array('id' => $id)); } public function ajax_delete_formula() { @@ -164,6 +164,6 @@ class admin extends publicBase { $id = $mformula->deleteFormula(0, $id, $is_delete); if (!$id) $this->ajax_json(false, $mformula->getError()); - $this->ajax_json(true, '请求成功'); + $this->ajax_json(true, '操作成功'); } } diff --git a/view/templates/admin/formula_add.html b/view/templates/admin/formula_add.html index 5502187..8a7e8c2 100644 --- a/view/templates/admin/formula_add.html +++ b/view/templates/admin/formula_add.html @@ -16,13 +16,16 @@