From 83c540a4bd90425feceeb1cf72374f1bdf4afc14 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 6 Jan 2021 16:59:20 +0800
Subject: [PATCH] 20201112

---
 application/api/controller/Journal.php |  2 +-
 application/api/controller/Main.php    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index c702584..4e79531 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -112,7 +112,7 @@ class Journal extends Controller {
         $rearr = $journal_info['relate']==''?[]:explode(',',$journal_info['relate']);
         $relatelist = $this->journal_obj->where('journal_id','in',$rearr)->where('state',0)->select();
         $absList = $this->journal_abs_obj->where('journal_id', $data['journal_id'])->where('state', 0)->order('sort')->select();
-        $stageList = $this->journal_stage_obj->where('journal_id', $data['journal_id'])->where('is_publish', 1)->where('state', 0)->order('stage_year desc,stage_vol desc')->select();
+        $stageList = $this->journal_stage_obj->where('journal_id', $data['journal_id'])->where('is_publish', 1)->where('state', 0)->order('stage_year desc,stage_no desc')->select();
         return json(['code' => 0, 'msg' => 'success', 'data' => ['journal' => $journal_info,'relats'=>$relatelist ,'journalAbs' => $absList, 'journalStage' => $stageList]]);
     }
 
diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php
index 2f5d6a5..1f0bfd6 100644
--- a/application/api/controller/Main.php
+++ b/application/api/controller/Main.php
@@ -212,5 +212,21 @@ class Main extends Controller {
     public function test() {
         echo md5('123456');
     }
+    
+    public function rewrite($type){
+        $frag = '';
+        switch($type){
+            case 'tmr':
+                $frag = 'https://www.tmrjournals.com/stages.html?J_num=1';
+                break;
+            case 'lr':
+                $frag = 'https://www.tmrjournals.com/stages.html?J_num=14';
+                break;
+            default :
+                $frag = 'https://www.tmrjournals.com/stages.html?J_num=1';
+                break;
+        }
+        echo "<script>location.href='$frag'</script>";
+    }
 
 }