|
|
@ -552,8 +552,8 @@ function dianboyiji() { |
|
|
|
return !it.stop; |
|
|
|
return !it.stop; |
|
|
|
}); |
|
|
|
}); |
|
|
|
let index = yxdatalist.indexOf(yxdatalist.filter(d => d.type==sourceType && d.name==sourceName )[0]); |
|
|
|
let index = yxdatalist.indexOf(yxdatalist.filter(d => d.type==sourceType && d.name==sourceName )[0]); |
|
|
|
let sourceData = yxdatalist[index] || {}; |
|
|
|
let jkdata = yxdatalist[index] || {}; |
|
|
|
let selectGroup = sourceData.group || sourceData.type; |
|
|
|
let selectGroup = jkdata.group || jkdata.type; |
|
|
|
if(!selectGroup){ |
|
|
|
if(!selectGroup){ |
|
|
|
sourceName = ''; |
|
|
|
sourceName = ''; |
|
|
|
} |
|
|
|
} |
|
|
@ -682,7 +682,7 @@ function dianboyiji() { |
|
|
|
} |
|
|
|
} |
|
|
|
return 'hikery://empty'; |
|
|
|
return 'hikery://empty'; |
|
|
|
} |
|
|
|
} |
|
|
|
},sourceData); |
|
|
|
},jkdata); |
|
|
|
|
|
|
|
|
|
|
|
d.push({ |
|
|
|
d.push({ |
|
|
|
title: "搜索", |
|
|
|
title: "搜索", |
|
|
@ -709,9 +709,12 @@ function dianboyiji() { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(sourceName){ |
|
|
|
if(sourceName){ |
|
|
|
|
|
|
|
if(jkdata.type=="drpy"){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
try{ |
|
|
|
try{ |
|
|
|
require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyData.js'); |
|
|
|
require(config.依赖.match(/http(s)?:\/\/.*\//)[0] + 'SrcJyData.js'); |
|
|
|
let objdata = getYiData(sourceData); |
|
|
|
let objdata = getYiData(jkdata); |
|
|
|
let fllists = objdata.fllists; |
|
|
|
let fllists = objdata.fllists; |
|
|
|
if(fllists){ |
|
|
|
if(fllists){ |
|
|
|
d = d.concat(fllists); |
|
|
|
d = d.concat(fllists); |
|
|
@ -754,7 +757,7 @@ function dianboyiji() { |
|
|
|
url: list.vod_url, |
|
|
|
url: list.vod_url, |
|
|
|
pic: vodpic, |
|
|
|
pic: vodpic, |
|
|
|
pageTitle: vodname, |
|
|
|
pageTitle: vodname, |
|
|
|
data: sourceData |
|
|
|
data: jkdata |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
@ -781,7 +784,8 @@ function dianboyiji() { |
|
|
|
url: MY_URL + '#noHistory#', |
|
|
|
url: MY_URL + '#noHistory#', |
|
|
|
col_type: 'text_center_1' |
|
|
|
col_type: 'text_center_1' |
|
|
|
}); |
|
|
|
}); |
|
|
|
log(sourceData.name+'>调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber); |
|
|
|
log(jkdata.name+'>调用一级数据异常>' + e.message + ' 错误行#' + e.lineNumber); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}
|
|
|
|
}
|
|
|
|
deleteItemByCls("loading_gif"); |
|
|
|
deleteItemByCls("loading_gif"); |
|
|
|