修复记录记录无法正常记录fyclass的bug

controllers/cms.py

@@ -1139,6 +1139,9 @@ class CMS:
     def detailOneVod(self,id,fyclass='',show_name=False):
         vod = self.blank_vod()
         orId = str(id)
+        orUrl = orId
+        if fyclass:
+            orUrl = f'{fyclass}${orId}'
         detailUrl = orId.split('@@')[0]
         # print(detailUrl)
         if not detailUrl.startswith('http') and not '/' in detailUrl:
@@ -1206,14 +1209,14 @@ class CMS:
                 else:
                     vod = self.blank_vod()
             else:
-                vod = self.二级渲染(p,detailUrl=detailUrl,orId=orId,url=url,vod=vod,show_name=show_name,jsp=jsp,fyclass=fyclass)
+                vod = self.二级渲染(p,detailUrl=detailUrl,orId=orUrl,url=url,vod=vod,show_name=show_name,jsp=jsp,fyclass=fyclass)
         except Exception as e:
             logger.info(f'{self.getName()}获取单个详情页{detailUrl}出错{e}')
         if self.图片来源:
             if vod.get('vod_pic','') and str(vod['vod_pic']).startswith('http'):
                 vod['vod_pic'] = f"{vod['vod_pic']}{self.图片来源}"
-        if not vod.get('vod_id'):
-            vod['vod_id'] = orId
+        if not vod.get('vod_id') or ('$' in orUrl and vod['vod_id']!=orUrl):
+            vod['vod_id'] = orUrl
         # print(vod)
         return vod
 
@@ -1230,7 +1233,7 @@ class CMS:
         obj_list = []
         try:
             for vod_url in array:
-                # print(vod_url)
+                print(vod_url)
                 vod_class = ''
                 if vod_url.find('$') > -1:
                     tmp = vod_url.split('$')

doc/更新日志.md

+###### 2023/03/16
+- [X] 3.9.39 drpy修复历史记录无法带入fyclass的bug
+- 
 ###### 2023/03/14
 - [X] 3.9.37beta3 drpy前端index.html关联链接修复
 

js/version.txt

-3.9.38beta5
\ No newline at end of file
+3.9.39beta1
\ No newline at end of file

libs/drpy.js

@@ -55,7 +55,7 @@ function pre(){
 }
 
 let rule = {};
-const VERSION = 'drpy1 3.9.37beta1 20230306';
+const VERSION = 'drpy1 3.9.39beta1 20230316';
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -1994,7 +1994,7 @@ function detailParse(detailObj){
     if(rule.图片来源 && vod.vod_pic && vod.vod_pic.startsWith('http')){
         vod.vod_pic = vod.vod_pic + rule.图片来源;
     }
-    if(!vod.vod_id){
+    if(!vod.vod_id||(vod_id.includes('$')&&vod.vod_id!==vod_id)){
         vod.vod_id = vod_id;
     }
     let t2 = (new Date()).getTime();

libs/drpy2.js

@@ -41,7 +41,7 @@ function pre(){
 
 let rule = {};
 let vercode = typeof(pdfl) ==='function'?'drpy2.1':'drpy2';
-const VERSION = vercode+' 3.9.37beta1 20230306';
+const VERSION = vercode+' 3.9.39beta1 20230316';
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -1855,7 +1855,7 @@ function detailParse(detailObj){
     if(rule.图片来源 && vod.vod_pic && vod.vod_pic.startsWith('http')){
         vod.vod_pic = vod.vod_pic + rule.图片来源;
     }
-    if(!vod.vod_id){
+    if(!vod.vod_id||(vod_id.includes('$')&&vod.vod_id!==vod_id)){
         vod.vod_id = vod_id;
     }
     let t2 = (new Date()).getTime();
@@ -2112,6 +2112,7 @@ function category(tid, pg, filter, extend) {
 function detail(vod_url) {
     let orId = vod_url;
     let fyclass = '';
+    log('orId:'+orId);
     if(vod_url.indexOf('$')>-1){
         let tmp = vod_url.split('$');
         fyclass = tmp[0];