1
This commit is contained in:
2
.env
2
.env
@@ -179,7 +179,7 @@ net = '</p>
|
||||
<tr style="font-family:sans-serif; vertical-align: top;font-size: 12px;">
|
||||
<td width="750" height="40" colspan="0" rowspan="0">
|
||||
<p style="margin: 5px 30px 10px 30px;line-height: 20px">
|
||||
This email was sent to tmr@tmrjournals.com and is specific to the recipient.
|
||||
This email was sent to {{email}} and is specific to the recipient.
|
||||
If you have received this email in error please delete it and notify the sender immediately.
|
||||
</p>
|
||||
<p style="margin: 0 30px 10px 30px;line-height: 20px">
|
||||
|
||||
@@ -189,6 +189,25 @@ class Production extends Controller
|
||||
return jsonSuccess($re);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取生产实例列表
|
||||
*/
|
||||
public function getProductionDetail(){
|
||||
$data = $this->request->post();
|
||||
$rule = new Validate([
|
||||
'p_article_id'=>'require|number'
|
||||
]);
|
||||
if(!$rule->check($data)){
|
||||
return jsonError($rule->getError());
|
||||
}
|
||||
$p_info = $this->production_article_obj->where('p_article_id',$data['p_article_id'])->find();
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加作者机构
|
||||
*/
|
||||
@@ -196,7 +215,7 @@ class Production extends Controller
|
||||
$data = $this->request->post();
|
||||
$rule = new Validate([
|
||||
'p_article_id'=>'require|number',
|
||||
'argan_name'=>'require'
|
||||
'organ_name'=>'require'
|
||||
]);
|
||||
if(!$rule->check($data)){
|
||||
return jsonError($rule->getError());
|
||||
@@ -351,7 +370,15 @@ class Production extends Controller
|
||||
* 上传文件
|
||||
*/
|
||||
public function up_file(){
|
||||
|
||||
$file = request()->file('pdf');
|
||||
if ($file) {
|
||||
$info = $file->move(ROOT_PATH . 'public' . DS . 'pdf');
|
||||
if ($info) {
|
||||
return json(['code' => 0, 'upurl' => str_replace("\\", "/", $info->getSaveName())]);
|
||||
} else {
|
||||
return json(['code' => 1, 'msg' => $file->getError()]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -752,7 +752,7 @@ class Reviewer extends Controller
|
||||
$in_data['state_from'] = $article_info['state'];
|
||||
$in_data['state_to'] = $article_info['state'];
|
||||
$in_data['ctime'] = time();
|
||||
$this->article_msg_obj->insert($in_data);
|
||||
// $this->article_msg_obj->insert($in_data);
|
||||
|
||||
//记录log
|
||||
//生成pdf文件
|
||||
@@ -1041,7 +1041,7 @@ class Reviewer extends Controller
|
||||
$in_data['state_from'] = $article_info['state'];
|
||||
$in_data['state_to'] = $article_info['state'];
|
||||
$in_data['ctime'] = time();
|
||||
$this->article_msg_obj->insert($in_data);
|
||||
// $this->article_msg_obj->insert($in_data);
|
||||
|
||||
|
||||
$re['art_rev_id'] = $res;
|
||||
@@ -1082,7 +1082,7 @@ class Reviewer extends Controller
|
||||
$insert_data['state_from'] = $article_info['state'];
|
||||
$insert_data['state_to'] = $article_info['state'];
|
||||
$insert_data['ctime'] = time();
|
||||
$this->article_msg_obj->insert($insert_data);
|
||||
// $this->article_msg_obj->insert($insert_data);
|
||||
|
||||
$this->article_reviewer_obj->where('art_rev_id', $data['art_rev_id'])->update(['state' => 0]);
|
||||
return jsonSuccess([]);
|
||||
|
||||
@@ -72,6 +72,7 @@ function sendEmail($email = '', $title = '', $from_name = '', $content = '', $me
|
||||
//组合邮件模板的头尾
|
||||
$pre = Env::get('emailtemplete.pre');
|
||||
$net = Env::get('emailtemplete.net');
|
||||
$net = str_replace("{{email}}",$memail,$net);
|
||||
|
||||
$mail->msgHTML($pre.$content.$net);
|
||||
//Replace the plain text body with one created manually
|
||||
|
||||
Reference in New Issue
Block a user