1，修复站群和wap站点冲突的问题。

2，修复批量操作的问题。
3，修复ajax接口搜索开关问题。
4，其他细节。

application/admin/controller/Art.php

@@ -146,8 +146,9 @@ class Art extends Base
             }
             mac_echo( "<font color=red>共".$total."条数据需要处理，每页".$param['limit']."条，共".$page_count."页，正在处理第".$param['page']."页数据</font>");
 
+            $page = $param['page_count'] - $param['page'] + 1;
             $order='art_id desc';
-            $res = model('Art')->listData($where,$order,$param['page'],$param['limit']);
+            $res = model('Art')->listData($where,$order,$page,$param['limit']);
 
             foreach($res['list'] as  $k=>$v){
                 $where2 = [];

application/admin/controller/Vod.php

@@ -157,7 +157,7 @@ class Vod extends Base
             mac_echo('<style type="text/css">body{font-size:12px;color: #333333;line-height:21px;}span{font-weight:bold;color:#FF0000}</style>');
 
             if(empty($param['ck_del']) && empty($param['ck_level']) && empty($param['ck_status']) && empty($param['ck_lock']) && empty($param['ck_hits'])
-                && empty($param['ck_points'])
+                && empty($param['ck_points']) && empty($param['ck_copyright'])
             ){
                 return $this->error('没有选择任何参数');
             }
@@ -269,8 +269,9 @@ class Vod extends Base
             }
             mac_echo( "<font color=red>共".$param['total']."条数据需要处理，每页".$param['limit']."条，共".$param['page_count']."页，正在处理第".$param['page']."页数据</font>");
 
+            $page = $param['page_count'] - $param['page'] + 1;
             $order='vod_id desc';
-            $res = model('Vod')->listData($where,$order,$param['page'],$param['limit']);
+            $res = model('Vod')->listData($where,$order,$page,$param['limit']);
 
             foreach($res['list'] as  $k=>$v){
                 $where2 = [];
@@ -288,7 +289,7 @@ class Vod extends Base
                     $des .= '&nbsp;状态：'.($param['val_status'] ==1 ? '[已审核]':'[未审核]') .'；';
                 }
                 if(!empty($param['ck_copyright']) && isset($param['val_copyright'])){
-                    $update['val_copyright'] = $param['val_copyright'];
+                    $update['vod_copyright'] = $param['val_copyright'];
                     $des .= '&nbsp;版权：'.($param['val_copyright'] ==1 ? '[已开启]':'[未关闭') .'；';
                 }
                 if(!empty($param['ck_lock']) && isset($param['val_lock'])){

application/admin/view/art/batch.html

@@ -143,6 +143,14 @@
                 </div>
             </div>
 
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">每页条数</label>
+                    <div class="layui-input-inline" style="width: 100px;">
+                        <input type="text" name="limit" required  placeholder="" autocomplete="off" value="100" class="layui-input">
+                    </div>
+                </div>
+            </div>
             <div class="layui-form-item">
                 <button type="submit" class="layui-btn btn_submit">批量设置</button>
             </div>

application/admin/view/vod/batch.html

@@ -238,7 +238,14 @@
                 </div>
             </div>
 
-
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">每页条数</label>
+                    <div class="layui-input-inline" style="width: 100px;">
+                        <input type="text" name="limit" required  placeholder="" autocomplete="off" value="100" class="layui-input">
+                    </div>
+                </div>
+            </div>
             <div class="layui-form-item">
                 <button type="submit" class="layui-btn btn_submit">开始执行</button>
             </div>

application/admin/view/vod/index.html

@@ -220,6 +220,7 @@
                     {if condition="$vo.vod_isend eq 0 && $vo.vod_serial neq ''"} <span class="layui-badge layui-bg-blue">连载{$vo.vod_serial}</span>{/if}
                     {if condition="$vo.vod_remarks neq ''"} <span class="layui-badge layui-bg-orange">{$vo.vod_remarks}</span>{/if}
                     {if condition="$vo.vod_plot eq 1"} <span class="layui-badge layui-bg-cyan">剧情</span>{/if}
+                    {if condition="$vo.vod_copyright eq 1"} <span class="layui-badge layui-bg-black">版权</span>{/if}
                 </td>
                 <td>{$vo.vod_hits}</td>
                 <td>{$vo.vod_score}</td>

application/common.php

@@ -909,7 +909,7 @@ function mac_rep_pse_syn($psearr,$txt)
 }
 
 function mac_get_tag($title,$content){
-    $url = base64_decode('aHR0cDovL2FwaS5tYWNjbXMuY29t').'/keyword/index?txt='.rawurlencode($title).rawurlencode(mac_substring(strip_tags($content),200));
+    $url = base64_decode('aHR0cDovL2FwaS5tYWNjbXMuY29t').'/keyword/index?name='.rawurlencode($title).'&txt='.rawurlencode($title).rawurlencode(mac_substring(strip_tags($content),200));
     $data = mac_curl_get($url);
 	$json = @json_decode($data,true);
 	if($json){

application/common/behavior/Init.php

@@ -34,7 +34,7 @@ class Init
         $TMP_HTMLDIR = $config['site']['html_dir'];
         $TMP_ADSDIR = $config['site']['ads_dir'];
 
-        if($isMobile){
+        if($isMobile && $isDomain==0){
             if( ($config['site']['mob_status']==2 ) || ($config['site']['mob_status']==1 && $_SERVER['HTTP_HOST']==$config['site']['site_wapurl']) || ($config['site']['mob_status']==1 && $isDomain) ) {
                 $TMP_ISWAP = 1;
                 $TMP_TEMPLATEDIR = $config['site']['mob_template_dir'];

application/extra/version.php

@@ -3,7 +3,7 @@ return array (
     'name' => '苹果CMS',
     'copyright' => 'MacCMS.LA',
     'url' => '//www.maccms.la/',
-    'code' => '2020.1000.1033',
+    'code' => '2020.1000.1034',
     'license' => '免费版',
 );
 ?>

application/index/controller/Ajax.php

@@ -87,6 +87,10 @@ class Ajax extends Base
 
     public function suggest()
     {
+        if($GLOBALS['config']['app']['search'] !='1'){
+            return json(['code'=>999,'msg'=>'搜索功能关闭中']);
+        }
+
         $mid = $this->_param['mid'];
         $wd = $this->_param['wd'];
         $limit = intval($this->_param['limit']);

application/route.php

@@ -118,26 +118,6 @@ return array (
     array (
     ),
   ),
-  'actortype/<id>-<page?>' => 
-  array (
-    0 => 'actor/type',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'actortype/<id>' => 
-  array (
-    0 => 'actor/type',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
   'actor-<page?>' => 
   array (
     0 => 'actor/index',
@@ -168,7 +148,7 @@ return array (
     array (
     ),
   ),
-  'actorshow/<id>-<area?>-<blood?>-<by?>-<letter?>-<level?>-<order?>-<page?>-<sex?>-<starsign?>' => 
+  'actorshow/<area?>-<blood?>-<by?>-<letter?>-<level?>-<order?>-<page?>-<sex?>-<starsign?>' => 
   array (
     0 => 'actor/show',
     1 => 
@@ -178,16 +158,6 @@ return array (
     array (
     ),
   ),
-  'actorsearch/<wd?>-<area?>-<blood?>-<by?>-<letter?>-<level?>-<order?>-<page?>-<sex?>-<starsign?>' => 
-  array (
-    0 => 'actor/search',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
   'role-<page?>' => 
   array (
     0 => 'role/index',
@@ -228,76 +198,6 @@ return array (
     array (
     ),
   ),
-  'websitetype/<id>-<page?>' => 
-  array (
-    0 => 'website/type',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'websitetype/<id>' => 
-  array (
-    0 => 'website/type',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'website-<page?>' => 
-  array (
-    0 => 'website/index',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'website$' => 
-  array (
-    0 => 'website/index',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'websitedetail-<id>' => 
-  array (
-    0 => 'website/detail',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'websiteshow/<id>-<area?>-<by?>-<class?>-<lang?>-<letter?>-<level?>-<order?>-<page?>-<tag?>' => 
-  array (
-    0 => 'website/show',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
-  'websitesearch/<wd?>-<area?>-<by?>-<class?>-<lang?>-<letter?>-<level?>-<order?>-<page?>-<tag?>' => 
-  array (
-    0 => 'website/search',
-    1 => 
-    array (
-    ),
-    2 => 
-    array (
-    ),
-  ),
   'vodtype/<id>-<page?>' => 
   array (
     0 => 'vod/type',
@@ -378,6 +278,26 @@ return array (
     array (
     ),
   ),
+  'vodplot/<id>-<page?>' => 
+  array (
+    0 => 'vod/plot',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+    ),
+  ),
+  'vodplot/<id>' => 
+  array (
+    0 => 'vod/plot',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+    ),
+  ),
   'arttype/<id>-<page?>' => 
   array (
     0 => 'art/type',
@@ -468,4 +388,24 @@ return array (
     array (
     ),
   ),
+  'plotdetail/<id>-<page?>' => 
+  array (
+    0 => 'plot/plot',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+    ),
+  ),
+  'plotdetail/<id>' => 
+  array (
+    0 => 'plot/detail',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+    ),
+  ),
 );

template/default_pc/html/vod/plot.html

@@ -42,11 +42,11 @@
             {volist name="$vod_plot_list" id="vo"}
             <div>
                 <div style="padding-top:10px;">
-                    <a class="page_link" href="{:mac_url_plot_detail($obj,['page'=>$key])}" title="{$vo.name}"><b>{$vo.name}</b></a>
+                    <a class="page_link" href="{:mac_url_plot_detail($obj,['page'=>$key+1])}" title="{$vo.name}"><b>{$vo.name}</b></a>
                 </div>
                 <div>
                     {$vo.detail|mac_substring=50}
-                    <a href="{:mac_url_plot_detail($obj,['page'=>$key])}" title="{$vo.name}">[详情...]</a>
+                    <a href="{:mac_url_plot_detail($obj,['page'=>$key+1])}" title="{$vo.name}">[详情...]</a>
                 </div>
             </div>
             {/volist}

说明文档/伪静态规则/默认路由规则.txt

@@ -39,7 +39,10 @@ vodplay/<id>-<sid>-<nid>   => vod/play
 voddown/<id>-<sid>-<nid>   => vod/down
 vodshow/<id>-<area?>-<by?>-<class?>-<lang?>-<letter?>-<level?>-<order?>-<page?>-<state?>-<tag?>-<year?>   => vod/show
 vodsearch/<wd?>-<actor?>-<area?>-<by?>-<class?>-<director?>-<lang?>-<letter?>-<level?>-<order?>-<page?>-<state?>-<tag?>-<year?>   => vod/search
-
+vodplot/<id>-<page?>   => vod/plot
+vodplot/<id>   => vod/plot
+plotdetail/<id>-<page?>   => plot/plot
+plotdetail/<id>   => plot/detail
 
 arttype/<id>-<page?>   => art/type
 arttype/<id>   => art/type