diff --git a/0821.json b/0821.json
index 5eb83b94..d8ece009 100644
--- a/0821.json
+++ b/0821.json
@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fan.txt;md5;8a9023a88704d4f491b2eee649be20d8",
+"spider":"./jar/fan.txt;md5;73c62850faf556c9c2d7048baf3a5d3a",
 "logo":"https://avatars.githubusercontent.com/u/58679624?v=4",
 "lives":[{"name":"初秋语•ipv4","type":0,"url":"./list.txt","playerType":2,"epg":"http://epg.112114.xyz/?ch={name}&date={date}","logo": "https://live.fanmingming.com/tv/{name}.png"},
 {"name":"YanG•综合","type":0,"url":"https://tv.iill.top/m3u/Gather","ua": "okhttp/3.15","playerType":2,"epg":"http://epg.112114.xyz/?ch={name}&date={date}"},
diff --git a/0826.json b/0826.json
index 053b6895..9adbce2e 100644
--- a/0826.json
+++ b/0826.json
@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fan.txt;md5;8a9023a88704d4f491b2eee649be20d8",
+"spider":"./jar/fan.txt;md5;73c62850faf556c9c2d7048baf3a5d3a",
 "wallpaper":"https://深色壁纸.xxooo.cf/",
 
 "sites":[
diff --git a/dianshi.json b/dianshi.json
index 848b5dc5..ba464b80 100644
--- a/dianshi.json
+++ b/dianshi.json
@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fan.txt;md5;8a9023a88704d4f491b2eee649be20d8",
+"spider":"./jar/fan.txt;md5;73c62850faf556c9c2d7048baf3a5d3a",
 "lives":[
     {"name":"live","boot": true,"type":0,"url":"./tv.txt","playerType":1,"ua":"okhttp/3.8.10","timeout":20,"epg":"https://epg.112114.eu.org/?ch={name}&date={date}","logo":"https://logo.ugigc.us.kg/{name}.png"}
 ],
@@ -53,7 +53,6 @@
 {"key":"初中课堂","name":"📚初中┃课堂","type":3,"api":"csp_Bili","style":{"type":"rect","ratio":1.597},"searchable":0,"quickSearch":0,"changeable":0,"ext":{"json":"./FTY/初中课堂.json"}},
 {"key":"高中教育","name":"📚高中┃课堂","type":3,"api":"csp_Bili","style":{"type":"rect","ratio":1.597},"searchable":0,"quickSearch":0,"changeable":0,"ext":{"json":"./FTY/高中课堂.json"}},
 
-{"key":"农民","name":"影视 |农民[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"数组":"<li>&&</li>","图片":"src=\"&&\"","分类url":"https://m.wwgz.cn/vod-list-id-{cateId}-pg-{catePg}-order--by--class-0-year-{year}-letter--area-{area}-lang-.html","分类":"短剧$26#电视剧$2#电影$1#动漫$4#综艺$3"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"骚火","name":"影视 | 骚火[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"嗅探词":".m3u8#.mp4#.m3u8?#freeok.mp4","分类url":"https://shdy2.com/list/{cateId}-{catePg}.html;;vr1au0","分类":"电影$1#电视剧$2#韩剧$22#美剧$23#动漫$4","数组二次截取":"class=\"v_list\">&&</ul>","数组":"\"v_img\"&&/div>","标题":"title=\"&&\"","副标题":"v_note\"&&</div","跳转播放链接":"<iframe*src=\"&&\"","二次跳转播放链接":"https://hhjx.hhplayer.com/api.php;post;url=+var url*\"&&\"+&t=+var t*\"&&\"+&key=+var key*\"&&\"+&act=0+&play=1","三次跳转播放链接":"\"url\"*\"&&\""},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"晴天","name":"影视 | 晴天[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"分类url":"https://www.qinttv.com/qtyy/{cateId}/area/{area}/page/{catePg}/year/{year}.html","搜索url":"https://www.qinttv.com/qtcz.html;post;wd={wd}&submit=","分类":"电影$dianying#电视剧$dianshiju#动漫$dongmna#综艺$zongyi"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"Freeok","name":"影视 | Freeok[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"分类url":"https://www.freeok.vip/vod-show/{cateId}-{area}-------{catePg}---{year}.html;;ar1","分类":"电影&剧集&动漫&综艺&短剧&少儿","分类值":"1&2&3&4&12&5","副标题":"<div class=\"module-item-note\">&&</div>","嗅探词":"m3u8#.m3u8#.mp4#freeok.mp4#/obj/","线路数组":"data-dropdown-value=&&</div>","线路数组": "data-dropdown-value=&&</div>[不包含:夸克]","导演":"导演：&&</div>","主演":"主演：&&</div>","简介":"<p>&&</p>"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
diff --git a/jar/fan.txt b/jar/fan.txt
index ae2c3b80..7205c2c1 100644
Binary files a/jar/fan.txt and b/jar/fan.txt differ
diff --git a/js/农民影视.js b/js/农民影视.js
index c3a8023b..d1e8b7f4 100644
--- a/js/农民影视.js
+++ b/js/农民影视.js
@@ -7,7 +7,7 @@ var rule = {
 	url: '/vod-list-id-fyfilter.html',
 	// /vod-list-id-2-pg-1-order--by-time-class-0-year-2023-letter--area--lang-.html
 	filterable: 1,//是否启用分类筛选,
-	filter_url: '{{fl.cateId}}-pg-{{fl.catePg}}-order--by--class-0-year-{{fl.year}}-letter--area-{{fl.area}}-lang-',
+	filter_url: '{{fl.cateId}}-pg-fypage-order--by-{{fl.by or "time"}}-class-0-year-{{fl.year}}-letter-{{fl.letter}}-area-{{fl.area}}-lang-',
 	filter: {
 		"1": [{ "key": "cateId", "name": "类型", "value": [{ "n": "全部", "v": "1" }, { "n": "动作片", "v": "5" }, { "n": "喜剧片", "v": "6" }, { "n": "爱情片", "v": "7" }, { "n": "科幻片", "v": "8" }, { "n": "恐怖片", "v": "9" }, { "n": "剧情片", "v": "10" }, { "n": "战争片", "v": "11" }, { "n": "惊悚片", "v": "16" }, { "n": "奇幻片", "v": "17" }] }, { "key": "area", "name": "地区", "value": [{ "n": "全部", "v": "" }, { "n": "大陆", "v": "大陆" }, { "n": "香港", "v": "香港" }, { "n": "台湾", "v": "台湾" }, { "n": "美国", "v": "美国" }, { "n": "韩国", "v": "韩国" }, { "n": "日本", "v": "日本" }, { "n": "泰国", "v": "泰国" }, { "n": "新加坡", "v": "新加坡" }, { "n": "马来西亚", "v": "马来西亚" }, { "n": "印度", "v": "印度" }, { "n": "英国", "v": "英国" }, { "n": "法国", "v": "法国" }, { "n": "加拿大", "v": "加拿大" }, { "n": "西班牙", "v": "西班牙" }, { "n": "俄罗斯", "v": "俄罗斯" }, { "n": "其它", "v": "其它" }] }, { "key": "year", "name": "年代", "value": [{ "n": "全部", "v": "" }, { "n": "2024", "v": "2024" }, { "n": "2023", "v": "2023" }, { "n": "2022", "v": "2022" }, { "n": "2021", "v": "2021" }, { "n": "2020", "v": "2020" }, { "n": "2019", "v": "2019" }, { "n": "2018", "v": "2018" }, { "n": "2017", "v": "2017" }, { "n": "2016", "v": "2016" }, { "n": "2015", "v": "2015" }, { "n": "2014", "v": "2014" }, { "n": "2013", "v": "2013" }, { "n": "2012", "v": "2012" }, { "n": "2011", "v": "2011" }, { "n": "2010", "v": "2010" }, { "n": "2009", "v": "2009" }, { "n": "2008", "v": "2008" }, { "n": "2007", "v": "2007" }, { "n": "2006", "v": "2006" }, { "n": "2005", "v": "2005" }, { "n": "2004", "v": "2004" }, { "n": "2003", "v": "2003" }, { "n": "2002", "v": "2002" }, { "n": "2001", "v": "2001" }, { "n": "2000", "v": "2000" }, { "n": "1999", "v": "1999" }, { "n": "1998", "v": "1998" }, { "n": "1997", "v": "1997" }, { "n": "1996", "v": "1996" }, { "n": "1995", "v": "1995" }, { "n": "1994", "v": "1994" }, { "n": "1993", "v": "1993" }, { "n": "1992", "v": "1992" }, { "n": "1991", "v": "1991" }, { "n": "1990", "v": "1990" }, { "n": "1989", "v": "1989" }, { "n": "1988", "v": "1988" }, { "n": "1987", "v": "1987" }, { "n": "1986", "v": "1986" }, { "n": "1985", "v": "1985" }, { "n": "1984", "v": "1984" }, { "n": "1983", "v": "1983" }, { "n": "1982", "v": "1982" }, { "n": "1981", "v": "1981" }, { "n": "1980", "v": "1980" }, { "n": "1979", "v": "1979" }, { "n": "1978", "v": "1978" }, { "n": "1977", "v": "1977" }, { "n": "1976", "v": "1976" }, { "n": "1975", "v": "1975" }, { "n": "1974", "v": "1974" }, { "n": "1973", "v": "1973" }, { "n": "1972", "v": "1972" }, { "n": "1971", "v": "1971" }, { "n": "1970", "v": "1970" }, { "n": "1969", "v": "1969" }, { "n": "1968", "v": "1968" }, { "n": "1967", "v": "1967" }, { "n": "1966", "v": "1966" }, { "n": "1965", "v": "1965" }, { "n": "1964", "v": "1964" }, { "n": "1963", "v": "1963" }, { "n": "1962", "v": "1962" }, { "n": "1961", "v": "1961" }, { "n": "1960", "v": "1960" }] }, { "key": "by", "name": "排序", "value": [{ "n": "时间", "v": "time" }, { "n": "人气", "v": "hits" }, { "n": "评分", "v": "score" }] }],
 		"2": [{ "key": "cateId", "name": "类型", "value": [{ "n": "全部", "v": "2" }, { "n": "国产剧", "v": "12" }, { "n": "港台泰", "v": "13" }, { "n": "日韩剧", "v": "14" }, { "n": "欧美剧", "v": "15" }] }, { "key": "area", "name": "地区", "value": [{ "n": "全部", "v": "" }, { "n": "大陆", "v": "大陆" }, { "n": "香港", "v": "香港" }, { "n": "台湾", "v": "台湾" }, { "n": "美国", "v": "美国" }, { "n": "韩国", "v": "韩国" }, { "n": "日本", "v": "日本" }, { "n": "泰国", "v": "泰国" }, { "n": "新加坡", "v": "新加坡" }, { "n": "马来西亚", "v": "马来西亚" }, { "n": "印度", "v": "印度" }, { "n": "英国", "v": "英国" }, { "n": "法国", "v": "法国" }, { "n": "加拿大", "v": "加拿大" }, { "n": "西班牙", "v": "西班牙" }, { "n": "俄罗斯", "v": "俄罗斯" }, { "n": "其它", "v": "其它" }] }, { "key": "year", "name": "年代", "value": [{ "n": "全部", "v": "" }, { "n": "2024", "v": "2024" }, { "n": "2023", "v": "2023" }, { "n": "2022", "v": "2022" }, { "n": "2021", "v": "2021" }, { "n": "2020", "v": "2020" }, { "n": "2019", "v": "2019" }, { "n": "2018", "v": "2018" }, { "n": "2017", "v": "2017" }, { "n": "2016", "v": "2016" }, { "n": "2015", "v": "2015" }, { "n": "2014", "v": "2014" }, { "n": "2013", "v": "2013" }, { "n": "2012", "v": "2012" }, { "n": "2011", "v": "2011" }, { "n": "2010", "v": "2010" }, { "n": "2009", "v": "2009" }, { "n": "2008", "v": "2008" }, { "n": "2007", "v": "2007" }, { "n": "2006", "v": "2006" }, { "n": "2005", "v": "2005" }, { "n": "2004", "v": "2004" }, { "n": "2003", "v": "2003" }, { "n": "2002", "v": "2002" }, { "n": "2001", "v": "2001" }, { "n": "2000", "v": "2000" }, { "n": "1999", "v": "1999" }, { "n": "1998", "v": "1998" }, { "n": "1997", "v": "1997" }, { "n": "1996", "v": "1996" }, { "n": "1995", "v": "1995" }, { "n": "1994", "v": "1994" }, { "n": "1993", "v": "1993" }, { "n": "1992", "v": "1992" }, { "n": "1991", "v": "1991" }, { "n": "1990", "v": "1990" }, { "n": "1989", "v": "1989" }, { "n": "1988", "v": "1988" }, { "n": "1987", "v": "1987" }, { "n": "1986", "v": "1986" }, { "n": "1985", "v": "1985" }, { "n": "1984", "v": "1984" }, { "n": "1983", "v": "1983" }, { "n": "1982", "v": "1982" }, { "n": "1981", "v": "1981" }, { "n": "1980", "v": "1980" }, { "n": "1979", "v": "1979" }, { "n": "1978", "v": "1978" }, { "n": "1977", "v": "1977" }, { "n": "1976", "v": "1976" }, { "n": "1975", "v": "1975" }, { "n": "1974", "v": "1974" }, { "n": "1973", "v": "1973" }, { "n": "1972", "v": "1972" }, { "n": "1971", "v": "1971" }, { "n": "1970", "v": "1970" }, { "n": "1969", "v": "1969" }, { "n": "1968", "v": "1968" }, { "n": "1967", "v": "1967" }, { "n": "1966", "v": "1966" }, { "n": "1965", "v": "1965" }, { "n": "1964", "v": "1964" }, { "n": "1963", "v": "1963" }, { "n": "1962", "v": "1962" }, { "n": "1961", "v": "1961" }, { "n": "1960", "v": "1960" }] }, { "key": "by", "name": "排序", "value": [{ "n": "时间", "v": "time" }, { "n": "人气", "v": "hits" }, { "n": "评分", "v": "score" }] }],
@@ -24,7 +24,7 @@ var rule = {
 	},
 	searchUrl: '/index.php?m=vod-search&wd=**',
 	searchable: 2,//是否启用全局搜索,
-	headers: {//网站的请求头,完整支持所有的,常带ua和cookies
+	headers: {//网站的请求头,完整支持所有的,常带ua和cookies 
 		'User-Agent': 'MOBILE_UA',
 	},
 	// class_parse: '#topnav li:lt(4);a&&Text;a&&href;.*/(.*?).html',
diff --git a/jsm.json b/jsm.json
index 3e536dfa..f3305811 100644
--- a/jsm.json
+++ b/jsm.json
@@ -1,5 +1,5 @@
 {
-"spider":"./jar/fan.txt;md5;8a9023a88704d4f491b2eee649be20d8",
+"spider":"./jar/fan.txt;md5;73c62850faf556c9c2d7048baf3a5d3a",
 "lives":[
 {"name":"fmm","type":0,"url":"https://live.fanmingming.com/tv/m3u/ipv6.m3u","playerType":1,"ua":"okhttp/3.8.1","timeout":20,"epg":"https://epg.112114.eu.org/?ch={name}&date={date}","logo":"https://epg.112114.eu.org/logo/{name}.png"},
 {"name":"live","type":0,"url":"https://epg.pw/test_channels.m3u","playerType":1,"ua":"okhttp/3.8.1","timeout":20,"epg":"https://epg.112114.eu.org/?ch={name}&date={date}","logo":"https://epg.112114.eu.org/logo/{name}.png"},
@@ -55,7 +55,6 @@
 {"key":"初中课堂","name":"📚初中┃课堂","type":3,"api":"csp_Bili","style":{"type":"rect","ratio":1.597},"searchable":0,"quickSearch":0,"changeable":0,"ext":{"json":"./FTY/初中课堂.json"}},
 {"key":"高中教育","name":"📚高中┃课堂","type":3,"api":"csp_Bili","style":{"type":"rect","ratio":1.597},"searchable":0,"quickSearch":0,"changeable":0,"ext":{"json":"./FTY/高中课堂.json"}},
 
-{"key":"农民","name":"影视 |农民[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"数组":"<li>&&</li>","图片":"src=\"&&\"","分类url":"https://m.wwgz.cn/vod-list-id-{cateId}-pg-{catePg}-order--by--class-0-year-{year}-letter--area-{area}-lang-.html","分类":"短剧$26#电视剧$2#电影$1#动漫$4#综艺$3"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"骚火","name":"影视 | 骚火[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"嗅探词":".m3u8#.mp4#.m3u8?#freeok.mp4","分类url":"https://shdy2.com/list/{cateId}-{catePg}.html;;vr1au0","分类":"电影$1#电视剧$2#韩剧$22#美剧$23#动漫$4","数组二次截取":"class=\"v_list\">&&</ul>","数组":"\"v_img\"&&/div>","标题":"title=\"&&\"","副标题":"v_note\"&&</div","跳转播放链接":"<iframe*src=\"&&\"","二次跳转播放链接":"https://hhjx.hhplayer.com/api.php;post;url=+var url*\"&&\"+&t=+var t*\"&&\"+&key=+var key*\"&&\"+&act=0+&play=1","三次跳转播放链接":"\"url\"*\"&&\""},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"晴天","name":"影视 | 晴天[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"分类url":"https://www.qinttv.com/qtyy/{cateId}/area/{area}/page/{catePg}/year/{year}.html","搜索url":"https://www.qinttv.com/qtcz.html;post;wd={wd}&submit=","分类":"电影$dianying#电视剧$dianshiju#动漫$dongmna#综艺$zongyi"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},
 {"key":"Freeok","name":"影视 | Freeok[直连]","type":3,"api":"csp_XBPQ","searchable":1,"quickSearch":1,"filterable":1,"ext":{"分类url":"https://www.freeok.vip/vod-show/{cateId}-{area}-------{catePg}---{year}.html;;ar1","分类":"电影&剧集&动漫&综艺&短剧&少儿","分类值":"1&2&3&4&12&5","副标题":"<div class=\"module-item-note\">&&</div>","嗅探词":"m3u8#.m3u8#.mp4#freeok.mp4#/obj/","线路数组":"data-dropdown-value=&&</div>","线路数组": "data-dropdown-value=&&</div>[不包含:夸克]","导演":"导演：&&</div>","主演":"主演：&&</div>","简介":"<p>&&</p>"},"jar": "./jar/Yoursmile.jar;md5;97796a79a781055669f2d5442439dc5f"},