From 111241fa705dc976580731e76565e619bb3dba0c Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 16 May 2022 12:18:36 +0800
Subject: [PATCH] 1

---
 application/api/controller/Journal.php    | 2 +-
 application/api/controller/Special.php    | 4 +++-
 application/master/controller/Article.php | 8 +++++---
 application/master/controller/Journal.php | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index 45d49cb..ab5af81 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -141,8 +141,8 @@ class Journal extends Controller {
         $list = $this->footer_obj->where($where)->order('sort desc')->select();
         $frag = [];
         $frag['Publishing Policy'] = [];
-        $frag['Join Us'] = [];
         $frag['Products'] = [];
+        $frag['Join Us'] = [];
         $frag['Cooperate with Us'] = [];
         $frag['Publisher Information'] = [];
         foreach ($list as $v) {
diff --git a/application/api/controller/Special.php b/application/api/controller/Special.php
index 86dfc07..203dbf6 100644
--- a/application/api/controller/Special.php
+++ b/application/api/controller/Special.php
@@ -258,7 +258,9 @@ class Special extends Controller {
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
         $list = $this->journal_special_obj
                 ->where('journal_id',$data['journal_id'])
-                ->where('state',2)->order('journal_special_id desc')
+                ->where('state',2)
+                // ->order('journal_special_id desc')
+                ->order('deadline desc')
                 ->limit($limit_start,$data['pageSize'])
                 ->select();
         //获取作者
diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index cadf9c1..2a3e313 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -438,6 +438,7 @@ class Article extends Controller {
      * @param name:icon type:string require:1 desc:图片
      * @param name:tradition_tag type:string require:1 desc:封皮标签
      * @param name:tradition type:string require:1 desc:封皮简介
+     * @param name:mhoo type:string require:1 desc:Medical history of objective
      * @param name:journal_stage_id type:int require:1 desc:期刊分期id
      * @param name:journal_special_id type:int require:1 desc:客座期刊id
      * @param name:doi type:string require:1 desc:doi
@@ -467,6 +468,7 @@ class Article extends Controller {
         $updata['journal_special_id'] = $data['journal_special_id'];
         $updata['tradition_tag'] = $data['tradition_tag'];
         $updata['tradition'] = $data['tradition'];
+        $updata['mhoo'] = $data['mhoo'];
         $updata['doi'] = $data['doi'];
         $updata['abstract'] = $data['abstract'];
         $updata['keywords'] = $data['keywords'];
@@ -1187,9 +1189,9 @@ class Article extends Controller {
     }
 
     private function myPost($url, $param = array()) {
-        if (!is_array($param)) {
-            throw new Exception("参数必须为array");
-        }
+        // if (!is_array($param)) {
+        //     throw new Exception("参数必须为array");
+        // }
         $httph = curl_init($url);
         curl_setopt($httph, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($httph, CURLOPT_USERAGENT, "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)");
diff --git a/application/master/controller/Journal.php b/application/master/controller/Journal.php
index b9c037e..f6d8038 100644
--- a/application/master/controller/Journal.php
+++ b/application/master/controller/Journal.php
@@ -1254,7 +1254,7 @@ class Journal extends Controller  {
         $tt2 = 'Email: '.$journal_info['email'].'<br>';
         $tt2 .= 'Website: https://www.tmrjournals.com/'.$journal_info['usx'].'<br><br>';
         $tt2 .= 'TMR Publishing Group Ltd.<br>';
-        $tt2 .= '11 Cockle Bay Rd, Cockle Bay, Auckland, New Zealand<br>';
+        $tt2 .= 'Auckland, New Zealand<br>';
         $tt2 .= 'Tel: +64 02108293806.';
         $tt2 .= '</div>
 </div>';