zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
Administrator
2022-03-22 15:00:25 +08:00
parent 93ed7490ab d7d51815bb
commit f7cdbd7c4c
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/controller/Journal.php
View File

@@ -1243,7 +1243,7 @@ class Journal extends Controller {
} else {
$frag = $list;
}
$re['topic_show_type'] = $this->journal_obj->where(['journal_id'=> $data['journal_id'],'state'=>0])->value('topic_show_type');
$re['stages'] = $frag;
return jsonSuccess($re);
}
@@ -1781,5 +1781,4 @@ class Journal extends Controller {
$re['count'] = $count;
return jsonSuccess($re);
}
}

33
application/master/controller/Journal.php
View File

@@ -129,6 +129,7 @@ class Journal extends Controller {
* @param name:system_color type:string require:1
* @param name:submission_url type:string require:1
* @param name:board_url type:string require:1 desc:编委会地址
* @param name:topic_show_type type:int require:1 desc:0无图片1有图片
*/
public function addJournal(){
$data = $this->request->post();
@@ -150,6 +151,7 @@ class Journal extends Controller {
$insert_data['system_color'] = $data['system_color'];
$insert_data['submission_url'] = $data['submission_url'];
$insert_data['board_url'] = $data['board_url'];
$insert_data['topic_show_type'] = $data['topic_show_type'];
$res = $this->journal_obj->insert($insert_data);
if($res){
return json(['code'=>0,'msg'=>'success']);
@@ -207,6 +209,7 @@ class Journal extends Controller {
* @param name:system_color type:string require:1
* @param name:submission_url type:string require:1
* @param name:board_url type:string require:1 desc:编委会地址
* @param name:topic_show_type type:int require:1 desc:0无图片1有图片
*/
public function editJournalDetail(){
$data = $this->request->post();
@@ -229,6 +232,7 @@ class Journal extends Controller {
$insert_data['system_color'] = $data['system_color'];
$insert_data['submission_url'] = $data['submission_url'];
$insert_data['board_url'] = $data['board_url'];
$insert_data['topic_show_type'] = $data['topic_show_type'];
$res = $this->journal_obj->where('journal_id',$data['journal_id'])->update($insert_data);
// if($res){
return json(['code'=>0,'msg'=>'success']);
@@ -1027,6 +1031,7 @@ class Journal extends Controller {
* @param name:is_publish type:int require:1 default:1 desc:是否出刊
* @param name:stage_page type:string require:1 desc:分期页码
* @param name:issue_date type:string require:1 desc:发布时间
* @param name:stage_icon type:string require:0 desc:期刊封面url
*/
public function addStage(){
$data = $this->request->post();
@@ -1037,6 +1042,9 @@ class Journal extends Controller {
$insert_data['stage_pagename'] = $data['stage_pagename'];
$insert_data['stage_page'] = $data['stage_page'];
$insert_data['issue_date'] = $data['issue_date'];
if(isset($data['stage_icon']) && !empty($data['stage_icon'])){
$insert_data['stage_icon'] = $data['stage_icon'];
}
$res = $this->journal_stage_obj->insert($insert_data);
if($res){
return json(['code'=>0,'msg'=>'success']);
@@ -1098,6 +1106,7 @@ class Journal extends Controller {
* @param name:stage_pagename type:string require:1 desc:分期页码name
* @param name:stage_page type:string require:1 desc:分期页码
* @param name:issue_date type:string require:1 desc:发布时间
* @param name:stage_icon type:string require:0 desc:封面url
*/
public function editStage(){
$data = $this->request->post();
@@ -1915,5 +1924,27 @@ class Journal extends Controller {
$re['articleLists'] = $list;
return jsonSuccess($re);
}
/**
* @title 期刊分期--封面图片上传
* @description 期刊分期--封面图片上传
* @author wangjinlei
* @url /master/Journal/up_stage_icon
* @method POST
*
* @param name:stage_icon type:string require:1 desc:封面图片
*
* @return url:图片地址
*/
public function upStageIcon(){
$file = request()->file('stage_icon');
if ($file) {
$info = $file->move(ROOT_PATH . 'public' . DS . 'journalstage');
if ($info) {
return json(['code'=>0 , 'msg'=>'success', 'url' => str_replace("\\", "/", 'journalstage/'.$info->getSaveName())]);
} else {
return json(['code' => 1, 'msg' => $file->getError()]);
}
}
}
}