|
@@ -202,13 +202,14 @@ export default {
|
|
|
canUpgrade () {
|
|
|
const buyset = this.buyInfo.buyset
|
|
|
const selectCount = this.selectedCount
|
|
|
+ console.log(buyset, selectCount, this.oldVip)
|
|
|
if (this.buyType === 'buy') {
|
|
|
return false
|
|
|
} else {
|
|
|
if (buyset.areacount === -1) {
|
|
|
// 老版超级订阅全国全行业用户选择16个地区以上或者全国才能去支付
|
|
|
if (this.oldVip) {
|
|
|
- if (this.computedPrice.pay !== 0 && (selectCount >= 16 || selectCount === -1)) {
|
|
|
+ if (this.computedPrice.pay >= 0 && (selectCount >= 16 || selectCount === -1)) {
|
|
|
return true
|
|
|
} else {
|
|
|
return false
|
|
@@ -220,7 +221,11 @@ export default {
|
|
|
if (selectCount === -1) {
|
|
|
return true
|
|
|
} else {
|
|
|
- return selectCount > buyset.areacount
|
|
|
+ if (this.oldVip) {
|
|
|
+ return selectCount >= buyset.areacount
|
|
|
+ } else {
|
|
|
+ return selectCount > buyset.areacount
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|