From d7d51815bb45e5b11e0ea7c41de16cf9174c48aa Mon Sep 17 00:00:00 2001
From: "DESKTOP-B7F3Q04\\admin" <18722597581>
Date: Tue, 22 Mar 2022 14:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E5=88=8A=E5=88=86=E6=9C=9F=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Journal.php    |  3 +--
 application/master/controller/Journal.php | 33 ++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index dc5b563..9f9bafa 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -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);
     }
-
 }
diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index 26ca9ff..15e22ef 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -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()]);
+            }
+        }
+    }
 }