|
@@ -1785,6 +1785,14 @@ var vm = new Vue({
|
|
|
var addAreaCount = filter_vip.addAreaCount || filter_vip_new.addAreaCount || 0
|
|
|
return addAreaCount <= 0
|
|
|
},
|
|
|
+ calcIsOnlyAddPower: function(order) {
|
|
|
+ var filter_vip = this.getFilterInfo(order)
|
|
|
+ var filter_vip_new = this.getNewFilterInfo(order)
|
|
|
+ var buyAccountCount = filter_vip.buyAccountCount || filter_vip_new.buyAccountCount || 0
|
|
|
+ var giftAccountCount = filter_vip.giftAccountCount || filter_vip_new.giftAccountCount || 0
|
|
|
+ var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
|
|
|
+ return totalAccountCount <= 0
|
|
|
+ },
|
|
|
calcBackOrderTime: function(filterNewObj) {
|
|
|
var cmap={1:"天",2:"月",3:"年",4:"季"}
|
|
|
var cycle = ''
|
|
@@ -1887,6 +1895,7 @@ var vm = new Vue({
|
|
|
}
|
|
|
|
|
|
var onlyAddCount = this.calcIsOnlyAddCount(order)
|
|
|
+ var onlyAddPower = this.calcIsOnlyAddPower(order)
|
|
|
var upgrade = order.vip_type == 2
|
|
|
if (onlyAddCount && upgrade) {
|
|
|
infoList = []
|
|
@@ -1904,7 +1913,11 @@ var vm = new Vue({
|
|
|
infoList.push(date)
|
|
|
}
|
|
|
if(order.buy_subject=='2'){
|
|
|
- infoList.unshift(buyNum_vip)
|
|
|
+ if (onlyAddPower && upgrade) {
|
|
|
+ // do something
|
|
|
+ } else {
|
|
|
+ infoList.unshift(buyNum_vip)
|
|
|
+ }
|
|
|
}
|
|
|
return infoList
|
|
|
},
|