Преглед изворни кода

Merge pull request #1773 from visuddhinanda/laravel

add 备案号
visuddhinanda пре 2 година
родитељ
комит
882969efbc
4 измењених фајлова са 47 додато и 28 уклоњено
  1. 31 26
      app/Http/Api/TemplateRender.php
  2. 4 0
      config/mint.php
  3. BIN
      public/assets/images/logo_mps.png
  4. 12 2
      resources/views/typhoon.blade.php

+ 31 - 26
app/Http/Api/TemplateRender.php

@@ -555,8 +555,9 @@ class TemplateRender{
         $volume = $this->get_param($this->param,"volume",3,false);
         $page = $this->get_param($this->param,"page",4,false);
         $style = $this->get_param($this->param,"style",5,'modal');
-        $book = $this->get_param($this->param,"book",6,false);
-        $para = $this->get_param($this->param,"para",7,false);
+        $title = $this->get_param($this->param,"title",6,false);
+        $book = $this->get_param($this->param,"book",7,false);
+        $para = $this->get_param($this->param,"para",8,false);
 
         if(!$bookName || !$volume || !$page){
             /**
@@ -568,32 +569,34 @@ class TemplateRender{
                                 ->where('paragraph','<=',$para)
                                 ->orderBy('paragraph','desc')
                                 ->first();
-                if(!$bookName){
-                    foreach (BookTitle::get() as $value) {
-                        if($value['id']===$pageInfo->pcd_book_id){
-                            switch (strtoupper($type)) {
-                                case 'M':
-                                    $key = 'm_title';
-                                    break;
-                                case 'P':
-                                    $key = 'p_title';
-                                    break;
-                                case 'V':
-                                    $key = 'v_title';
-                                    break;
-                                default:
-                                    $key = 'term';
-                                    break;
+                if($pageInfo){
+                    if(!$bookName){
+                        foreach (BookTitle::get() as $value) {
+                            if($value['id']===$pageInfo->pcd_book_id){
+                                switch (strtoupper($type)) {
+                                    case 'M':
+                                        $key = 'm_title';
+                                        break;
+                                    case 'P':
+                                        $key = 'p_title';
+                                        break;
+                                    case 'V':
+                                        $key = 'v_title';
+                                        break;
+                                    default:
+                                        $key = 'term';
+                                        break;
+                                }
+                                $bookName = $value[$key];
                             }
-                            $bookName = $value[$key];
                         }
                     }
-                }
-                if(!$volume){
-                    $volume = $pageInfo->volume;
-                }
-                if(!$page){
-                    $page = $pageInfo->page;
+                    if(!$volume){
+                        $volume = $pageInfo->volume;
+                    }
+                    if(!$page){
+                        $page = $pageInfo->page;
+                    }
                 }
             }
         }
@@ -608,7 +611,9 @@ class TemplateRender{
             $props['book'] = $book;
             $props['para'] = $para;
         }
-
+        if($title){
+            $props['title'] = $title;
+        }
         $term = $this->getTermProps($bookName,':quote:');
         $props['term'] = $term;
         if(isset($term['id'])){

+ 4 - 0
config/mint.php

@@ -1,6 +1,10 @@
 <?php
 
 return [
+    'app'=>[
+        'icp_code'=>env('APP_ICP_CODE', ''),
+        'mps_code'=>env('APP_MPS_CODE', ''),
+    ],
 
     'snowflake'=>[
         'data_center_id' => env('SNOWFLAKE_DATA_CENTER_ID', 1),

BIN
public/assets/images/logo_mps.png


+ 12 - 2
resources/views/typhoon.blade.php

@@ -706,8 +706,18 @@ Awesomazing
 <footer class="bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 text-sm">
 <div class="xl:container xl:mx-auto md:px-6 px-4 py-8">
 <div class="relative flex flex-col md:flex-row justify-between min-h-16 text-gray-600 dark:text-gray-500">
-    <div style="text-align: center;">
-        <span>ICP:<a href="https://beian.miit.gov.cn/" target="_blank" rel="noreferrer">滇ICP备2023006988号-1</a></span>
+    <div style="display:flex;">
+    @if(!empty(config('mint.app.icp_code')))
+    <span>ICP:<a href="https://beian.miit.gov.cn/" target="_blank" rel="noreferrer">{{ config('mint.app.icp_code') }}</a></span>
+    <span style="display:flex;">
+        <img alt="code" src="{{ URL::asset('assets/images/logo_mps.png') }}" style="width: 20px; height: 20px;margin:0 12px;"/>
+        @if(empty(config('mint.app.mps_code')))
+        <span>滇公网安备[审批中]号</span>
+        @else
+        <span>{{ config('mint.app.mps_code') }}</span>
+        @endif
+    </span>
+    @endif
     </div>
 </div>
 <div style="display:none;" class="relative flex flex-col md:flex-row justify-between min-h-16 text-gray-600 dark:text-gray-500">