Merge branch 'hotfix/bug395'
This commit is contained in:
commit
48972f84e1
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "newgruecht-vue",
|
||||
"version": "0.1.0",
|
||||
"version": "1.0.1",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<v-btn icon @click="reload()">
|
||||
<v-img src="@/assets/logo-64.png" contain height="40"></v-img>
|
||||
</v-btn>
|
||||
<v-toolbar-title>Flaschengeist</v-toolbar-title>
|
||||
<v-toolbar-title>Flaschengeist <span class="caption">v1.0.1</span></v-toolbar-title>
|
||||
<v-spacer/>
|
||||
<v-btn icon v-if="getRouteName == 'resetPassword'" @click="goTo('login')">
|
||||
<v-icon>
|
||||
|
|
|
@ -365,8 +365,8 @@ export default {
|
|||
console.log(user)
|
||||
if (user.toSetAmount && user.autoLock) {
|
||||
if (
|
||||
Math.abs(user.amount - Number.parseInt(user.toSetAmount)) >
|
||||
user.limit + 500
|
||||
(user.amount - Number.parseInt(user.toSetAmount)) <
|
||||
-(user.limit + 500)
|
||||
) {
|
||||
this.overOverLimit = user
|
||||
user.toSetAmount = null
|
||||
|
@ -377,8 +377,9 @@ export default {
|
|||
return true
|
||||
},
|
||||
checkOverLimit(user) {
|
||||
console.log(user)
|
||||
if (user.toSetAmount) {
|
||||
if (Math.abs(user.amount - user.toSetAmount) > user.limit) {
|
||||
if ((user.amount - user.toSetAmount) < -user.limit) {
|
||||
return user.checkedOverLimit ? false : true
|
||||
}
|
||||
}
|
||||
|
|
|
@ -315,7 +315,7 @@ export default {
|
|||
},
|
||||
checkOverLimitIsValid(user) {
|
||||
if (this.toSetAmount && user.autoLock) {
|
||||
if (Math.abs(this.getAllSum() - Number.parseInt(this.toSetAmount)) > user.limit + 500) {
|
||||
if ((this.getAllSum() - Number.parseInt(this.toSetAmount)) < -(user.limit + 500)) {
|
||||
this.overOverLimit = user
|
||||
this.toSetAmount = null
|
||||
this.value = null
|
||||
|
@ -326,7 +326,7 @@ export default {
|
|||
},
|
||||
checkOverLimit(user) {
|
||||
if (this.toSetAmount) {
|
||||
if (Math.abs( this.getAllSum() - this.toSetAmount) > user.limit) {
|
||||
if (( this.getAllSum() - this.toSetAmount) < -user.limit) {
|
||||
return user.checkedOverLimit ? false : true
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
//const main = 'https://192.168.5.128:5000/'
|
||||
const main = 'http://localhost:5000/'
|
||||
//const main = 'http://localhost:5000/'
|
||||
//const main = 'http://192.168.5.118:5000/'
|
||||
//const main = 'https://groeger-clan.duckdns.org:5000/'
|
||||
//const main = 'https://flaschengeist.wu5.de:5000/'
|
||||
const main = 'https://flaschengeist.wu5.de:5000/'
|
||||
|
||||
const url = {
|
||||
login: main + 'login',
|
||||
|
|
Loading…
Reference in New Issue