|
@@ -126,6 +126,7 @@ function renderContentscale(list, contentWrapClassName, name) {
|
|
|
var textType = []
|
|
|
for (var i = 0; i < list[0].detailList.length; i++) {
|
|
|
var item = list[0].detailList[i];
|
|
|
+ textType.push(item.textType)
|
|
|
if (item.textType == 11) {
|
|
|
item.content = item.content && item.content.replace(/{imageUrlPrefix}/g, imageUrlPrefix);
|
|
|
str = '<div class="infoBox scaleBox" data-id="' + item.id + '"><div class="title"> <h2 class="titleH2" id="' + contentWrapClassName + i +
|
|
@@ -384,14 +385,11 @@ function getResult(pushInfo, textType) {
|
|
|
if ($(this).attr("resultType") == 1) {
|
|
|
num += parseFloat($(this).val())
|
|
|
} else {
|
|
|
- console.log($(this).attr("data_obj"))
|
|
|
arr.push($(this).attr("data_obj"))
|
|
|
proposals.push($(this).attr("proposal"))
|
|
|
}
|
|
|
});
|
|
|
- console.log(arr)
|
|
|
tmp = arr.join(";");
|
|
|
-
|
|
|
if (pushInfo.length > 0) {
|
|
|
for (var i = 0; i < pushInfo.length; i++) {
|
|
|
if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
|
|
@@ -419,8 +417,8 @@ function getResult(pushInfo, textType) {
|
|
|
result = tmp
|
|
|
proposal = proposals.join(";");
|
|
|
}
|
|
|
-
|
|
|
if (result == undefined) {
|
|
|
+
|
|
|
if ($.inArray(13, textType) > 0) {
|
|
|
$(".score").html('总分:' + num + '分');
|
|
|
}
|
|
@@ -431,7 +429,7 @@ function getResult(pushInfo, textType) {
|
|
|
$(".hel").attr({
|
|
|
"title": proposal
|
|
|
});
|
|
|
-
|
|
|
+ console.log(textType)
|
|
|
$(".result_title").html(result);
|
|
|
if ($.inArray(13, textType) > 0) {
|
|
|
$(".score").html('总分:' + num + '分');
|