diff --git a/controllers/web.py b/controllers/web.py index f3288c9..8edef9d 100644 --- a/controllers/web.py +++ b/controllers/web.py @@ -6,7 +6,7 @@ import functools import json import os -from urllib.parse import urljoin, unquote +from urllib.parse import urljoin, unquote,quote import requests from flask import Blueprint, abort, request, render_template, send_from_directory, render_template_string, jsonify, \ make_response, redirect, \ @@ -62,6 +62,7 @@ def web_index(web_name, theme): tid = getParmas('tid') tname = getParmas('tname') url = getParmas('url') + fl = getParmas('f') player = getParmas('player') or 'mui' ctx['vod_id'] = vod_id ctx['vod_name'] = vod_name @@ -70,7 +71,9 @@ def web_index(web_name, theme): ctx['tid'] = tid ctx['tname'] = tname ctx['url'] = url - print('tid:', tid) + ctx['fl'] = quote(fl) + print('tid:', tid,'fl:',fl) + # print('f:', fl) file_path = os.path.abspath(f'js/{web_name}.js') print(file_path) diff --git a/js/version.txt b/js/version.txt index 7f2ee8b..8272677 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.9.42beta2 \ No newline at end of file +3.9.42beta3 \ No newline at end of file diff --git a/templates/cms/mxpro/categoryContent.html b/templates/cms/mxpro/categoryContent.html index 81b5b5f..284b568 100644 --- a/templates/cms/mxpro/categoryContent.html +++ b/templates/cms/mxpro/categoryContent.html @@ -46,7 +46,7 @@
@@ -106,7 +106,7 @@ const app = createApp({ setup(props, context) { onMounted(()=> { console.log('---onMounted---'); - axios.get(`/vod?pwd=${pwd}&rule=${web_name}&t=${tid}&pg=${pg}&ac=videolist`).then((resp) => { + axios.get(`/vod?pwd=${pwd}&rule=${web_name}&t=${tid}&pg=${pg}&ac=videolist&f=${fl}`).then((resp) => { console.log(resp.data); sitems.value = resp.data; // 存浏览器session里,然后其它页面好获取出来 @@ -141,6 +141,7 @@ const app = createApp({ const pg = '{{ctx.pg}}'; const vod_id = '{{ctx.vod_id}}'; const vod_name = '{{ctx.vod_name}}'; + const fl = '{{ctx.fl}}'; // console.log(web_name); const ctx_str = "ctxObj={{ctx|safe}}"; diff --git a/templates/cms/mxpro/homeContent.html b/templates/cms/mxpro/homeContent.html index 1072f39..4c49109 100644 --- a/templates/cms/mxpro/homeContent.html +++ b/templates/cms/mxpro/homeContent.html @@ -60,7 +60,7 @@