|
|
@@ -53,9 +53,10 @@
|
|
53
|
53
|
|
|
54
|
54
|
<script type="text/javascript" src="js/saveLocal.js"></script>
|
|
55
|
55
|
|
|
|
56
|
+ <script> console.log(window.localStorage.getItem("MADERA")); </script>
|
|
56
|
57
|
|
|
57
|
58
|
|
|
58
|
|
-
|
|
|
59
|
+ <ons-navigator swipeable animation="slide" id="myNavigator">
|
|
59
|
60
|
<ons-page>
|
|
60
|
61
|
<ons-toolbar>
|
|
61
|
62
|
<div class="center">Directorio Artesanal</div>
|
|
|
@@ -199,6 +200,7 @@
|
|
199
|
200
|
<div class="expandable-content"> Municipio: ${Artesano.Municipio}<br>
|
|
200
|
201
|
Tel\u00e9fono: ${Artesano["Telefono 1"]}<br>
|
|
201
|
202
|
Correo Electr\u00f3nico: ${Artesano["E-mail"]}<br>
|
|
|
203
|
+ Red Social: ${Artesano["E-mail"]} <br>
|
|
202
|
204
|
</div>
|
|
203
|
205
|
</ons-list-item>`
|
|
204
|
206
|
);
|
|
|
@@ -229,7 +231,11 @@
|
|
229
|
231
|
|
|
230
|
232
|
//info a pasar
|
|
231
|
233
|
//'title':'${Artesano.Nombre}','esp': '${info}'
|
|
|
234
|
+<<<<<<< HEAD
|
|
232
|
235
|
var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
|
|
|
236
|
+=======
|
|
|
237
|
+ var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', redes: '${Artesano["E-Commerce 1"]}', esp: '${Artesano.Especificacion}' } })" tappable>
|
|
|
238
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
233
|
239
|
<div class="title">${Artesano.Nombre}</div>
|
|
234
|
240
|
</ons-list-item>`);
|
|
235
|
241
|
|
|
|
@@ -336,7 +342,7 @@
|
|
336
|
342
|
|
|
337
|
343
|
//if(Esp[num] in artesanos_json.) {}
|
|
338
|
344
|
Artesanos+=`${results[i].Nombre}|`
|
|
339
|
|
- ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}&&`
|
|
|
345
|
+ ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["E-Commerce 1"]}&&`
|
|
340
|
346
|
//`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
|
|
341
|
347
|
}
|
|
342
|
348
|
|
|
|
@@ -366,7 +372,11 @@
|
|
366
|
372
|
mun = lot[0],
|
|
367
|
373
|
tel = lot[1],
|
|
368
|
374
|
email = lot[2],
|
|
|
375
|
+<<<<<<< HEAD
|
|
369
|
376
|
esp = lot[3],
|
|
|
377
|
+=======
|
|
|
378
|
+ esp = lot[3]
|
|
|
379
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
370
|
380
|
redes = lot[4];
|
|
371
|
381
|
|
|
372
|
382
|
listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
|
|
|
@@ -475,7 +485,6 @@
|
|
475
|
485
|
</script>
|
|
476
|
486
|
|
|
477
|
487
|
<template id="search.html">
|
|
478
|
|
- <ons-navigator swipeable animation="slide" id="SNavigator">
|
|
479
|
488
|
<ons-page id="Buscar">
|
|
480
|
489
|
<p style="text-align: center; margin-top: 10px;">
|
|
481
|
490
|
<ons-search-input placeholder="Search anything" id = "searchbar"
|
|
|
@@ -492,7 +501,11 @@
|
|
492
|
501
|
<script>
|
|
493
|
502
|
for (i = 0; i < all_artesanos.length;i++){
|
|
494
|
503
|
var artesano = ons.createElement(`<ons-list-item class = "artists"
|
|
|
504
|
+<<<<<<< HEAD
|
|
495
|
505
|
onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
|
|
|
506
|
+=======
|
|
|
507
|
+ onclick="myNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', redes: '${all_artesanos[i]["E-Commerce"]}', esp: '${all_artesanos[i].Especificacion}' } })" tappable>
|
|
|
508
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
496
|
509
|
<div>${all_artesanos[i].Nombre}</div>
|
|
497
|
510
|
</ons-list-item>`);
|
|
498
|
511
|
// var artesano = ons.createElement(`
|
|
|
@@ -526,7 +539,11 @@
|
|
526
|
539
|
mun = this.data.mun,
|
|
527
|
540
|
tel = this.data.tel,
|
|
528
|
541
|
em = this.data.email,
|
|
|
542
|
+<<<<<<< HEAD
|
|
529
|
543
|
esp = this.data.esp,
|
|
|
544
|
+=======
|
|
|
545
|
+ esp = this.data.esp
|
|
|
546
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
530
|
547
|
redes = this.data.redes;
|
|
531
|
548
|
|
|
532
|
549
|
email = em.slice(0, em.search("#"));
|
|
|
@@ -557,6 +574,7 @@
|
|
557
|
574
|
data+='Tel\u00e9fono: <a style="color:blue" href="tel: '+ tel +'"><u>'+ tel +'</u></a><br>';
|
|
558
|
575
|
}
|
|
559
|
576
|
|
|
|
577
|
+<<<<<<< HEAD
|
|
560
|
578
|
console.log("Redes: "+redes);
|
|
561
|
579
|
|
|
562
|
580
|
if(redes.includes("facebook")){
|
|
|
@@ -584,6 +602,11 @@
|
|
584
|
602
|
console.log("no tiene nada");
|
|
585
|
603
|
}
|
|
586
|
604
|
|
|
|
605
|
+=======
|
|
|
606
|
+ if (redes.trim() != "") {
|
|
|
607
|
+ data+='Red Social: ' + redes + '<br>';
|
|
|
608
|
+ }
|
|
|
609
|
+>>>>>>> 14e5cd074daf97094f534be2284dd3318186d299
|
|
587
|
610
|
|
|
588
|
611
|
document.getElementById("all").innerHTML = `${data}`;
|
|
589
|
612
|
|
|
|
@@ -595,7 +618,6 @@
|
|
595
|
618
|
<!-- ------------------------------------------------------------------------------------------------------------------------------------------------------- -->
|
|
596
|
619
|
|
|
597
|
620
|
<template id="renglones.html">
|
|
598
|
|
- <ons-navigator swipeable animation="slide" id="myNavigator">
|
|
599
|
621
|
<ons-page id="renglones">
|
|
600
|
622
|
|
|
601
|
623
|
<!--div class="search-bar">
|
