d

app/act/database/contact.php

@@ -43,7 +43,7 @@ return array
 
 		'mobile' 		=> array
 		(
-			'type' 		=> 'int-11',
+			'type' 		=> 'varchar-500',
 			'name' 		=> '电话',
 			'default' 	=> '',
 			'desc' 		=> '电话',

app/act/database/share.php

@@ -4,6 +4,10 @@ $type = array
 (
 	1 => '微博分享',
 	2 => '微信分享',
+	3 => 'INS分享',
+	4 => 'B站分享',
+	5 => '抖音分享',
+	6 => '复制链接',
 );
 
 return array

app/content/database/creater.php

@@ -60,21 +60,21 @@ return array
             'default'   => '',
             'desc'      => '简称',
             'match'     => 'is_string',
-            'update'    => 'text',
-            'list'      => true,
-            'search'    => 'fulltext',
+            //'update'    => 'text',
+            //'list'      => true,
+            //'search'    => 'fulltext',
         ),
 
         'logo'      => array
         (
             'type'      => 'varchar-150',
-            'name'      => 'logo',
+            'name'      => 'logo-图片尺寸900*460px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => 'logo',
             'match'     => 'is_string',
             'update'    => 'image',
             'key'       => '1',
-            'place'     => '150',
+            'place'     => '900*460',
         ),
 
         'address'      => array
@@ -83,9 +83,9 @@ return array
             'name'      => '地址',
             'default'   => '',
             'desc'      => '地址',
-            'match'     => 'is_string',
-            'update'    => 'textarea',
-            'list'      => true,
+            'match'     => 'option',
+            //'update'    => 'textarea',
+            //'list'      => true,
         ),
 
         'site'      => array
@@ -94,7 +94,7 @@ return array
             'name'      => '网址',
             'default'   => '',
             'desc'      => '网址',
-            'match'     => 'is_string',
+            'match'     => 'option',
             'update'    => 'textarea',
         ),
 
@@ -194,6 +194,21 @@ return array
             'col' => 'name as name, id, id as value, "" as selected, "" as disabled|id',
         ),
 
+        'getData' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'id' => array('yes-id', 'in'),
+                'name' => array('yes', 'like'),
+                'status' => 1,
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc','cdate' => 'desc'),
+            'col' => '*',
+        ),
+
         'getAll' => array
         (
             # 匹配的正则或函数 选填项

app/content/database/creater_xuniren.php

@@ -0,0 +1,97 @@
+<?php
+
+$status = array(
+    1 => '已登场',
+    2 => '未登场',
+);
+
+return array
+(
+    # 表名
+    'name' => 'creater_xuniren',
+    # 显示给用户看的名称
+    'lang' => '造物主虚拟人关联表',
+    'order' => 1,
+    'menu'  => false,
+
+    # 数据结构
+    'struct' => array
+    (
+        'id'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => 'ID',
+            'default'   => '',
+            'desc'      => '',
+            'match'     => 'is_numeric',
+            'list'      => true,
+        ),
+        
+        'cid'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '造物主id',
+            'default'   => '',
+            'desc'      => '造物主id',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'xid'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '虚拟人id',
+            'default'   => '',
+            'desc'      => '虚拟人id',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'list'      => true,
+        ),
+
+        'state'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '状态',
+            'default'   => '1',
+            'desc'      => '请选择状态',
+            'match'     => 'is_numeric',
+        ),
+
+        'cdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '创建时间',
+            'match'     => array('is_numeric', time()),
+            'desc'      => '',
+            # 只有insert时才生效
+            'insert'    => true,
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            'search'    => 'date',
+        ),
+    ),
+    
+    # 管理功能
+    'manage' => array
+    (
+
+    ),
+
+    # request 请求接口定义
+    'request' => array
+    (
+        'getAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'cid' => 'yes',
+                'xid' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('id' => 'desc'),
+            'col' => '*',
+        ),
+    ),
+);

app/content/database/news.php

@@ -24,6 +24,25 @@ $type = array
 
 $type_value = Dever::input('search_option_type', 1);
 
+if ($type_value == 2) {
+    # 专题
+    $small_pic_name = '首页专题封面图';
+    $small_pic_size = '700*460';
+    $small_pic_update = 'image';
+    $small_pic_match = 'is_string';
+} elseif ($type_value == 4) {
+    # 活动
+    $small_pic_name = '活动封面小图';
+    $small_pic_size = '288*384';
+    $small_pic_update = 'image';
+    $small_pic_match = 'is_string';
+} else {
+    $small_pic_name = '活动封面小图';
+    $small_pic_size = '288*384';
+    $small_pic_update = 'hidden';
+    $small_pic_match = 'option';
+}
+
 $name = $type[$type_value];
 
 return array
@@ -114,35 +133,35 @@ return array
         'pic'       => array
         (
             'type'      => 'varchar-150',
-            'name'      => '封面图-图片尺寸1200*500px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '封面图-图片尺寸'.($type_value == 3 ? '1200*670' : '1200*530').'px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '封面图',
             'match'     => 'is_string',
             'update'    => 'image',
             'key'       => '1',
-            'place'     => '1200*500',
+            'place'     => $type_value == 3 ? '1200*670' : '1200*530',
         ),
 
         'small_pic'       => array
         (
             'type'      => 'varchar-150',
-            'name'      => '封面小图-图片尺寸270*363px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => $small_pic_name . '-图片尺寸'.$small_pic_size.'px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '封面图',
-            'match'     => $type_value == 4 ? 'is_string' : 'option',
-            'update'    => $type_value == 4 ? 'image' : 'hidden',
+            'match'     => $small_pic_match,
+            'update'    => $small_pic_update,
             'key'       => '1',
-            'place'     => '270*363',
+            'place'     => $small_pic_size,
         ),
 
         'video'     => array
         (
             'type'      => 'varchar-800',
-            'name'      => '上传视频-视频格式mp4，上传大小不能超过4G，如果上传了视频，上述封面图将作为视频封面',
+            'name'      => '上传视频-视频格式为MP4，上传大小不能超过4M。如需添加腾讯视频，请将腾讯视频分享链接添加至【上传视频】按钮下方地址输入框中',
             'default'   => '',
             'desc'      => '上传推荐视频',
-            'match'     => 'option',
-            'update'    => 'upload',
+            'match'     => $type_value == 3 ? 'is_string' : 'option',
+            'update'    => $type_value == 3 ? 'upload' : 'hidden',
             'key'       => '3',
             'place'     => '150',
             'upload'    => 'yun',
@@ -181,19 +200,19 @@ return array
             'default'   => '',
             'desc'      => '分享标题',
             'match'     => 'option',
-            'update'    => 'text',
+            //'update'    => 'text',
         ),
 
         'share_pic'     => array
         (
             'type'      => 'varchar-150',
-            'name'      => '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '分享图片-图片尺寸200*200px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '分享图片',
             'match'     => 'option',
-            'update'    => 'image',
+            //'update'    => 'image',
             'key'       => '1',
-            'place'     => '150',
+            'place'     => '200*200',
             //'upload'  => 'qiniu',
             //'large'   => true,
         ),
@@ -205,7 +224,7 @@ return array
             'default'   => '',
             'desc'      => '分享内容',
             'match'     => 'option',
-            'update'    => 'textarea',
+            //'update'    => 'textarea',
         ),
 
         'content'       => array
@@ -219,6 +238,32 @@ return array
             'key'       => '1',
         ),
 
+        'content_video'     => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '上传内容视频-视频格式为MP4，上传大小不能超过4M。如需添加腾讯视频，请将腾讯视频分享链接添加至【上传视频】按钮下方地址输入框中',
+            'default'   => '',
+            'desc'      => '上传推荐视频',
+            'match'     => $type_value != 3 ? 'option' : 'option',
+            'update'    => $type_value != 3 ? 'upload' : 'hidden',
+            'key'       => '3',
+            'place'     => '150',
+            'upload'    => 'yun',
+            'large'     => true,
+        ),
+
+        'content_video_pic'       => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '内容视频封面图-图片尺寸1200*670px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'default'   => '',
+            'desc'      => '封面图',
+            'match'     => $type_value != 3 ? 'option' : 'option',
+            'update'    => $type_value != 3 ? 'image' : 'hidden',
+            'key'       => '1',
+            'place'     => '1200*670',
+        ),
+
         'beizhu'      => array
         (
             'type'      => 'varchar-500',
@@ -381,7 +426,25 @@ return array
             ),
             'type' => 'all',
             'order' => array('reorder' => 'desc', 'id' => 'desc'),
-            'page' => array(10, 'list'),
+            'page' => array(5, 'list'),
+            'col' => '*',
+        ),
+
+        'getAllVideo' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'type' => 'yes',
+                'name' => array('yes', 'like', 'and('),
+                'tag' => array('yes', 'like', 'or)'),
+                'pdate' => array($time, '<='),
+                'status' => 1,
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc', 'id' => 'desc'),
+            'page' => array(12, 'list'),
             'col' => '*',
         ),
     ),

app/content/database/xuniren.php

@@ -21,7 +21,10 @@ $sex = array
 
 $creater = function()
 {
-    $array = array();
+    $array = array
+    (
+        -1 => array('id' => '', 'name' => '全部造物主',),
+    );
     $info = Dever::db('content/creater')->state();
     if($info)
     {
@@ -44,6 +47,20 @@ return array
         'update' => 'content/lib/manage.updateXnr',
     ),
 
+    # 同步更新另外一个或多个表的多条关联数据，以逗号隔开
+    'sync' => array
+    (
+        'content/creater_xuniren' => array
+        (
+            # 更新时的条件，另外一个表的字段 => 本表的字段
+            'where' => array('xid', 'id'),
+            # 要更新的数据
+            'update' => array('cid' => 'creater_ids'),
+            # 同步更新的类型，delete为先删再插入，update为先查询是否存在，存在直接更新，不存在则插入, only为仅更新
+            'type' => 'delete',
+        )
+    ),
+
     # 数据结构
     'struct' => array
     (
@@ -76,9 +93,9 @@ return array
             'default'   => '',
             'desc'      => '英文名称',
             'match'     => 'is_string',
-            'update'    => 'text',
-            'list'      => true,
-            'search'    => 'fulltext',
+            //'update'    => 'text',
+            //'list'      => true,
+            //'search'    => 'fulltext',
         ),
 
         'shou'      => array
@@ -93,13 +110,13 @@ return array
         'pic'      => array
         (
             'type'      => 'text-255',
-            'name'      => '形象大图-可以上传多张，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '形象大图-可以上传多张，图片尺寸530*800px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '形象大图',
             'match'     => 'option',
             'update'    => 'images',
             'key'       => '1',
-            'place'     => '1242*1863',
+            'place'     => '530*800',
         ),
 
         'sex'        => array
@@ -122,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
@@ -140,30 +168,50 @@ return array
         'creater_id'     => array
         (
             'type'      => 'int-11',
-            'name'      => '造物主',
+            'name'      => '造物主-关联单个造物主，废弃',
             'default'   => '-1',
             'desc'      => '造物主',
             'match'     => 'is_numeric',
-            'update'    => 'select',
-            'option'    => $creater,
-            'search'    => 'select',
+            //'update'    => 'select',
+            //'option'    => $creater,
+            //'search'    => 'select',
         ),
 
         'creater_ids'       => array
         (
             'type'      => 'varchar-1000',
-            'name'      => '关联造物主-直接输入造物主名称，将自动进行匹配出来，之后选择一个即可',
+            'name'      => '关联造物主-关联系统中存在的造物主，直接输入造物主名称，将自动进行匹配出来，之后选择一个即可',
             'default'   => '',
-            'desc'      => '关联造物主',
-            'match'     => 'is_string',
+            'desc'      => '造物主',
+            'match'     => 'option',
             'update'    => 'text',
+            
+            'search'    => 'select',
+            'search'    => array
+            (
+                'api' => 'content/creater_xuniren-all',//接口地址，最好是获取多条数据的地址
+                'col' => 'cid',//要查询的字段
+                'result' => 'xid',//返回的字段
+                'search' => 'id',//本表的字段，默认为当前的字段
+                'option'    => $creater,
+            ),
             //如果要输入带有自动提示的，就打开这个，update=>'text'即可
-            'autocomplete' => array('content/lib/manage.getByCreaterName', 'id', 'content/creater-one#name'),
+            'autocomplete' => array('content/lib/manage.getByCreaterName', 'id', 'content/creater-getData'),
             //'list'        => true,
             //显示
             //'show'  => 'cate=tag/manage.getByCate?cate=',
         ),
 
+        'zwz'      => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '手动输入造物主-手动输入造物主的名称，多个用半角","逗号隔开',
+            'default'   => '',
+            'desc'      => '手动输入造物主',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
         'waimao'      => array
         (
             'type'      => 'varchar-500',
@@ -184,10 +232,20 @@ return array
             'update'    => 'textarea',
         ),
 
+        'home_info'      => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '首页简介-不能超过50字',
+            'default'   => '',
+            'desc'      => '首页简介',
+            'match'     => 'option',
+            'update'    => 'textarea',
+        ),
+
         'info'      => array
         (
             'type'      => 'varchar-500',
-            'name'      => '简介',
+            'name'      => '详情页简介-不能超过110字',
             'default'   => '',
             'desc'      => '简介',
             'match'     => 'is_string',
@@ -232,8 +290,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})',
         ),
 
@@ -244,19 +313,19 @@ return array
             'default'   => '',
             'desc'      => '分享标题',
             'match'     => 'option',
-            'update'    => 'text',
+            //'update'    => 'text',
         ),
 
         'share_pic'     => array
         (
             'type'      => 'varchar-150',
-            'name'      => '分享图片-图片尺寸570*570px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '分享图片-图片尺寸200*200px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '分享图片',
             'match'     => 'option',
-            'update'    => 'image',
+            //'update'    => 'image',
             'key'       => '1',
-            'place'     => '150',
+            'place'     => '200*200',
             //'upload'  => 'qiniu',
             //'large'   => true,
         ),
@@ -268,7 +337,57 @@ return array
             'default'   => '',
             'desc'      => '分享内容',
             'match'     => 'option',
-            'update'    => 'textarea',
+            //'update'    => 'textarea',
+        ),
+
+        'weibo'     => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '微博地址-输入微博的地址',
+            'default'   => '',
+            'desc'      => '请输入微博地址',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
+        'douyin'        => array
+        (
+            'type'      => 'varchar-600',
+            'name'      => '抖音地址',
+            'default'   => '',
+            'desc'      => '抖音地址',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
+        'bilibili'      => array
+        (
+            'type'      => 'varchar-600',
+            'name'      => 'B站地址',
+            'default'   => '',
+            'desc'      => 'B站地址',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
+        'ins'       => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => 'INS分享内容',
+            'default'   => '',
+            'desc'      => 'INS分享内容',
+            'match'     => 'option',
+            'update'    => 'text',
+        ),
+
+        'ins_link'       => array
+        (
+            'type'      => 'varchar-600',
+            'name'      => 'INS链接',
+            'default'   => '',
+            'desc'      => 'INS链接',
+            'match'     => 'option',
+            'update'    => 'text',
         ),
 
         'beizhu'      => array

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/News.php

@@ -40,7 +40,11 @@ class News
             $where['tag'] = $name;
         }
 
-        $data = Dever::db('content/news')->getAll($where);
+        if ($type == 3) {
+            $data = Dever::db('content/news')->getAllVideo($where);
+        } else {
+            $data = Dever::db('content/news')->getAll($where);
+        }
 
         if ($data) {
             foreach ($data as $k => $v) {
@@ -78,15 +82,18 @@ class News
         }
         $info['pdate_s'] = date('Y/m/d', $info['pdate']);
 
-        if ($info['video']) {
+        $info['video_link'] = Dever::url('main/content.video?id=' . $info['id']);
+        /*
+        if ($info['video'] && strstr($info['video'], '.qq.com')) {
             $info['video_info'] = Dever::qqvideo($info['video'], 2);
             $info['video_id'] = isset($info['video_info'][1]) ? $info['video_info'][1] : 0;
             $info['video_link'] = isset($info['video_info'][0]) ? $info['video_info'][0] : '';
         } else {
             $info['video_info'] = '';
             $info['video_id'] = '';
-            $info['video_link'] = '';
+            $info['video_link'] = $info['video'];
         }
+        */
 
         $info['sname'] = $info['name'] . '<br />' . $info['desc'];
 

app/content/lib/Xuniren.php

@@ -16,8 +16,11 @@ class Xuniren
 
         if ($data) {
             foreach ($data as $k => $v) {
-                $data[$k]['link'] = Dever::url('main/xnr-detail?id=' . $v['id']);
                 $data[$k] = $this->getPic($v);
+                $data[$k]['link'] = Dever::url('main/xnr-detail?id=' . $v['id']);
+                if (!$v['home_info']) {
+                    $data[$k]['home_info'] = Dever::cut($v['info'], 50);
+                }
             }
         }
 
@@ -28,19 +31,26 @@ class Xuniren
     {
         $where = array();
 
-        $where['creater_id'] = $creater_id;
-        $data = Dever::db('content/xuniren')->getDataByCreater($where);
+        //$where['creater_id'] = $creater_id;
+        //$data = Dever::db('content/xuniren')->getDataByCreater($where);
+        $where['cid'] = $creater_id;
+        $data = Dever::db('content/creater_xuniren')->getAll($where);
 
+        $result = array();
         if ($data) {
             foreach ($data as $k => $v) {
-                $data[$k]['sname'] = $v['name'] . ' / ' . $v['ename'];
-                $data[$k]['link'] = Dever::url('main/xnr-detail?id=' . $v['id']);
-                $data[$k]['info'] = '<span>简介</span> ' . $v['info'];
-                $data[$k] = $this->getPic($v);
+                $info = Dever::db('content/xuniren')->one($v['xid']);
+                if ($info) {
+                    $info = $this->getPic($info);
+                    $info['sname'] = $info['name'];
+                    $info['link'] = Dever::url('main/xnr-detail?id=' . $info['id']);
+                    $info['info'] = '<span>简介</span> ' . $info['info'];
+                    $result[] = $info;
+                }
             }
         }
 
-        return $data;
+        return $result;
     }
 
     private function getPic($data)
@@ -62,6 +72,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) {
@@ -70,6 +81,11 @@ class Xuniren
             } else {
                 $data['age'] = '不详';
             }
+            */
+
+            if (!$data['age']) {
+                $data['age'] = '不详';
+            }
 
             if ($data['sex'] == 1) {
                 $data['sex'] = '男';
@@ -78,12 +94,33 @@ class Xuniren
             } else {
                 $data['sex'] = '不详';
             }
-            $data['sname'] = $data['name'] . ' / ' . $data['ename'];
-
-            $data['pdate'] = date('Y/m/d', $data['pdate']);
+            //$data['sname'] = $data['name'] . ' / ' . $data['ename'];
+            $data['sname'] = $data['name'];
+
+            //$data['pdate'] = date('Y/m/d', $data['pdate']);
+            $data['pdate'] = $data['pdate_string'];
+
+            $data['creater_name'] = '';
+            $creater_name = array();
+            $where['xid'] = $data['id'];
+            $info = Dever::db('content/creater_xuniren')->getAll($where);
+            if ($info) {
+                foreach ($info as $k => $v) {
+                    $creater = Dever::db('content/creater')->one(array('id' => $v['cid']));
+                    if ($creater) {
+                        $url = Dever::url('main/zwz-detail?id=' . $creater['id']);
+                        $creater_name[] = '<a href="'.$url.'">' . $creater['name'] . '</a>';
+                    }
+                }
+            }
 
-            $data['creater'] = Dever::db('content/creater')->one($data['creater_id']);
-            $data['creater_name'] = $data['creater']['desc'];
+            if ($data['zwz']) {
+                $temp = explode(',', $data['zwz']);
+                $creater_name = array_merge($creater_name, $temp);
+            }
+            if ($creater_name) {
+                $data['creater_name'] = implode(' & ', $creater_name);
+            }
         }
 
         return $data;

app/push/database/data.php

@@ -345,7 +345,7 @@ return array
             'type' => 'all',
             'order' => array('reorder' => 'desc', 'id' => 'desc'),
             'limit' => '0,10',
-            'col' => '*,olink as link',
+            'col' => '*',
         ),
 
         # 获取列表页 带有分页的
@@ -361,7 +361,7 @@ return array
             'type' => 'all',
             'order' => array('reorder' => 'desc', 'id' => 'desc'),
             'page' => array(10, 'list'),
-            'col' => '*,olink as link',
+            'col' => '*',
         ),
     ),
 );

app/push/database/info.php

@@ -201,7 +201,7 @@ return array
         (
             'type'      => 'varchar-20',
             'name'      => '图片尺寸提醒-请直接输入提醒的文字即可，如100*100',
-            'default'   => '1200*500',
+            'default'   => '',
             'desc'      => '图片尺寸提醒',
             'match'     => 'is_string',
             'update'    => 'text',

app/push/lib/Data.php

@@ -53,15 +53,28 @@ class Data
     private function getOne($info)
     {
         $info['id'] = 0;
+        if ($info['type'] == 10) {
+            $info['link'] = $info['olink'];
+        }
         if ($info['type'] < 10) {
             $table = Dever::config('base')->table_name[$info['type']];
             $method = 'one';
-            $id = str_replace('content/', '', $table) . '_id';
+            $id = $table[1];
             $id = $info[$id];
             unset($info[$id]);
             if ($id > 0) {
+                if (!$info['link']) {
+                    if ($info['type'] >= 3) {
+                        $info['link'] = Dever::url('main/article?type='.($info['type']-2).'&id=' . $id);
+                    } elseif ($info['type'] == 1) {
+                        $info['link'] = Dever::url('main/zwz-detail?id=' . $id);
+                    } elseif ($info['type'] == 2) {
+                        $info['link'] = Dever::url('main/xnr-detail?id=' . $id);
+                    }
+                }
+
                 $info['id'] = $id;
-                $data = Dever::db($table)->$method($id);
+                $data = Dever::db($table[0])->$method($id);
                 if (isset($data) && $data) {
                     if (isset($data['name']) && $data['name'] && !$info['name']) {
                         $info['name'] = $data['name'];
@@ -87,15 +100,21 @@ class Data
                         $info['pic'] = $data['pic'];
                     }
 
-                    if (isset($data['link']) && $data['link']) {
+                    if (isset($data['small_pic']) && $data['small_pic'] && !$info['pic']) {
+                        $info['pic'] = $data['small_pic'];
+                    }
+
+                    if (isset($data['link']) && $data['link'] && !$info['link']) {
                         $info['link'] = $data['link'];
                     }
 
                     if (isset($data['video']) && $data['video']) {
+                        /*
                         $info['video'] = $data['video'];
                         $info['video_info'] = Dever::qqvideo($data['video']);
                         $info['video_id'] = isset($info['video_info'][1]) ? $info['video_info'][1] : 0;
-                        $info['video_link'] = isset($info['video_info'][0]) ? $info['video_info'][0] : '';
+                        */
+                        $info['video_link'] = Dever::url('main/content.video?id=' . $id);
                     }
                 }
             }
@@ -107,14 +126,18 @@ class Data
             }
         }
 
+        $info['small_pic'] = $info['pic'];
+
         if ($info['pdate']) {
-            $info['pdate'] = date('M d, Y', $info['pdate']);
+            $info['pdate_string'] = date('M d, Y', $info['pdate']);
 
             if ($info['author']) {
-                $info['pdate'] .= ' by ' . $info['author'];
+                $info['pdate_string'] .= ' by ' . $info['author'];
             }
         }
 
+        $info['info'] = $info['content'];
+
         $info['cdate'] = date('Y-m-d', $info['cdate']);
 
         if (isset($info['pic']) && $info['pic']) {

app/push/lib/Manage.php

@@ -17,14 +17,14 @@ class Manage
 
         if ($info['type'] < 10) {
             $table = Dever::config('base')->table_name[$info['type']];
-            $id = str_replace('content/', '', $table) . '_id';
-            $audit = array
+            $id = $table[1];
+            $where = array
             (
-                'status' => 2,
+                'status' => 1,
                 'state' => 1,
             );
-            $audit['id'] = $info[$id];
-            $data = Dever::db($table)->one($audit);
+            $where['id'] = $info[$id];
+            $data = Dever::db($table[0])->one($where);
 
             if (isset($data) && $data && isset($data[$col])) {
                 return $data[$col];

config/base.php

@@ -15,15 +15,15 @@ $config['base'] = array
         6 => '活动',
     ),
 
-    # 功能类型
+    # 功能类型 0是表名，1是字段名
     'table_name' => array
     (
-        1 => 'content/creater',
-        2 => 'content/xuniren',
-        3 => 'content/news',
-        4 => 'content/news',
-        5 => 'content/news',
-        6 => 'content/news',
+        1 => array('content/creater', 'creater_id'),
+        2 => array('content/xuniren', 'xuniren_id'),
+        3 => array('content/news', 'news_id'),
+        4 => array('content/news', 'feature_id'),
+        5 => array('content/news', 'vod_id'),
+        6 => array('content/news', 'act_id'),
     ),
 
     'audit' => array

main/assets/xuniren/activity.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/activity.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/activity.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 <!-- <body class="night-skin"> -->

main/assets/xuniren/article.html

@@ -23,7 +23,7 @@
 		appkey: ""
 	};config.ins="234";config.douyin="http://8.131.66.239/cms/data/upload/1/2021/03/23/e66215d6cc69c7f6c48b09aea4b794f5.jpg";config.bili="https://space.bilibili.com/1038441923"
 	</script> -->
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/article.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/article.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 	<header>

main/assets/xuniren/contact.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/contact.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/contact.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 	<header>

main/assets/xuniren/css/global.css.map

@@ -1 +1 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=a948e7c5","sourceRoot":""}
+{"version":3,"sources":[],"names":[],"mappings":"","file":"css/global.css?v=f3d225e2","sourceRoot":""}

main/assets/xuniren/feature.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/feature.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/feature.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body class="featurepage">
 <!-- <body class="night-skin"> -->

main/assets/xuniren/index.html

@@ -16,7 +16,7 @@
 	<link rel="stylesheet" href="./static/swiper.min.css" />
 	
 		<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script>
-<link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/index.css?v=aad2eca2" rel="stylesheet"></head>
+<link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/index.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body class="homepage">
 	<!-- <video style="background-color:#000;width:100%;height:100%" controls playsinline="isiPhoneShowPlaysinline" x5-video-player-type="h5-page" t7-video-player-type="inline" webkit-playsinline="isiPhoneShowPlaysinline" x-webkit-airplay="" preload="none" data-role="txp_video_tag" src="https://ugccsy.qq.com/uwMROfz2r57IIaQXGdGnC2dePkY6TBijNmYhp7I7TbAHYM2s/szg_1768_50001_0bf2a4acaaaaeaabrpk47vqfcb6deadqaica.f622.mp4?sdtfrom=v3010&amp;guid=4d516e66f1c2f37d2e996ebe731a1d09&amp;vkey=503D59F445D0100BA33536F4AD509B46A4D14CA1D7CFD36B963A88B697F75681102B6A70854458C79A86B60B2D2BD950B374101B0D90ADD0AD1AC3A7696F4302B84D657340E35A35C95286EE18EC2C68C9A35C0B5B933D7AD5594DA791F74A8D26373509C165A1B55C64A47398DB3C12B7D592EF06C56B662C6ADC8E9BA6C247&amp;platform=2#t=0"></video> -->

main/assets/xuniren/js/config.js

@@ -1,4 +1,4 @@
-//定义瀑布流
-Dever.Page().name = '#page';
-Dever.Page().button = '.more';
+//定义瀑布流
+Dever.Page().name = '#page';
+Dever.Page().button = '.more';
 //Dever.Page().loading = '.loadding';

main/assets/xuniren/news.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/news.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/news.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body class="newspage">
 <!-- <body class="night-skin"> -->

main/assets/xuniren/search.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/search.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/search.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body class="searchpage">
 <!-- <body class="night-skin"> -->

main/assets/xuniren/video.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/video.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/video.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 <!-- <body class="night-skin"> -->

main/assets/xuniren/xnr-detail.html

@@ -23,7 +23,7 @@
 		appkey: "",
 		content: ""
 	};config.ins="";config.ins_link="";config.douyin="";config.bili=""</script> -->
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/xnr-detail.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/xnr-detail.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 <!-- <body class="night-skin"> -->

main/assets/xuniren/xnr.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/xnr.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/xnr.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 <!-- <body class="night-skin"> -->

main/assets/xuniren/zwz-detail.html

@@ -14,7 +14,7 @@
 	<meta name="Description" content="" />
 	<link rel="stylesheet" href="http://at.alicdn.com/t/font_2408372_yboxwcmacnk.css">
 	<link rel="stylesheet" href="./static/swiper.min.css" />
-	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=a948e7c5" rel="stylesheet"><link href="css/zwz-detail.css?v=aad2eca2" rel="stylesheet"></head>
+	<script type="text/javascript" src="http://cdn.repository.webfont.com/wwwroot/js/wf/youziku.api.min.js"></script><link href="css/global.css?v=f3d225e2" rel="stylesheet"><link href="css/zwz-detail.css?v=aad2eca2" rel="stylesheet"></head>
 
 <body>
 <!-- <body class="night-skin"> -->

main/database/config.php

@@ -66,37 +66,59 @@ return array
 		'logo'		=> array
 		(
 			'type' 		=> 'varchar-150',
-			'name' 		=> '站点logo',
+			'name' 		=> '站点logo-图片尺寸530*200px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '站点logo',
 			'match' 	=> 'is_string',
 			'update'	=> 'image',
 			'key' 		=> '1',
-			'place'		=> '150',
+			'place'		=> '530*200',
+		),
+
+		'logo_black'		=> array
+		(
+			'type' 		=> 'varchar-150',
+			'name' 		=> '站点黑夜logo-图片尺寸530*200px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+			'default' 	=> '',
+			'desc' 		=> '站点logo',
+			'match' 	=> 'is_string',
+			'update'	=> 'image',
+			'key' 		=> '1',
+			'place'		=> '530*200',
+		),
+
+		'beian'		=> array
+		(
+			'type' 		=> 'varchar-100',
+			'name' 		=> '备案介绍',
+			'default' 	=> '',
+			'desc' 		=> '备案介绍',
+			'match' 	=> 'is_string',
+			'update'	=> 'textarea',
 		),
 
 		'xnr_pic'       => array
         (
             'type'      => 'varchar-150',
-            'name'      => '虚拟人封面图-图片尺寸822*542px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '虚拟人封面图-图片尺寸595*330px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '虚拟人封面图',
             'match'     => 'is_string',
             'update'    => 'image',
             'key'       => '1',
-            'place'     => '822*542',
+            'place'     => '595*330',
         ),
 
         'zwz_pic'       => array
         (
             'type'      => 'varchar-150',
-            'name'      => '造物主封面图-图片尺寸822*542px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
+            'name'      => '造物主封面图-图片尺寸595*330px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
             'default'   => '',
             'desc'      => '造物主封面图',
             'match'     => 'is_string',
             'update'    => 'image',
             'key'       => '1',
-            'place'     => '822*542',
+            'place'     => '595*330',
         ),
 
 		'weibo'		=> array
@@ -112,13 +134,13 @@ return array
 		'weixin_qrcode'		=> array
 		(
 			'type' 		=> 'varchar-150',
-			'name' 		=> '微信二维码',
+			'name' 		=> '微信二维码-图片尺寸250*250px或等比尺寸，上传大小不能超过2M，支持JPG、PNG、GIF格式，建议上传JPG格式',
 			'default' 	=> '',
 			'desc' 		=> '微信二维码',
 			'match' 	=> 'option',
 			'update'	=> 'image',
 			'key' 		=> '1',
-			'place'		=> '150',
+			'place'		=> '250*250',
 		),
 		/*
 		'email'		=> array
@@ -139,7 +161,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '抖音账号',
 			'match' 	=> 'option',
-			'update'	=> 'text',
+			//'update'	=> 'text',
 		),
 
 		'douyin_qrcode'		=> array
@@ -149,7 +171,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '抖音二维码',
 			'match' 	=> 'option',
-			'update'	=> 'image',
+			//'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
 		),
@@ -161,7 +183,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> 'B站地址',
 			'match' 	=> 'option',
-			'update'	=> 'text',
+			//'update'	=> 'text',
 		),
 
 		'ins'		=> array
@@ -171,8 +193,18 @@ return array
 			'default' 	=> '',
 			'desc' 		=> 'INS账号',
 			'match' 	=> 'option',
-			'update'	=> 'text',
+			//'update'	=> 'text',
 		),
+
+		'ins_link'       => array
+        (
+            'type'      => 'varchar-600',
+            'name'      => 'INS链接',
+            'default'   => '',
+            'desc'      => 'INS链接',
+            'match'     => 'option',
+            //'update'    => 'text',
+        ),
 		
 		'cdate'		=> array
 		(

main/database/page.php

@@ -44,7 +44,7 @@ $config = array
             'default'   => '',
             'desc'      => '标识',
             'match'     => 'is_string',
-            'update'    => 'text',
+            'update'    =>  Dever::input('where_id') > 0 ? 'hidden' : 'text',
             'search'    => 'fulltext',
             'list'      => true,
         ),

main/lib/Core.php

@@ -16,12 +16,6 @@ class Core
 
     public function replacePic($pic, $type = 't1')
     {
-        //$pic = Dever::pic($pic, $type);
-
-        if (strstr($pic, 'http://')) {
-            $pic = str_replace('http://', 'https://', $pic);
-        }
-
         return $pic;
     }
 }

main/src/Content.php

@@ -18,6 +18,87 @@ class Content
         return $data;
     }
 
+
+    # 分享js配置
+    public function share()
+    {
+        $title = '';
+        $pic = '';
+        $content = '';
+
+        $uri = Uri::$value;
+
+        $id = Dever::input('id');
+        $config = Dever::load('main/content.config');
+        if ($id) {
+            if ($uri == 'xnr-detail') {
+                $data = Dever::db('content/xuniren')->one($id);
+                if (isset($data['ins']) && $data['ins']) {
+                    $config['ins'] = $data['ins'];
+                }
+                if (isset($data['ins_link']) && $data['ins_link']) {
+                    $config['ins_link'] = $data['ins_link'];
+                }
+                if (isset($data['douyin']) && $data['douyin']) {
+                    $config['douyin'] = $data['douyin'];
+                }
+                if (isset($data['bilibili']) && $data['bilibili']) {
+                    $config['bilibili'] = $data['bilibili'];
+                }
+                
+            } elseif ($uri == 'zwz-detail') {
+                $data = Dever::db('content/creater')->one($id);
+                $data['pic'] = $data['logo'];
+            } else {
+                $data = Dever::db('content/news')->one($id);
+            }
+
+            if (isset($data['share_title']) && $data['share_title']) {
+                $title = $data['share_title'];
+            } else {
+                $title = $data['name'];
+            }
+
+            if (isset($data['share_pic']) && $data['share_pic']) {
+                $pic = $data['share_pic'];
+            } else {
+                $pic = $data['pic'];
+            }
+
+            if (isset($data['share_content']) && $data['share_content']) {
+                $pic = $data['share_content'];
+            } else {
+                $pic = $data['info'];
+            }
+
+        } else {
+            $title = $config['name'];
+            $pic = $config['logo'];
+        }
+        
+
+        $ralateUid = '';
+        $appkey = '';
+        $url = Dever::url();
+        
+        $share = 'config.wbshare = {
+            title: "'.$title.'",
+            url: "'.$url.'",
+            pic: "'.$pic.'",
+            ralateUid: "'.$ralateUid.'",
+            appkey: "'.$appkey.'",
+            content: "'.$content.'"
+        }';
+
+
+        $share .= ';config.ins="'.$config['ins'].'"';
+        $share .= ';config.ins_link="'.$config['ins_link'].'"';
+        $share .= ';config.douyin="'.$config['douyin'].'"';
+        $share .= ';config.bili="'.$config['bilibili'].'"';
+
+        return $share;
+    }
+
     # 获取菜单
     public function menu()
     {
@@ -27,45 +108,45 @@ class Content
         (
             'home' => array
             (
-                'name' => '首     页',
+                'name' => '<span>首</span><span>页</span>',
                 'active' => $uri == 'search' ? true : false,
             ),
 
             'news' => array
             (
-                'name' => '资&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;讯',
+                'name' => '<span>资</span><span>讯</span>',
                 'active' => $type == 1 ? true : false,
                 
             ),
 
             'xnr' => array
             (
-                'name' => '虚&nbsp;拟&nbsp;人',
+                'name' => '<span>虚</span><span>拟</span><span>人</span>',
                 'active' => false,
                 'uri' => array('xnr-detail', 'zwz-detail'),
             ),
 
             'feature' => array
             (
-                'name' => '专&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题',
+                'name' => '<span>专</span><span>题</span>',
                 'active' => $type == 2 ? true : false,
             ),
 
             'video' => array
             (
-                'name' => '视&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;频',
+                'name' => '<span>视</span><span>频</span>',
                 'active' => $type == 3 ? true : false,
             ),
 
             'activity' => array
             (
-                'name' => '活&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;动',
+                'name' => '<span>活</span><span>动</span>',
                 'active' => $type == 4 ? true : false,
             ),
 
             'contact' => array
             (
-                'name' => '关于我们',
+                'name' => '<span>关</span><span>于</span><span>我</span><span>们</span>',
                 'active' => false,
             ),
         );
@@ -78,11 +159,46 @@ class Content
             } else {
                 $menu[$k]['class'] = '';
             }
+
+            $menu[$k]['html'] = $this->getMenuHtml($k, $menu[$k]);
         }
 
         return $menu;
     }
 
+    private function getMenuHtml($k, $v)
+    {
+        $html = '<a href="'.$v['link'].'">'.$v['name'].'</a>';
+
+        if ($k == 'news' || $k == 'feature') {
+            $name = strip_tags($v['name']);
+            if ($k == 'news') {
+                $t = 1;
+            } else {
+                $t = 3;
+            }
+            $data = Dever::load('push/lib/data')->get('menu_' . $k, '菜单里的' . $name . '推荐列表', 4, '1,3,5');
+            if (!$data) {
+                $data = Dever::load('content/lib/news')->getHome($t, 4);
+            }
+
+            if ($data) {
+                $html .= '<div class="'.$k.'-rec-layer header-recommend-layer">';
+                foreach ($data as $k1 => $v1) {
+                    $html .= '<dl>
+                            <a href="'.$v1['link'].'" target="_blank">
+                                <dt class="poster"><img src="'.$v1['pic'].'" alt="" /></dt>
+                                <dd>'.$v1['name'].'</dd>
+                            </a>
+                        </dl>';
+                }
+                $html .= '</div>';
+            }
+        }
+
+        return $html;
+    }
+
     # 首页广告
     public function ad()
     {
@@ -96,7 +212,8 @@ class Content
     {
         $key = Dever::input('key', 'home_focus');
         $name = Dever::input('name', '首页焦点图');
-        return Dever::load('push/lib/data')->get($key, $name, 5, '1,2,5');
+        $num = Dever::input('num', 0);
+        return Dever::load('push/lib/data')->get($key, $name, 5, '1,2,5', '10', false, $num);
     }
 
     # 获取热门推荐
@@ -139,8 +256,20 @@ class Content
     # 获取首页专题
     public function home_feature()
     {
-        //$data = Dever::load('push/lib/data')->get('home_feature', '首页专题', 5, '1,2,3,4,5,6,7');
-        $data = false;
+        $data = Dever::load('push/lib/data')->get('home_feature', '首页专题', 5, '1,2,3,4,5,6,7');
+        //$data = false;
+        if (!$data) {
+            $data = Dever::load('content/lib/news')->getHome(2, 5);
+        }
+
+        return $data;
+    }
+
+    # 获取列表页专题
+    public function list_feature()
+    {
+        $data = Dever::load('push/lib/data')->get('list_feature', '专题列表顶部推荐位', 5, '1,2,3,4,5,6,7');
+        //$data = false;
         if (!$data) {
             $data = Dever::load('content/lib/news')->getHome(2, 5);
         }
@@ -154,10 +283,12 @@ class Content
         //$data = Dever::load('push/lib/data')->get('home_video', '首页视频', 5, '1,2,3,4,5,6,7');
         $data = false;
         if (!$data) {
-            $data = Dever::load('content/lib/news')->getHome(3, 5);
+            $data = Dever::load('content/lib/news')->getHome(3, 3);
         }
 
         if ($data) {
+            $data[0]['sname'] = '<a href="'.$data[0]['link'].'">'.$data[0]['sname'].'</a>';
+            $data[0]['info'] = Dever::cut($data[0]['info'], 70);
             return $data[0];
         }
 
@@ -169,7 +300,7 @@ class Content
         //$data = Dever::load('push/lib/data')->get('home_video', '首页视频', 5, '1,2,3,4,5,6,7');
         $data = false;
         if (!$data) {
-            $data = Dever::load('content/lib/news')->getHome(3, 5);
+            $data = Dever::load('content/lib/news')->getHome(3, 3);
         }
 
         if ($data) {
@@ -213,6 +344,29 @@ class Content
         return $data;
     }
 
+    # 获取资讯
+    public function getNews()
+    {
+        $data = Dever::load('main/content.news');
+        if ($data) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取资讯
+    public function getNoNews()
+    {
+        $pg = Dever::input('pg');
+        $data = Dever::load('main/content.news');
+        if ($data || $pg > 1) {
+            return false;
+        }
+
+        return true;
+    }
+
     # 获取资讯详情
     public function view()
     {
@@ -226,12 +380,60 @@ class Content
         return $data;
     }
 
+    # 获取底层页封面图
+    public function view_pic()
+    {
+        $data = Dever::load('main/content.view_video_1');
+        if ($data) {
+            return false;
+        }
+
+        return true;
+    }
+
+    # 获取底层页视频
+    public function view_video()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['video']) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取底层页头部视频
+    public function view_video_1()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['type'] == 3 && $data['video']) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取底层页尾部视频
+    public function view_video_2()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['type'] != 3 && $data['content_video']) {
+            return true;
+        }
+
+        return false;
+    }
+
     # 获取标签
     public function view_tag()
     {
         $data = Dever::load('main/content.view');
         $result = array();
         if ($data['tag']) {
+            $tag = '';
             if (strstr($data['tag'], ',')) {
                 $tag = explode(',', $data['tag']);
             } elseif (strstr($data['tag'], ',')) {
@@ -404,6 +606,18 @@ class Content
         return array();
     }
 
+    # 虚拟人信息 多个图片
+    public function getXnrOne_pic()
+    {
+        $data = Dever::load('main/content.getXnrOne');
+
+        if ($data && isset($data['pic_list']) && $data['pic_list']) {
+            return $data['pic_list'];
+        }
+
+        return array();
+    }
+
     # 获取虚拟人列表
     public function getXnr()
     {
@@ -415,8 +629,8 @@ class Content
             $html .= '<dl id="'.$k.'"><dt>' . $k . '</dt><dd>';
 
             foreach ($v as $k1 => $v1) {
-                $url = Dever::url('xnr-detail?id=' . $v1['id']);
-                $html .= '<a href="'.$url.'">'.$v1['name'].' / '.$v1['ename'].'</a>';
+                $url = Dever::url('main/xnr-detail?id=' . $v1['id']);
+                $html .= '<a href="'.$url.'">'.$v1['name'].'</a>';
             }
 
             $html .= '</dl>';
@@ -436,8 +650,8 @@ class Content
             $html .= '<dl id="'.$k.'"><dt>' . $k . '</dt><dd>';
 
             foreach ($v as $k1 => $v1) {
-                $url = Dever::url('zwz-detail?id=' . $v1['id']);
-                $html .= '<a href="'.$url.'">'.$v1['name'].' / '.$v1['desc'].'</a>';
+                $url = Dever::url('main/zwz-detail?id=' . $v1['id']);
+                $html .= '<a href="'.$url.'">'.$v1['name'].'</a>';
             }
 
             $html .= '</dl>';
@@ -445,4 +659,28 @@ class Content
         }
         return $html;
     }
+
+    # 播放视频
+    public function video()
+    {
+        $id = Dever::input('id');
+
+        $data = Dever::db('content/news')->one($id);
+
+        $video = '';
+        if ($data && $data['type'] == 3) {
+            $video = $data['video'];
+        } elseif ($data && $data['type'] != 3) {
+            $video = $data['content_video'];
+        }
+        if ($data && $video) {
+            $info['video'] = $video;
+            if (strstr($info['video'], '.qq.com')) {
+                $info['video'] = Dever::qqvideo($info['video']);
+            }
+
+            return $info;
+        }
+        return array();
+    }
 }

main/template/xuniren/activity.php

@@ -14,31 +14,59 @@ $view
     'main/content.news|type=4',
     array
     (
-        'img' => array
+        'self' => array
         (
-            'src' => '$v.small_pic',
-            'alt' => '$v.name',
-        ),
+            'img' => array
+            (
+                'src' => '$v.small_pic',
+                'alt' => '$v.name',
+            ),
+
+            'span' => array
+            (
+                'html' => '$v.pdate_s',
+            ),
 
-        'a|0' => array
-        (
             'href' => '$v.link',
             'title' => '$v.name',
-            'html' => '$v.name ."<br/>". $v.desc',
+            'div' => array
+            (
+                'h3' => array
+                (
+                    'html' => '$v.sname',
+                ),
+                'p' => array
+                (
+                    'html' => '$v.info',
+                ),
+            ),
+            
         ),
         
+    )
+)
 
-        'p' => array
+# 广告
+->loop
+(
+    '.ad-swiper .swiper-slide',
+    'main/content.ad|key=act_ad&name=活动广告',
+    array
+    (
+        'a' => array
         (
-            'html' => '$v.info',
+            'href' => '$v.link',
+            'title' => '$v.name',
         ),
 
-        'span' => array
+        'img' => array
         (
-            'html' => '$v.pdate_s',
+            'src' => '$v.pic',
+            'alt' => '$v.name',
         ),
     )
 )
+
 ->fetch('.activity-module@style', 'main/content.news?type=4', 'none')
 
 ->append('body', '<div id="page" dever-page-link="<{Dever::pageInfo()["link"]}>" dever-page-list=".news-module"></div>')

main/template/xuniren/article.php

@@ -9,12 +9,32 @@ $view
 
 ->fetch('body@test', '1')
 
-->fetch('.common-tit span', 'main/content.view#sname')
-->fetch('.common-tit em', 'main/content.view#pdate_string')
+->fetch(array('.common-tit span', 0), 'main/content.view#sname')
+->fetch(array('.common-tit em', 0), 'main/content.view#pdate_string')
 
+->fetch(array('.common-tit span', 1), 'main/content.view#sname')
+->fetch(array('.common-tit em', 1), 'main/content.view#pdate_string')
+
+->fetch(array('.article-wrapper img@src', 2), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@style', 2), 'main/content.view_pic', 'none')
+
+->fetch(array('.article-content .article', 0), 'main/content.view#content')
+
+->fetch(array('.btn-link@data-clipboard-text', 0), 'main/content.view#link')
+
+# 页面上部视频 仅限视频模板
+->fetch(array('.video-module@style', 0), 'main/content.view_video_1', 'none')
 ->fetch(array('.article-wrapper img@src', 0), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@src', 1), 'main/content.view#pic')
+->fetch(array('.icon-play@data-url', 0), 'main/content.view#video_link')
+
+
+# 页面下部视频 仅限除视频之外的模板
+->fetch(array('.article-video@style', 0), 'main/content.view_video_2', 'none')
+->fetch(array('.article-video img@src', 0), 'main/content.view#content_video_pic')
+->fetch(array('.article-video img@src', 1), 'main/content.view#content_video_pic')
+->fetch(array('.icon-play@data-url', 1), 'main/content.view#video_link')
 
-->fetch(array('.article-content article', 0), 'main/content.view#content')
 
 # 标签
 ->fetch('.tags h5', 'main/content.view#tag_name')

main/template/xuniren/contact.php

@@ -11,6 +11,27 @@ $view
 
 ->fetch('.contact-article', 'main/content.getAbout#content')
 
+# 广告
+->loop
+(
+    '.ad-swiper .swiper-slide',
+    'main/content.ad|key=contact_ad&name=联系我们广告',
+    array
+    (
+        'a' => array
+        (
+            'href' => '$v.link',
+            'title' => '$v.name',
+        ),
+
+        'img' => array
+        (
+            'src' => '$v.pic',
+            'alt' => '$v.name',
+        ),
+    )
+)
+
 ->import('inc/foot')
 
 ->display();   

main/template/xuniren/feature.php

@@ -11,7 +11,7 @@ $view
 ->loop
 (
     '.features-module .swiper-slide',
-    'main/content.home_feature',
+    'main/content.list_feature',
     array
     (
         'a|0' => array
@@ -21,7 +21,7 @@ $view
 
             'img' => array
             (
-                'src' => '$v.pic',
+                'src' => '$v.small_pic',
                 'alt' => '$v.name',
             ),
         ),
@@ -33,16 +33,20 @@ $view
             'html' => '$v.name ."<br/>". $v.desc',
         ),
         
-
-        'p' => array
+        'div' => array
         (
-            'html' => '$v.info',
-        ),
+            'p' => array
+            (
+                'html' => '$v.info',
+            ),
 
-        'span' => array
-        (
-            'html' => '$v.pdate_string',
+            'span' => array
+            (
+                'html' => '$v.pdate_string',
+            ),
         ),
+
+        
     )
 )
 ->fetch('.features-module@style', 'main/content.home_feature', 'none')

main/template/xuniren/home.php

@@ -4,16 +4,18 @@ $view
 
 ->set('name', 'index')   
 
+/*
 ->fetch(array('link@href', 2),      Dever::assets("global.css"))
 ->fetch(array('link@href', 3),      Dever::assets('<{(isset($name) ? $name : "index")}>.css', "css"))
 ->fetch(array('script@src', 2),     Dever::assets('global.js'))
 ->fetch(array('script@src', 3),     Dever::assets('<{(isset($name) ? $name : "index")}>.js', 'js'))
+*/
 
 ->import('inc/head')
 
 //->fetch(array('.ad', 0), '<{Dever::load("main/content.getAd", "首页精选下侧广告位1200X180")}>')
 //->fetch(array('.ad', 1), '<{Dever::load("main/content.getAd", "首页时装右侧广告位380X458")}>') 
-
+  
 # 焦点图
 ->loop
 (
@@ -25,18 +27,20 @@ $view
         (
             'href' => '$v.link',
             'title' => '$v.name',
-        ),
 
-        'img' => array
-        (
-            'src' => '$v.pic',
-            'alt' => '$v.name',
-        ),
+            'img' => array
+            (
+                'src' => '$v.pic',
+                'alt' => '$v.name',
+            ),
 
-        'span' => array
-        (
-            'html' => '$v.name ."<br/>". $v.desc',
+            'span' => array
+            (
+                'html' => '$v.name ."<br/>". $v.desc',
+            ),
         ),
+
+        
     )
 )
 
@@ -128,13 +132,13 @@ $view
 
             'h5' => array
             (
-                'html' => '$v.name ." / ". $v.ename',
+                'html' => '$v.name',
             ),
             
 
             'p' => array
             (
-                'html' => '$v.info',
+                'html' => '$v.home_info',
             ),
         ),
 
@@ -160,7 +164,7 @@ $view
 
             'img' => array
             (
-                'src' => '$v.pic',
+                'src' => '$v.small_pic',
                 'alt' => '$v.name',
             ),
         ),
@@ -192,7 +196,13 @@ $view
 # 视频
 ->fetch('.videoposter img@src', 'main/content.home_video_first#pic')
 ->fetch('.videoplayer img@src', 'main/content.home_video_first#pic')
-->fetch(array('.icon-play@data-vid=', 0), 'main/content.home_video_first#video_id')
+->fetch(array('.icon-play@data-url', 0), 'main/content.home_video_first#video_link')
+
+->fetch(array('.topic-video h3@html', 0), 'main/content.home_video_first#sname')
+->fetch(array('.topic-video p@html', 0), 'main/content.home_video_first#info')
+->fetch(array('.topic-video span@html', 0), 'main/content.home_video_first#pdate_string')
+
+->fetch('.topic-video@style', 'main/content.home_video_first', 'none')
 
 ->loop
 (
@@ -213,6 +223,11 @@ $view
             'em' => array
             (
                 'class' => 'a iconfont icon-play',
+                'data-title' => '$v.name',
+                'data-subtitle' => '$v.desc',
+                'data-desc' => '$v.info',
+                'data-by' => '$v.pdate_string',
+                'data-url' => '$v.video_link',
             ),
         ),
 
@@ -251,24 +266,27 @@ $view
             'src' => '$v.small_pic',
             'alt' => '$v.name',
         ),
-
-        'a|0' => array
+        'a' => array
         (
             'href' => '$v.link',
             'title' => '$v.name',
-            'html' => '$v.name ."<br/>". $v.desc',
-        ),
-        
+            'h3' => array
+            (
+                'html' => '$v.name ."<br/>". $v.desc',
+            ),
+            
 
-        'p' => array
-        (
-            'html' => '$v.info',
-        ),
+            'p' => array
+            (
+                'html' => '$v.info',
+            ),
 
-        'span' => array
-        (
-            'html' => '$v.pdate_s',
+            'span' => array
+            (
+                'html' => '$v.pdate_s',
+            ),
         ),
+        
     )
 )
 ->fetch(array('.common-tit@style', 4), 'main/content.home_act', 'none')

main/template/xuniren/inc/head.php

@@ -5,16 +5,28 @@ $view
 ->fetch('meta[name="Keywords"]@content',                    '<{isset($keywords) ? Dever::load("main/content.config#keywords") . "," . $keywords : Dever::load("main/content.config#keywords")}>')
 ->fetch('meta[name="Description"]@content',                    '<{isset($info) ? Dever::load("main/content.config#info") . "," . $info : Dever::load("main/content.config#info")}>')
 ->fetch('.logo img@src',                    'main/content.config#logo')
-->fetch('.logo img@style',                    'width:100px')
+->fetch('.blogo img@src',                    'main/content.config#logo')
+
+->fetch('.logo img@data-wlogo',                    'main/content.config#logo_black')
+->fetch('.blogo img@data-wlogo',                    'main/content.config#logo_black')
+
+
+->fetch('.copyright img@src',                    'main/content.config#weixin_qrcode')
+->fetch('footer span',                    'main/content.config#beian')
+//->fetch('.logo img@style',                    'width:100px')
 
 # 登录
 //->fetch('.menu', 'main/content.user')
 
 # 联系方式
 ->fetch('.user-layer .icon-weibo@href', '<{Dever::load("main/content.config#weibo")}>')
+->fetch('.share .icon-weibo@href', '<{Dever::load("main/content.config#weibo")}>')
+
 ->fetch('.qrcode img@src', '<{Dever::load("main/content.config#weixin_qrcode")}>')
 ->fetch('.user-layer .icon-weixin@href', '#')
-->fetch('.user-layer .icon-link@href', '<{Dever::load("main/content.config#contact")}>')
+->fetch('.share .icon-weixin@href', '#')
+
+->fetch('.user-layer .icon-email@href', '<{Dever::load("main/content.config#contact")}>')
 
 # 搜索
 ->fetch('.search-layer input@id', 'search')
@@ -50,18 +62,13 @@ $view
     'main/content.menu',
     array
     (
-        'a' => array
-        (
-            'href' => '$v.link',
-            'html' => '$v.name',
-        ),
-
         'self' => array
         (
             'class' => '$v.class',
+            'html' => '$v.html',
         ),
     )
 )
 
-->append('head',    '<script><{Dever::script()}></script>');
+->append('head',    '<script><{Dever::script()}><{Dever::load("main/content.share")}></script>');
 //->append('head',    '<script><{Dever::script()}>config.uid=<{Dever::load("passport/user.data") ? Dever::load("passport/user.data#id") : -1}></script>');

main/template/xuniren/news.php

@@ -36,7 +36,7 @@ $view
         'span' => array
         (
             'html' => '$v.name ."<br/>". $v.desc',
-        ),
+        ), 
     )
 )
 
@@ -67,7 +67,44 @@ $view
 
 ->loop
 (
-    '.news-module dl',
+    '#mobile_tuijian dl',
+    'main/content.focus|key=news_focus&name=资讯焦点图&num=1',
+    array
+    (
+        'a|0' => array
+        (
+            'href' => '$v.link',
+            'title' => '$v.name',
+
+            'img' => array
+            (
+                'src' => '$v.pic',
+                'alt' => '$v.name',
+            ),
+        ),
+
+        'a|1' => array
+        (
+            'href' => '$v.link',
+            'title' => '$v.name',
+            'html' => '$v.name ."<br/>". $v.desc',
+        ),
+        
+        'p' => array
+        (
+            'html' => '$v.info',
+        ),
+
+        'span' => array
+        (
+            'html' => '$v.pdate_string',
+        ),
+    )
+)
+
+->loop
+(
+    '#news dl',
     'main/content.news|type=1',
     array
     (

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/video.php

@@ -9,7 +9,7 @@ $view
 
 ->fetch('.videoposter img@src', 'main/content.home_video_first#pic')
 ->fetch('.videoplayer img@src', 'main/content.home_video_first#pic')
-->fetch(array('.icon-play@data-vid=', 0), 'main/content.home_video_first#video_id')
+->fetch(array('.icon-play@data-url', 0), 'main/content.home_video_first#video_link')
 
 ->fetch(array('h3@html', 0), 'main/content.home_video_first#sname')
 ->fetch(array('p@html', 0), 'main/content.home_video_first#info')
@@ -35,6 +35,11 @@ $view
             'em' => array
             (
                 'class' => 'a iconfont icon-play',
+                'data-title' => '$v.name',
+                'data-subtitle' => '$v.desc',
+                'data-desc' => '$v.info',
+                'data-by' => '$v.pdate_string',
+                'data-url' => '$v.video_link',
             ),
         ),
 
@@ -66,6 +71,11 @@ $view
             'em' => array
             (
                 'class' => 'a iconfont icon-play',
+                'data-title' => '$v.name',
+                'data-subtitle' => '$v.desc',
+                'data-desc' => '$v.info',
+                'data-by' => '$v.pdate_string',
+                'data-url' => '$v.video_link',
             ),
         ),
 
@@ -89,6 +99,27 @@ $view
     )
 )
 
+# 广告
+->loop
+(
+    '.ad-swiper .swiper-slide',
+    'main/content.ad|key=video_ad&name=视频广告',
+    array
+    (
+        'a' => array
+        (
+            'href' => '$v.link',
+            'title' => '$v.name',
+        ),
+
+        'img' => array
+        (
+            'src' => '$v.pic',
+            'alt' => '$v.name',
+        ),
+    )
+)
+
 
 ->fetch('.common-pagination', '<{Dever::pageInfo()["html"]}>')
 

main/template/xuniren/xnr-detail.php

@@ -9,7 +9,27 @@ $view
 
 ->fetch('body@test', '1')
 
-->fetch(array('.avatar img@src', 0), 'main/content.getXnrOne#pic')
+//->fetch(array('.avatar img@src', 0), 'main/content.getXnrOne#pic')
+
+->loop
+(
+    '.swiper-container .swiper-slide',
+    'main/content.getXnrOne_pic',
+    array
+    (
+        'a' => array
+        (
+            'img' => array
+            (
+                'src' => '$v',
+            ),
+
+            'href' => 'javascript:;',
+        ),
+        
+    )
+)
+
 ->fetch(array('.xnr-profile dt', 0), 'main/content.getXnrOne#sname')
 
 ->fetch(array('.xnr-profile b', 0), 'main/content.getXnrOne#sex')
@@ -43,6 +63,12 @@ $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#bilibili')
+->fetch('.shares .icon-douyin@href', 'main/content.getXnrOne#douyin')
+->fetch('.shares .icon-ins@href', 'main/content.getXnrOne#ins_link')
+->fetch('.shares .ins-layer', 'main/content.getXnrOne#ins')
+
 ->import('inc/foot')
 
 ->display();