dever 6 lat temu
rodzic
commit
c31ea05695
3 zmienionych plików z 8 dodań i 4 usunięć
  1. 3 2
      main/lib/Core.php
  2. 3 2
      main/src/Journal.php
  3. 2 0
      main/src/View.php

+ 3 - 2
main/lib/Core.php

@@ -31,7 +31,7 @@ class Core
         //?imageView2/1/w/100/h/100/q/75
         $config = array
         (
-            'pic', 'content', 'contact', 'logo', 'top', 'img', 'link', 'background', 'audio_pic'
+            'pic_cover', 'pic_cover_169', 'content', 'share_pic'
         );
 
         foreach ($config as $k => $v) {
@@ -48,7 +48,7 @@ class Core
         $pic = Dever::pic($pic, $type);
 
         if (strstr($pic, 'http://')) {
-            $pic = str_replace('http://', 'https://', $pic);
+            //$pic = str_replace('http://', 'https://', $pic);
         }
 
         return $pic;
@@ -78,6 +78,7 @@ class Core
 
     protected function getInfo($type, $info, $content = false)
     {
+        $info = $this->pic($info);
         $info['type'] = $type;
         $info['data_id'] = $info['id'];
         if (isset($info['content']) && !$content) {

+ 3 - 2
main/src/Journal.php

@@ -390,10 +390,10 @@ class Journal extends Core
             $info['info'] = Dever::load('video/lib/live')->get($info['live_id']);
 
             if ($this->data['uid'] > 0) {
-                $info['note'] = Dever::load('act/lib/note')->get($this->data['uid'], $info['id'], 3);
+                $info['info']['note'] = Dever::load('act/lib/note')->get($this->data['uid'], $info['info']['id'], 3);
                 
             } else {
-                $info['note'] = 2;
+                $info['info']['note'] = 2;
             }
         }
 
@@ -486,6 +486,7 @@ class Journal extends Core
         $param = array
         (
             'account_id' => 1,
+            'project_id' => 1,
             'uid' => $this->data['uid'],
             'username' => $user['username'],
             'name' => $order_data['name'],

+ 2 - 0
main/src/View.php

@@ -44,6 +44,8 @@ class View extends Core
             Dever::alert('错误的'.$name.'ID');
         }
 
+        $this->data['info'] = $this->pic($this->data['info']);
+
         if ($this->data['info']['pdate'] > 0) {
             $this->data['info']['pdate_time'] = date('Y-m-d H:i:s', $this->data['info']['pdate']);
         }