7 Commits

6 changed files with 384 additions and 10 deletions
+41 -10
View File
@@ -1392,16 +1392,6 @@
"integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==",
"dev": true "dev": true
}, },
"@types/mini-css-extract-plugin": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/@types/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.1.tgz",
"integrity": "sha512-+mN04Oszdz9tGjUP/c1ReVwJXxSniLd7lF++sv+8dkABxVNthg6uccei+4ssKxRHGoMmPxdn7uBdJWONSJGTGQ==",
"dev": true,
"optional": true,
"requires": {
"@types/webpack": "*"
}
},
"@types/minimatch": { "@types/minimatch": {
"version": "3.0.3", "version": "3.0.3",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -10978,6 +10968,7 @@
} }
}, },
"vue-loader-v16": { "vue-loader-v16": {
<<<<<<< HEAD
"version": "npm:vue-loader@16.0.0-beta.7", "version": "npm:vue-loader@16.0.0-beta.7",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz",
"integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==", "integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==",
@@ -11000,13 +10991,39 @@
"optional": true, "optional": true,
"requires": { "requires": {
"@types/color-name": "^1.1.1", "@types/color-name": "^1.1.1",
=======
"version": "npm:vue-loader@16.0.0-beta.8",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz",
"integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
>>>>>>> origin
"color-convert": "^2.0.1" "color-convert": "^2.0.1"
} }
}, },
"chalk": { "chalk": {
<<<<<<< HEAD
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
=======
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
>>>>>>> origin
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -11038,12 +11055,26 @@
"dev": true, "dev": true,
"optional": true "optional": true
}, },
<<<<<<< HEAD
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true, "dev": true,
"optional": true "optional": true
=======
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
>>>>>>> origin
}, },
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
+234
View File
@@ -0,0 +1,234 @@
<template>
<div>
<form class="mt-4" role="form" data-toggle="validator" >
<div class="my-3">
<div class="row tipoComprobante">
<div class="form-check col-4 ">
<label class="form-check-label" >
Tipo de Comprobante:
</label>
</div>
<div class="form-check col-4">
<input class="form-check-input" type="radio" id="exampleRadios1" v-model="select" value="ticket">
<label class="form-check-label" for="exampleRadios1">
Ticket
</label>
</div>
<div class="form-check col-4">
<input class="form-check-input" type="radio" id="exampleRadios2" v-model="select" value="factura">
<label class="form-check-label" for="exampleRadios2">
Factura
</label>
</div>
</div>
<div class=" datosFactura" v-if="select == 'factura'">
<h3 class="my-5">Direccion de Facturacion</h3>
<div class="form-group">
<label for="InputNombre1">RFC</label>
<input type="text" class="form-control" id="InputRFC" v-model="Facturacion.RFC">
</div>
<div class="form-group">
<label for="InputApellido1">Nombres</label>
<input type="text" class="form-control" id="InputNombres" v-model="Facturacion.nombres">
</div>
<div class="form-group">
<label for="InputCorreo1">Apellidos</label>
<input type="email" class="form-control" id="InputApellidos" v-model="Facturacion.apellidos">
</div>
<div class="form-group">
<label for="InputNombre1">Empresa</label>
<input type="text" class="form-control" id="InputEmpresa" v-model="Facturacion.empresa">
</div>
<div class="form-group">
<label for="InputApellido1">calle</label>
<input type="text" class="form-control" id="InputCalle" v-model="Facturacion.calle">
</div>
<div class="form-group">
<label for="InputCorreo1">Numero Exterior</label>
<input type="email" class="form-control" id="InputExterior" v-model="Facturacion.exterior">
</div>
<div class="form-group">
<label for="InputNombre1">Numero Interior</label>
<input type="text" class="form-control" id="InputInterior" v-model="Facturacion.interior">
</div>
<div class="form-group">
<label for="InputApellido1">Colonia</label>
<input type="text" class="form-control" id="InputColonia" v-model="Facturacion.colonia">
</div>
<div class="form-group">
<label for="InputCorreo1">Provincia o estado</label>
<input type="email" class="form-control" id="InputEstado" v-model="Facturacion.estado">
</div>
<div class="form-group">
<label for="InputNombre1">Pais</label>
<input type="text" class="form-control" id="InputPais" v-model="Facturacion.pais">
</div>
<div class="form-group">
<label for="InputApellido1">Telefono</label>
<input type="text" class="form-control" id="InputTelefono" v-model="Facturacion.telefono">
</div>
<div class="form-group">
<label for="InputCorreo1">Correo</label>
<input type="email" class="form-control" id="InputCorreo" v-model="Facturacion.correo">
</div>
</div>
<div class="row direccionIgual" v-if="select == 'factura'">
<div class="form-check col-8 ">
<label class="form-check-label" >
¿La direccion de facturacion es la misma a la de envio?
</label>
</div>
<div class="form-check col-2">
<input class="form-check-input" type="radio" id="exampleRadios3" v-model="sameDirection" value="true">
<label class="form-check-label" for="exampleRadios3">
Si
</label>
</div>
<div class="form-check col-2">
<input class="form-check-input" type="radio" id="exampleRadios4" v-model="sameDirection" value="false">
<label class="form-check-label" for="exampleRadios4">
No
</label>
</div>
</div>
<div class=" datosEnvio" v-if="select == 'ticket' || (sameDirection == 'false' && select == 'factura')">
<h3 class="my-5">Direccion de Envio</h3>
<div class="form-group">
<label for="InputApellido1">Nombres</label>
<input type="text" class="form-control" id="InputNombres2" v-model="Envio.nombres">
</div>
<div class="form-group">
<label for="InputCorreo1">Apellidos</label>
<input type="email" class="form-control" id="InputApellidos2" v-model="Envio.apellidos">
</div>
<div class="form-group">
<label for="InputCorreo1">Correo</label>
<input type="email" class="form-control" id="InputCorreo2" v-model="Envio.correo">
</div>
<div class="form-group">
<label for="InputApellido1">calle</label>
<input type="text" class="form-control" id="InputCalle2" v-model="Envio.calle">
</div>
<div class="form-group">
<label for="InputCorreo1">Numero Exterior</label>
<input type="email" class="form-control" id="InputExterior2" v-model="Envio.exterior">
</div>
<div class="form-group">
<label for="InputNombre1">Numero Interior</label>
<input type="text" class="form-control" id="InputInterior2" v-model="Envio.interior">
</div>
<div class="form-group">
<label for="InputApellido1">Colonia</label>
<input type="text" class="form-control" id="InputColonia2" v-model="Envio.colonia">
</div>
<div class="form-group">
<label for="InputApellido1">Codigo Postal</label>
<input type="text" class="form-control" id="InputPostal" v-model="Envio.postal">
</div>
<div class="form-group">
<label for="InputCorreo1">Provincia o estado</label>
<input type="email" class="form-control" id="InputEstado2" v-model="Envio.estado">
</div>
<div class="form-group">
<label for="InputNombre1">Pais</label>
<input type="text" class="form-control" id="InputPais2" v-model="Envio.pais">
</div>
<div class="form-group">
<label for="InputApellido1">Telefono</label>
<input type="text" class="form-control" id="InputTelefono2" v-model="Envio.telefono">
</div>
</div>
</div>
</form>
</div>
</template>
<script>
export default {
data(){
return{
sameDirection:'',
select:'',
Facturacion:
{
RFC:'',
nombres:'',
apellidos:'',
empresa:'',
calle:'',
exterior:'',
interior:'',
colonia:'',
estado:'',
pais:'',
telefono:'',
correo:''
},
Envio:{
RFC:'',
nombres:'',
apellidos:'',
postal:'',
calle:'',
exterior:'',
interior:'',
colonia:'',
estado:'',
pais:'',
telefono:'',
correo:''
}
}
}
}
</script>
<style>
</style>
+10
View File
@@ -2,7 +2,11 @@ import Vue from 'vue'
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
import Home from './view/Home.vue' import Home from './view/Home.vue'
<<<<<<< HEAD
import PersonalData from './view/PersonalData.vue' import PersonalData from './view/PersonalData.vue'
=======
import Cart from './view/Cart.vue'
>>>>>>> origin
const routes = [ const routes = [
{ {
@@ -16,9 +20,15 @@ const routes = [
name: 'home' name: 'home'
}, },
{ {
<<<<<<< HEAD
path: '/datosPersonales', path: '/datosPersonales',
component: PersonalData, component: PersonalData,
name: 'personalData' name: 'personalData'
=======
path: '/cart',
component: Cart,
name: 'cart'
>>>>>>> origin
} }
] ]
+99
View File
@@ -0,0 +1,99 @@
<template>
<div class="my-5">
<div class="container d-flex flex-wrap justify-content-between">
<div class="cont-resum-shop py-2 mb-4">
<h2 class="ml-3">Carrito</h2>
<hr>
<div class="d-flex justify-content-between mx-4 my-4">
<div class="d-flex">
<img src="../img/bookOne.jpg" alt="Logo" style="height: 150px">
<p class="mx-4">
Invitación al psicoanálisis y lazos con la política, Lorem ipsum<br><span class="price-style"><b>$180</b></span>
</p>
</div>
<div class="d-flex flex-wrap flex-column align-items-center">
<div>
<input type="number" class="inp-number p-1 d-inline-block" name="" id="">
</div>
<span class="my-4"><b>$180</b></span>
<div>
<a href="#" class="text-dark">
<font-awesome-icon icon="trash" class=""/>
</a>
</div>
</div>
</div>
<div class="d-flex justify-content-between mx-4 my-4">
<div class="d-flex">
<img src="../img/bookOne.jpg" alt="Logo" style="height: 150px">
<p class="mx-4">
Invitación al psicoanálisis y lazos con la política, Lorem ipsum<br><span class="price-style"><b>$180</b></span>
</p>
</div>
<div class="d-flex flex-wrap flex-column align-items-center">
<div>
<input type="number" class="inp-number p-1 d-inline-block" name="" id="">
</div>
<span class="my-4"><b>$180</b></span>
<div>
<a href="#" class="text-dark">
<font-awesome-icon icon="trash" class=""/>
</a>
</div>
</div>
</div>
</div>
<div class="g-sec bg-light py-4 px-4 d-flex flex-column align-self-start align-items-center" style="">
<div class="d-flex justify-content-between">
<p class="mr-5">2 Artículos<br>Envío</p>
<p>$980<br>Pendiente</p>
</div>
<hr style="width:100%">
<div class="d-flex justify-content-between">
<p class="mr-5">Total(IVA incluido)<br>$980</p>
</div>
<hr style="width:100%">
<button class="btn btn-primary mx-auto"><b>IR A LA CAJA</b></button>
</div>
</div>
<div class="container mt-3">
<div class="d-inline-block">
<a href="#">
<p>
Continuar la compra
</p>
</a>
</div>
</div>
</div>
</template>
<script>
export default {
}
</script>
<style>
.cont-resum-shop {
/* background-color: skyblue; */
-webkit-box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
-moz-box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
box-shadow: 3px 3px 6px 0.2px rgba(0,0,0,0.2);
/* border-radius: 5px; */
/* font-size: 15px; */
}
.inp-number {
width: 55px;
border-radius: 5px;
border: 0.3px solid lightgray;
}
.price-style {
color: #6C59FE;
}
.g-sec {
-webkit-box-shadow: -3px 3px 6px 0.2px rgba(0,0,0,0.2);
-moz-box-shadow: -3px 3px 6px 0.2px rgba(0,0,0,0.2);
box-shadow: -3px 3px 6px 0.2px rgba(0,0,0,0.2);
}
</style>
View File