Merge branch 'arturo'

This commit is contained in:
arturo guerrero
2019-03-19 20:11:05 +00:00
2 changed files with 26 additions and 12 deletions
+4 -5
View File
@@ -25,8 +25,8 @@
footer.modal-card-foot
button.button.is-success(v-on:click="SaveMultar()") Guardar
button.button(v-on:click="toggleModal()") Cancelar
//- p.has-text-centered
//- span.is-size-6.space(v-for="s in status") {{` ${s.equipo.toUpperCase()} : ${s.prestadas} / ${s.total}`}}
p.has-text-centered
span.is-size-6.space(v-for="s in status") {{` ${s.equipo.toUpperCase()} : ${s.prestadas} / ${s.total}`}}
br
table.table.is-fullwidth.is-hoverable.is-narrow
thead
@@ -171,9 +171,8 @@ export default {
})
.then(response => {
console.log(response.data.data)
// this.prestamo = response.data.data.equipos
// this.status = response.data.data.status
this.prestamo = response.data.data
this.prestamo = response.data.data.equipos
this.status = response.data.data.status
})
.catch(error => {
swal('Error', error.response.data.err, 'error')
+22 -7
View File
@@ -1,20 +1,29 @@
<template lang="pug">
nav.navbar.is-u-blue
div.navbar-brand
router-link.navbar-item(to="/") PC PUMA
div.navbar-menu
div.navbar-start
.navbar.is-u-blue
.navbar-brand
router-link.navbar-item(to="/")
b PC PUMA
.navbar-menu
.navbar-start
router-link.navbar-item(to="/equipo") Equipo
router-link.navbar-item(to="/carrito") Carrito
router-link.navbar-item(to="/usuario") Usuarios
router-link.navbar-item(to="/multa") Multas
div.navbar-end
div.navbar-item
.navbar-end
.navbar-item
span.tag.is-danger.is-medium(v-if=" env === 'development' ") Localhost
span.tag.is-danger.is-medium(v-else-if=" env === 'TEST' ") Test
.navbar-item
a.button.is-u-golden(v-on:click='salir()')
strong Salir
</template>
<script>
export default {
data () {
return {
env: process.env.NODE_ENV
}
},
methods: {
salir: function () {
window.localStorage.removeItem('pcpumaT')
@@ -33,3 +42,9 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.navbar{
border-bottom: #B08100 solid 5px;
// box-shadow: 0px 13px 21px 2px rgba(0,0,0,0.21);
}
</style>