Merge branch 'master' of http://git.dever.cc/project/cms

app/content/database/creater.php

@@ -60,9 +60,9 @@ return array
             'default'   => '',
             'desc'      => '简称',
             'match'     => 'is_string',
-            'update'    => 'text',
-            'list'      => true,
-            'search'    => 'fulltext',
+            //'update'    => 'text',
+            //'list'      => true,
+            //'search'    => 'fulltext',
         ),
 
         'logo'      => array

app/content/database/xuniren.php

@@ -93,9 +93,9 @@ return array
             'default'   => '',
             'desc'      => '英文名称',
             'match'     => 'is_string',
-            'update'    => 'text',
-            'list'      => true,
-            'search'    => 'fulltext',
+            //'update'    => 'text',
+            //'list'      => true,
+            //'search'    => 'fulltext',
         ),
 
         'shou'      => array
@@ -139,9 +139,20 @@ return array
             'default'   => '',
             'desc'      => '出生日期',
             'match'     => 'is_numeric',
-            'callback'  => 'maketime',
-            'update'    => 'time',
-            'list'      => 'date("Y-m-d", {bdate})',
+            //'callback'  => 'maketime',
+            //'update'    => 'time',
+            //'list'      => 'date("Y-m-d", {bdate})',
+        ),
+
+        'age'     => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '年龄',
+            'match'     => 'is_string',
+            'default'   => '',
+            'desc'      => '',
+            'update'    => 'text',
+            'list'      => true,
         ),
 
         'city'      => array
@@ -169,7 +180,7 @@ return array
         'creater_ids'       => array
         (
             'type'      => 'varchar-1000',
-            'name'      => '造物主-直接输入造物主名称，将自动进行匹配出来，之后选择一个即可',
+            'name'      => '关联造物主-关联系统中存在的造物主，直接输入造物主名称，将自动进行匹配出来，之后选择一个即可',
             'default'   => '',
             'desc'      => '造物主',
             'match'     => 'option',
@@ -191,6 +202,16 @@ return array
             //'show'  => 'cate=tag/manage.getByCate?cate=',
         ),
 
+        'zwz'      => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '手动输入造物主-手动输入造物主的名称，多个用半角","逗号隔开',
+            'default'   => '',
+            'desc'      => '手动输入造物主',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
         'waimao'      => array
         (
             'type'      => 'varchar-500',
@@ -259,8 +280,19 @@ return array
             'match'     => 'is_numeric',
             'default'   => '',
             'desc'      => '',
-            'update'    => 'time',
-            'callback'  => 'maketime',
+            //'update'    => 'time',
+            //'callback'  => 'maketime',
+            //'list'        => 'date("Y-m-d H:i:s", {pdate})',
+        ),
+
+        'pdate_string'     => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '初登场时间',
+            'match'     => 'option',
+            'default'   => '',
+            'desc'      => '',
+            'update'    => 'text',
             //'list'        => 'date("Y-m-d H:i:s", {pdate})',
         ),
 
@@ -298,6 +330,16 @@ return array
             'update'    => 'textarea',
         ),
 
+        'weibo'     => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '微博地址-输入微博的地址',
+            'default'   => '',
+            'desc'      => '请输入微博地址',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
         'douyin'        => array
         (
             'type'      => 'varchar-600',

app/content/lib/Creater.php

@@ -12,7 +12,7 @@ class Creater
         $data = Dever::db('content/creater')->one(array('id' => $id));
 
         if ($data) {
-            
+            $data['desc'] = $data['name'];
         }
 
         return $data;

app/content/lib/Manage.php

@@ -126,7 +126,7 @@ class Manage
 
     public function updateXnr($id, $name, $data)
     {   
-        $ename = Dever::param('ename', $data);
+        $ename = Dever::param('name', $data);
         if ($ename) {
             $first = mb_substr($ename, 0, 1);
             if (preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $first)) {

app/content/lib/Xuniren.php

@@ -39,7 +39,7 @@ class Xuniren
                 $info = Dever::db('content/xuniren')->one($v['xid']);
                 if ($info) {
                     $info = $this->getPic($info);
-                    $info['sname'] = $info['name'] . ' / ' . $info['ename'];
+                    $info['sname'] = $info['name'];
                     $info['link'] = Dever::url('main/xnr-detail?id=' . $info['id']);
                     $info['info'] = '<span>简介</span> ' . $info['info'];
                     $result[] = $info;
@@ -69,6 +69,7 @@ class Xuniren
         if ($data) {
             $data = $this->getPic($data);
             $data['news'] = Dever::array_decode($data['news']);
+            /*
             if ($data['bdate']) {
                 $data['age'] = $this->birthday($data['bdate']);
                 if ($data['age'] <= 0) {
@@ -77,6 +78,11 @@ class Xuniren
             } else {
                 $data['age'] = '不详';
             }
+            */
+
+            if (!$data['age']) {
+                $data['age'] = '不详';
+            }
 
             if ($data['sex'] == 1) {
                 $data['sex'] = '男';
@@ -85,9 +91,11 @@ class Xuniren
             } else {
                 $data['sex'] = '不详';
             }
-            $data['sname'] = $data['name'] . ' / ' . $data['ename'];
+            //$data['sname'] = $data['name'] . ' / ' . $data['ename'];
+            $data['sname'] = $data['name'];
 
-            $data['pdate'] = date('Y/m/d', $data['pdate']);
+            //$data['pdate'] = date('Y/m/d', $data['pdate']);
+            $data['pdate'] = $data['pdate_string'];
 
             $data['creater_name'] = '';
             $creater_name = array();
@@ -97,12 +105,18 @@ class Xuniren
                 foreach ($info as $k => $v) {
                     $creater = Dever::db('content/creater')->one(array('id' => $v['cid']));
                     if ($creater) {
-                        $creater_name[] = $creater['desc'];
+                        $url = Dever::url('main/zwz-detail?id=' . $creater['id']);
+                        $creater_name[] = '<a href="'.$url.'">' . $creater['desc'] . '</a>';
                     }
                 }
-                if ($creater_name) {
-                    $data['creater_name'] = implode(' & ', $creater_name);
-                }
+            }
+
+            if ($data['zwz']) {
+                $temp = explode(',', $data['zwz']);
+                $creater_name = array_merge($creater_name, $temp);
+            }
+            if ($creater_name) {
+                $data['creater_name'] = implode(' & ', $creater_name);
             }
         }
 

main/src/Content.php

@@ -308,6 +308,28 @@ class Content
         return $data;
     }
 
+    # 获取资讯
+    public function getNews()
+    {
+        $data = Dever::load('main/content.news');
+        if ($data) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取资讯
+    public function getNoNews()
+    {
+        $data = Dever::load('main/content.news');
+        if ($data) {
+            return false;
+        }
+
+        return true;
+    }
+
     # 获取资讯详情
     public function view()
     {
@@ -571,7 +593,7 @@ class Content
 
             foreach ($v as $k1 => $v1) {
                 $url = Dever::url('main/xnr-detail?id=' . $v1['id']);
-                $html .= '<a href="'.$url.'">'.$v1['name'].' / '.$v1['ename'].'</a>';
+                $html .= '<a href="'.$url.'">'.$v1['name'].'</a>';
             }
 
             $html .= '</dl>';
@@ -592,7 +614,7 @@ class Content
 
             foreach ($v as $k1 => $v1) {
                 $url = Dever::url('main/zwz-detail?id=' . $v1['id']);
-                $html .= '<a href="'.$url.'">'.$v1['name'].' / '.$v1['desc'].'</a>';
+                $html .= '<a href="'.$url.'">'.$v1['name'].'</a>';
             }
 
             $html .= '</dl>';

main/template/xuniren/home.php

@@ -132,7 +132,7 @@ $view
 
             'h5' => array
             (
-                'html' => '$v.name ." / ". $v.ename',
+                'html' => '$v.name',
             ),
             
 

main/template/xuniren/search.php

@@ -69,6 +69,9 @@ $view
     )
 )
 
+->fetch('.no-result@style', 'main/content.getNoNews', 'none')
+->fetch('.dever-page@style', 'main/content.getNews', 'none')
+
 ->fetch('.more@href', 'javascript:;')
 ->fetch('.more@dever-show', 'Dever::pageInfo()["link"] ? "1" : "2"')
 ->fetch('.more@style', 'Dever::pageInfo()["link"] ? "" : "display:none"')

main/template/xuniren/xnr-detail.php

@@ -63,6 +63,11 @@ $view
 
 ->fetch('.links@style', 'main/content.getXnrOne_news', 'none')
 
+->fetch('.shares icon-weibo@href', 'main/content.getXnrOne#weibo')
+->fetch('.shares icon-bilibili@href', 'main/content.getXnrOne#bili')
+->fetch('.shares icon-douyin@href', 'main/content.getXnrOne#douyin')
+->fetch('.shares icon-ins@href', 'main/content.getXnrOne#ins')
+
 ->import('inc/foot')
 
 ->display();