|
@@ -492,12 +492,12 @@ export default {
|
|
|
return true;
|
|
|
},
|
|
|
buildDataCount(product, parsedFilter) {
|
|
|
- const { num, give_cycle } = parsedFilter;
|
|
|
- const totalNums = Number(num) + (Number(give_cycle) || 0);
|
|
|
+ const { pNum, give_cycle } = parsedFilter;
|
|
|
+ const totalNums = Number(pNum) + (Number(give_cycle) || 0);
|
|
|
const { product_type } = product;
|
|
|
const includeProductType = ['数据流量包', '历史数据', '结构化数据']
|
|
|
if(includeProductType.includes(product_type) && totalNums) {
|
|
|
- return `付费${num || 0}条,赠送${give_cycle || 0}条,合计<span class="color_main">${totalNums}</span>条`;
|
|
|
+ return `付费${pNum || 0}条,赠送${give_cycle || 0}条,合计<span class="color_main">${totalNums}</span>条`;
|
|
|
} else {
|
|
|
return '';
|
|
|
}
|
|
@@ -528,20 +528,11 @@ export default {
|
|
|
const { product_type } = product;
|
|
|
const includeProductType = ['结构化数据']
|
|
|
if(includeProductType.includes(product_type) && buy_product) {
|
|
|
- return this.buyStatus(buy_product) || '-';
|
|
|
+ return buy_product || '-';
|
|
|
} else {
|
|
|
return '';
|
|
|
}
|
|
|
},
|
|
|
- buyStatus(val) {
|
|
|
- if (val == '1') {
|
|
|
- return '增量数据'
|
|
|
- } else if (val == '2') {
|
|
|
- return '历史数据'
|
|
|
- } else if (val == '3') {
|
|
|
- return '增量+历史数据'
|
|
|
- }
|
|
|
- },
|
|
|
calculateValidityPeriod(parsedFilter, product) {
|
|
|
const { buy_cycle, buy_type, give_cycle, give_type, validYear, activity_give_cycle, activity_give_type } = parsedFilter;
|
|
|
const { product_type, returned_open } = product;
|