Skip to content

o2oa
o2oa

fuyue82 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 93153236 编写于 作者: L luojing
浏览文件
操作

解决firefox应用市场评分无法查看的问题，并改为异步

上级 6105a924
隐藏空白更改
内联 并排
Showing with 170 addition and 159 deletion
o2web/source/x_component_AppMarketV2/ApplicationsContent.js
浏览文件 @ 93153236
......@@ -202,7 +202,7 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
}.bind(this),null,false //同步执行
);
},
loadCommentsGrade: function(appdata){
loadCommentsGrade: function(appdata,callback){
debugger;
var json = null;
var commenturl = this.bbsUrlPath +'/x_bbs_assemble_control/jaxrs/subject/statgrade/sectionName/'+encodeURI(this.app.lp.title)+'/subjectType/'+encodeURI(appdata.name)+'?time='+(new Date()).getMilliseconds();
......@@ -211,17 +211,18 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
headers : {'x-debugger' : true,'Authorization':this.collectToken,'c-token':this.collectToken},
secure: false,
method: "get",
async: false,
async: true,
withCredentials: true,
contentType : 'application/json',
crossDomain : true,
onSuccess: function(responseJSON, responseText){
debugger;
json = responseJSON;
//json = responseJSON;
if(callback)callback( responseJSON );
}.bind(this)
});
res.send();
return json;
//return json;
},
loadCertainCategory:function(categorysdiv,d){
var _self = this;
......@@ -279,90 +280,95 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
loadCertainApplication: function(appsdiv, d, i,rowappnum,rowappmargin){
//app 排列 begin
debugger;
var gradeData = this.loadCommentsGrade(d);
debugger;
var applicationdiv = new Element("div",{"class":"o2_appmarket_application"}).inject(appsdiv);
if ((i+1)%rowappnum!=0){
applicationdiv.setStyle("margin-right",rowappmargin+"px");
}else{
applicationdiv.setStyle("margin-right","0px");
}
var applicationicon = new Element("div",{"class":"o2_appmarket_application_icon"}).inject(applicationdiv);
applicationicon.setStyle("background-image", "url(data:image/png;base64,"+d.icon+")");
var applicationinfo = new Element("div",{"class":"o2_appmarket_application_info"}).inject(applicationdiv);
var applicationinfo_name = new Element("div",{"text":d.name,"class":"o2_appmarket_application_info_name","title":d.name}).inject(applicationinfo);
//var applicationinfo_recommend = new Element("div",{"text":d.recommend,"class":"o2_appmarket_application_info_recommend"}).inject(applicationinfo);
//推荐指数改为显示评星
var applicationinfo_star = new Element("div",{"class":"o2_appmarket_application_info_recommend"}).inject(applicationinfo);
var commentcount = 0;
var grade = 0;
var totalgrade = 0;
var commentratiolist = gradeData.data;
var gradeList = ["0","0","0","0","0"];
commentratiolist.each(function(pergrade){
gradeList[parseInt(pergrade.grade)-1]=pergrade.count;
commentcount +=parseInt(pergrade.count)
}.bind(this));
gradeList.each(function(pergrade,index){
totalgrade += parseInt(pergrade)*(index+1)
})
if (commentcount>0){
grade = this.numberFix(totalgrade/commentcount,1)
}
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;
//var gradeData = this.loadCommentsGrade(d);
this.loadCommentsGrade(d,function( gradeData ){
debugger;
var applicationdiv = new Element("div",{"class":"o2_appmarket_application"}).inject(appsdiv);
/*var grade = d.grade;
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;*/
for (var tmpnum=0;tmpnum<intgrade;tmpnum++){
new Element("img",{"src":this.app.iconPath+"blackfiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star)
}
if (dotgrade>=0.5){
new Element("img",{"src":this.app.iconPath+"halffiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star);
intgrade++;
}
for (var tmpnum=0;tmpnum<5-intgrade;tmpnum++){
new Element("img",{"src":this.app.iconPath+"whitefiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star);
}
var applicationinfo_category = new Element("div",{"text":d.category,"class":"o2_appmarket_application_info_category"}).inject(applicationinfo);
var applicationinfo_bottom = new Element("div",{"class":"o2_appmarket_application_info_bottom"}).inject(applicationinfo);
var applicationinfo_bottom_free = new Element("div",{"text":d.price==0?"Free":d.price+"","class":"o2_appmarket_application_info_bottom_free"}).inject(applicationinfo_bottom);
var applicationinfo_bottom_open = new Element("div",{"class":"o2_appmarket_application_info_bottom_button mainColor_bg"}).inject(applicationinfo_bottom);
var bottomtext =this.app.lp.setup;
if (d.installedVersion && d.installedVersion!=""){
if (d.installedVersion==d.version){
bottomtext = this.app.lp.setupDone;
}else{
bottomtext = this.app.lp.update;
}
}
var applicationinfo_bottom_open_text = new Element("div",{"text":bottomtext,"class":"o2_appmarket_application_info_bottom_button_text"}).inject(applicationinfo_bottom_open);
var _self = this;
applicationicon.store("data", d);
applicationicon.addEvents({
"mouseover": function(){
},
"mouseout": function(){
},
"click": function(e){
var d = this.retrieve("data");
if (d) {
_self.open(e, d);
}
if ((i+1)%rowappnum!=0){
applicationdiv.setStyle("margin-right",rowappmargin+"px");
}else{
applicationdiv.setStyle("margin-right","0px");
}
})
var applicationicon = new Element("div",{"class":"o2_appmarket_application_icon"}).inject(applicationdiv);
applicationicon.setStyle("background-image", "url(data:image/png;base64,"+d.icon+")");
var applicationinfo = new Element("div",{"class":"o2_appmarket_application_info"}).inject(applicationdiv);
var applicationinfo_name = new Element("div",{"text":d.name,"class":"o2_appmarket_application_info_name","title":d.name}).inject(applicationinfo);
//var applicationinfo_recommend = new Element("div",{"text":d.recommend,"class":"o2_appmarket_application_info_recommend"}).inject(applicationinfo);
//推荐指数改为显示评星
var applicationinfo_star = new Element("div",{"class":"o2_appmarket_application_info_recommend"}).inject(applicationinfo);
var commentcount = 0;
var grade = 0;
var totalgrade = 0;
var commentratiolist = gradeData.data;
var gradeList = ["0","0","0","0","0"];
commentratiolist.each(function(pergrade){
gradeList[parseInt(pergrade.grade)-1]=pergrade.count;
commentcount +=parseInt(pergrade.count)
}.bind(this));
gradeList.each(function(pergrade,index){
totalgrade += parseInt(pergrade)*(index+1)
})
if (commentcount>0){
grade = this.numberFix(totalgrade/commentcount,1)
}
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;
applicationinfo_bottom_open.store("data",d);
applicationinfo_bottom_open.addEvents({
"click":function(e){
var d = this.retrieve("data");
if (d){
_self.installapp(e,d);
/*var grade = d.grade;
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;*/
for (var tmpnum=0;tmpnum<intgrade;tmpnum++){
new Element("img",{"src":this.app.iconPath+"blackfiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star)
}
if (dotgrade>=0.5){
new Element("img",{"src":this.app.iconPath+"halffiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star);
intgrade++;
}
for (var tmpnum=0;tmpnum<5-intgrade;tmpnum++){
new Element("img",{"src":this.app.iconPath+"whitefiveangular.png","class":"o2_appmarket_application_info_starpic"}).inject(applicationinfo_star);
}
var applicationinfo_category = new Element("div",{"text":d.category,"class":"o2_appmarket_application_info_category"}).inject(applicationinfo);
var applicationinfo_bottom = new Element("div",{"class":"o2_appmarket_application_info_bottom"}).inject(applicationinfo);
var applicationinfo_bottom_free = new Element("div",{"text":d.price==0?"Free":d.price+"","class":"o2_appmarket_application_info_bottom_free"}).inject(applicationinfo_bottom);
var applicationinfo_bottom_open = new Element("div",{"class":"o2_appmarket_application_info_bottom_button mainColor_bg"}).inject(applicationinfo_bottom);
var bottomtext =this.app.lp.setup;
if (d.installedVersion && d.installedVersion!=""){
if (d.installedVersion==d.version){
bottomtext = this.app.lp.setupDone;
}else{
bottomtext = this.app.lp.update;
}
}
})
var applicationinfo_bottom_open_text = new Element("div",{"text":bottomtext,"class":"o2_appmarket_application_info_bottom_button_text"}).inject(applicationinfo_bottom_open);
var _self = this;
applicationicon.store("data", d);
applicationicon.addEvents({
"mouseover": function(){
},
"mouseout": function(){
},
"click": function(e){
var d = this.retrieve("data");
if (d) {
_self.open(e, d);
}
}
})
applicationinfo_bottom_open.store("data",d);
applicationinfo_bottom_open.addEvents({
"click":function(e){
var d = this.retrieve("data");
if (d){
_self.installapp(e,d);
}
}
});
}.bind(this)
);
},
installapp:function(e,d){
var p = e.target.getPosition();
......
o2web/source/x_component_AppMarketV2_Application/Comment.js
浏览文件 @ 93153236
......@@ -93,12 +93,13 @@ MWF.xApplication.AppMarketV2.Application.Comment.ViewPage= new Class({
this.loadBbsInfo(content);
var json = null;
var commenturl = this.bbsUrlPath +'/x_bbs_assemble_control/jaxrs/subject/statgrade/sectionName/'+encodeURI(content.app.lp.title)+'/subjectType/'+encodeURI(content.appdata.name)+'?time='+(new Date()).getMilliseconds();
debugger;
var res = new Request.JSON({
url: commenturl,
headers : {'x-debugger' : true,'Authorization':content.app.collectToken,'c-token':content.app.collectToken},
secure: false,
method: "get",
async: false,
async: true,
withCredentials: true,
contentType : 'application/json',
crossDomain : true,
......
o2web/source/x_component_AppMarketV2_Application/Main.js
浏览文件 @ 93153236
......@@ -95,84 +95,87 @@ MWF.xApplication.AppMarketV2.Application.Main = new Class({
applicationicon.setStyle("width",this.applicationintroduceiconcontain.clientWidth);
applicationicon.setStyle("height",450*this.applicationintroduceiconcontain.clientWidth/300);
}
this.loadCommentsGrade(this.appdata);
var price=this.appdata.price>0?this.appdata.price+"":"Free";
this.applicationintroducememofree.set("text",price);
this.applicationintroducememoname.set("text",this.appdata.name);
debugger;
var commentcount = 0;
var grade = 0;
var totalgrade = 0;
var commentratiolist = this.gradeData.data;
var gradeList = ["0","0","0","0","0"];
commentratiolist.each(function(pergrade){
gradeList[parseInt(pergrade.grade)-1]=pergrade.count;
commentcount +=parseInt(pergrade.count)
}.bind(this));
this.loadCommentsGrade(this.appdata,function( gradeData ){
this.gradeData = gradeData;
var price=this.appdata.price>0?this.appdata.price+"":"Free";
this.applicationintroducememofree.set("text",price);
this.applicationintroducememoname.set("text",this.appdata.name);
debugger;
var commentcount = 0;
var grade = 0;
var totalgrade = 0;
var commentratiolist = this.gradeData.data;
var gradeList = ["0","0","0","0","0"];
commentratiolist.each(function(pergrade){
gradeList[parseInt(pergrade.grade)-1]=pergrade.count;
commentcount +=parseInt(pergrade.count)
}.bind(this));
gradeList.each(function(pergrade,index){
totalgrade += parseInt(pergrade)*(index+1)
})
if (commentcount>0){
grade = this.numberFix(totalgrade/commentcount,1)
}
this.applicationintroducememoremarkgrade.set("text",grade+"");
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;
/*var grade = this.numberFix(this.appdata.grade,1);
this.applicationintroducememoremarkgrade.set("text",grade);
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;*/
debugger;
gradeList.each(function(pergrade,index){
totalgrade += parseInt(pergrade)*(index+1)
})
if (commentcount>0){
grade = this.numberFix(totalgrade/commentcount,1)
}
this.applicationintroducememoremarkgrade.set("text",grade+"");
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;
/*var grade = this.numberFix(this.appdata.grade,1);
this.applicationintroducememoremarkgrade.set("text",grade);
var intgrade = parseInt(grade);
var dotgrade = grade - intgrade;*/
debugger;
for (var tmpnum=0;tmpnum<intgrade;tmpnum++){
new Element("img",{"src":this.iconPath+"blackfiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular)
}
if (dotgrade>=0.5){
new Element("img",{"src":this.iconPath+"halffiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular);
intgrade++;
}
for (var tmpnum=0;tmpnum<5-intgrade;tmpnum++){
new Element("img",{"src":this.iconPath+"whitefiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular);
}
if (!this.appdata.commentCount) this.appdata.commentCount=0;
this.applicationintroducememoremarkcommentcount.set("text",this.lp.commentCountText.replace("{n}", commentcount))
//this.applicationintroducememodownload.set("text",this.appdata.downloadCount);
this.applicationintroducememocategory.set("text", this.lp.category+":"+this.appdata.category);
this.applicationintroducememocontent.set("text",this.appdata.describe);
//this.applicationintroducedownloadprice.set("text","$"+this.appdata.price);
this.applicationintroducedownloadprice.set("text","");
var bottomtext =this.lp.setup;
if (this.appdata.installedVersion && this.appdata.installedVersion!=""){
if (this.appdata.installedVersion==this.appdata.version){
bottomtext = this.lp.setupDone;
}else{
bottomtext = this.lp.update;
for (var tmpnum=0;tmpnum<intgrade;tmpnum++){
new Element("img",{"src":this.iconPath+"blackfiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular)
}
}
this.applicationintroducedownloadbtntext.set("text",bottomtext);
var _self = this;
this.applicationintroducedownloadbtn.store("data",this.appdata);
this.applicationintroducedownloadbtn.addEvents({
"click": function(e){
//updateorinstall application
var d = this.retrieve("data");
if (d){
_self.installapp(e,d);
}
if (dotgrade>=0.5){
new Element("img",{"src":this.iconPath+"halffiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular);
intgrade++;
}
for (var tmpnum=0;tmpnum<5-intgrade;tmpnum++){
new Element("img",{"src":this.iconPath+"whitefiveangular.png","class":"o2_appmarket_application_introduce_memo_remark_inner_pic"}).inject(this.applicationintroducememoremarkiconangular);
}
})
//add by xlq @20201104 for adding button which goes to bbs.
this.applicationintroduceforumbtntext.set("text",this.lp.bbsname);
this.applicationintroduceforumbtn.addEvents({
"click": function(e){
//updateorinstall application
window.open(_self.lp.bbslink);
if (!this.appdata.commentCount) this.appdata.commentCount=0;
this.applicationintroducememoremarkcommentcount.set("text",this.lp.commentCountText.replace("{n}", commentcount))
//this.applicationintroducememodownload.set("text",this.appdata.downloadCount);
this.applicationintroducememocategory.set("text", this.lp.category+":"+this.appdata.category);
this.applicationintroducememocontent.set("text",this.appdata.describe);
//this.applicationintroducedownloadprice.set("text","$"+this.appdata.price);
this.applicationintroducedownloadprice.set("text","");
var bottomtext =this.lp.setup;
if (this.appdata.installedVersion && this.appdata.installedVersion!=""){
if (this.appdata.installedVersion==this.appdata.version){
bottomtext = this.lp.setupDone;
}else{
bottomtext = this.lp.update;
}
}
})
this.applicationintroducedownloadbtntext.set("text",bottomtext);
var _self = this;
this.applicationintroducedownloadbtn.store("data",this.appdata);
this.applicationintroducedownloadbtn.addEvents({
"click": function(e){
//updateorinstall application
var d = this.retrieve("data");
if (d){
_self.installapp(e,d);
}
}
})
//add by xlq @20201104 for adding button which goes to bbs.
this.applicationintroduceforumbtntext.set("text",this.lp.bbsname);
this.applicationintroduceforumbtn.addEvents({
"click": function(e){
//updateorinstall application
window.open(_self.lp.bbslink);
}
})
}.bind(this)
);
//this.applicationintroducefavbtntext.set("text","下载");
this.loadIntroduceInfo();
......@@ -196,7 +199,7 @@ debugger;
}.bind(this),null,false //同步执行
);
},
loadCommentsGrade: function(appdata){
loadCommentsGrade: function(appdata,callback){
debugger;
var json = null;
var commenturl = this.bbsUrlPath +'/x_bbs_assemble_control/jaxrs/subject/statgrade/sectionName/'+encodeURI(this.lp.title)+'/subjectType/'+encodeURI(appdata.name)+'?time='+(new Date()).getMilliseconds();
......@@ -205,13 +208,14 @@ debugger;
headers : {'x-debugger' : true,'Authorization':this.collectToken,'c-token':this.collectToken},
secure: false,
method: "get",
async: false,
async: true,
withCredentials: true,
contentType : 'application/json',
crossDomain : true,
onSuccess: function(responseJSON, responseText){
debugger;
this.gradeData = responseJSON;
//this.gradeData = responseJSON;
if(callback)callback( responseJSON );
}.bind(this)
});
res.send();
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或