diff --git a/static/js/main-simple.js b/static/js/main-simple.js index cc01a0c..ca326ee 100644 --- a/static/js/main-simple.js +++ b/static/js/main-simple.js @@ -83,7 +83,7 @@ allPlans.forEach(function(plan) { providers.add(plan.provider); - regions.add(plan.region); + regions.add(plan.countries); }); populateSelect('filter-provider', Array.from(providers).sort()); @@ -203,7 +203,7 @@ if (filters.provider && plan.provider !== filters.provider) return false; // 区域筛选 - if (filters.region && plan.region !== filters.region) return false; + if (filters.region && plan.countries !== filters.region) return false; // 内存筛选 if (filters.memory > 0 && plan.memory_gb < filters.memory) return false; @@ -218,7 +218,7 @@ // 搜索筛选 if (filters.search) { - var searchText = (plan.provider + ' ' + plan.name + ' ' + plan.region).toLowerCase(); + var searchText = (plan.provider + ' ' + plan.name + ' ' + plan.countries).toLowerCase(); if (searchText.indexOf(filters.search) === -1) return false; } @@ -254,18 +254,18 @@ var price = convertPrice(plan.price_cny, filters.currency); var priceSymbol = filters.currency === 'CNY' ? '¥' : '$'; - tr.innerHTML = + tr.innerHTML = '' + escapeHtml(plan.provider) + '' + - '' + escapeHtml(plan.region) + '' + + '' + escapeHtml(plan.countries) + '' + '' + escapeHtml(plan.name) + '' + '' + plan.vcpu + '' + '' + plan.memory_gb + ' GB' + '' + plan.storage_gb + ' GB' + - '' + plan.bandwidth + '' + + '' + (plan.bandwidth_mbps ? plan.bandwidth_mbps + ' Mbps' : '-') + '' + '' + plan.traffic + '' + '' + priceSymbol + price + '' + '' + - '访问' + + '访问' + ''; return tr;