mirror of
https://github.com/yawaflua/LuckyDiamond.git
synced 2025-12-10 12:19:31 +02:00
fixed conflict merging
This commit is contained in:
@@ -69,7 +69,7 @@ export default {
|
|||||||
card: 0,
|
card: 0,
|
||||||
clickedBtn: '',
|
clickedBtn: '',
|
||||||
url: '',
|
url: '',
|
||||||
offBtn: true,
|
offBtn: false,
|
||||||
agreeUser: false,
|
agreeUser: false,
|
||||||
PaymentsModalNumbers
|
PaymentsModalNumbers
|
||||||
}
|
}
|
||||||
@@ -83,7 +83,7 @@ export default {
|
|||||||
GettingMoneyOperation(newAmount)
|
GettingMoneyOperation(newAmount)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
console.log('Payments Modal Working!: ', response)
|
console.log('Payments Modal Working!: ', response)
|
||||||
this.url = response.url
|
// this.url = response.url
|
||||||
this.offBtn = false
|
this.offBtn = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -96,8 +96,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
checkOffBtn() {
|
checkOffBtn() {
|
||||||
console.log(`offbtn = ${this.offBtn} agreeuser = ${this.agreeUser}`)
|
return this.offBtn === true || this.agreeUser === false
|
||||||
return this.offBtn === false && this.agreeUser !== false
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
Reference in New Issue
Block a user