fix 960 角色、剧情页面参数优化

application/common.php

@@ -1120,8 +1120,9 @@ function mac_get_aid($controller,$action='')
     $arr=['index'=>1,'map'=>2,'rss'=>3,'gbook'=>4,'comment'=>5,'user'=>6,'label'=>7,'vod'=>10,'art'=>20,'topic'=>30,'actor'=>80,'role'=>90,'plot'=>100,'website'=>110];
     $res = $arr[$controller];
 
+    // https://github.com/magicblack/maccms10/issues/960
     $arr=[
-        'vod/type'=>11,'vod/show'=>12,'vod/search'=>13,'vod/detail'=>14,'vod/play'=>15,'vod/down'=>16,'vod/role'=>17,
+        'vod/type'=>11,'vod/show'=>12,'vod/search'=>13,'vod/detail'=>14,'vod/play'=>15,'vod/down'=>16,'vod/role'=>17,'vod/plot'=>18,
         'art/type'=>21,'art/show'=>22,'art/search'=>23,'art/detail'=>24,
         'topic/search'=>33,'topic/detail'=>34,
         'actor/type'=>81,'actor/show'=>82,'actor/search'=>83,'actor/detail'=>84,
@@ -2670,6 +2671,10 @@ function mac_label_role_detail($param)
     }
     $where['role_status'] = ['eq',1];
     $res = model('Role')->infoData($where,'*',1);
+
+    // https://github.com/magicblack/maccms10/issues/960
+    $GLOBALS['type_id'] = isset($res['info']['data']['type_id']) ? $res['info']['data']['type_id'] : 0;
+    $GLOBALS['type_pid'] = isset($res['info']['data']['type_id_1']) ? $res['info']['data']['type_id_1'] : 0;
     return $res;
 }
 function mac_label_topic_detail($param)

application/index/controller/Plot.php

@@ -11,6 +11,9 @@ class Plot extends Base
 
     public function index()
     {
+        // https://github.com/magicblack/maccms10/issues/960
+        $param = mac_param_url();
+        $this->assign('param',$param);
         return $this->label_fetch('plot/index');
     }