inboxz лет назад: 4
Родитель
Сommit
7ff6f2f073

Разница между файлами не показана из-за своего большого размера
+ 204 - 616
package-lock.json


+ 3 - 2
package.json

@@ -32,7 +32,8 @@
32 32
     "@ionic-native/http": "^5.36.0",
33 33
     "@ionic-native/native-geocoder": "^5.36.0",
34 34
     "@ionic/angular": "^5.5.2",
35
-    "cordova-ios": "6.2.0",
35
+    "cordova-ios": "^4.0.1",
36
+    "ionic-img-viewer": "^2.9.0",
36 37
     "rxjs": "~6.6.0",
37 38
     "tslib": "^2.2.0",
38 39
     "zone.js": "~0.11.4"
@@ -104,4 +105,4 @@
104 105
       "ios"
105 106
     ]
106 107
   }
107
-}
108
+}

+ 3 - 0
src/app/app.module.ts

@@ -22,6 +22,9 @@ import { NativeGeocoder } from '@ionic-native/native-geocoder/ngx';
22 22
 import { CallNumber } from '@ionic-native/call-number/ngx';
23 23
 import { EmailComposer } from '@ionic-native/email-composer/ngx';
24 24
 
25
+// import { IonicImageViewerModule } from 'ionic-img-viewer';
26
+
27
+
25 28
 // library.add(fas,far,fab);
26 29
 
27 30
 @NgModule({

+ 8 - 6
src/app/placedetail/placedetail.page.html

@@ -4,7 +4,7 @@
4 4
       <ion-back-button></ion-back-button>
5 5
     </ion-buttons>
6 6
     <div class="hcs">
7
-      <img src="/assets/images/wellnessbar.svg" height="50" />    
7
+      <img src="/assets/images/wellnessbar.svg" height="50" />
8 8
     </div>
9 9
   </ion-toolbar>
10 10
 </ion-header>
@@ -90,11 +90,13 @@
90 90
           </ion-col>
91 91
         </ion-list>
92 92
       </ion-col>
93
-<ion-list *ngIf="segment === 'list3'">
94
-  <ion-col>
95
-    
96
-  </ion-col>
97
-</ion-list>
93
+      <ion-list *ngIf="segment === 'list3'">
94
+        <ion-row *ngIf="placelist">
95
+          <ion-col size="6" *ngFor="let galimg of placelist['acf']['gallery']">            
96
+            <img src="{{galimg.url}}" imageViewer />    
97
+          </ion-col>
98
+        </ion-row>
99
+      </ion-list>
98 100
     </ion-row>
99 101
 
100 102
   </ion-grid>

+ 14 - 0
src/app/placedetail/placedetail.page.scss

@@ -56,3 +56,17 @@
56 56
     margin-top: -41px;
57 57
   }
58 58
 }
59
+
60
+// ion-segment {
61
+//   --background:#ffc409;
62
+// }
63
+ion-segment-button {
64
+  --indicator-box-shadow: transparent !important;
65
+  // --background:white;
66
+  // --color:#2d2e87;
67
+  // --background-checked: linear-gradient(to right, #2d2e87, #0083CB)!important;
68
+  // --color-checked: rgb(160, 205, 216);
69
+  border-radius: .5rem !important;
70
+  padding: 2px;
71
+  margin: 0;
72
+}

+ 9 - 0
src/app/placedetail/placedetail.page.ts

@@ -63,6 +63,15 @@ export class PlacedetailPage implements OnInit {
63 63
     }, error => {
64 64
       console.log("errror ", error);
65 65
     });
66
+    // let id = this.route.snapshot.paramMap.get('id') || this.id;
67
+    // console.log("fetching ...");
68
+    // this.wpservice.getPlaceCat().subscribe((data) => {
69
+    //   this.placecatlist = data;      
70
+    //   console.log("load Cat Place ...");
71
+    //   console.log(data);
72
+    // }, error => {
73
+    //   console.log("errror ", error);
74
+    // });
66 75
   }
67 76
 
68 77
   loadMap() {

+ 1 - 1
src/app/tabs/tabs.page.html

@@ -17,7 +17,7 @@
17 17
 
18 18
     <ion-tab-button tab="login" layout="icon-top">
19 19
       <ion-icon name="person"></ion-icon>
20
-      <ion-label>ฉัน</ion-label>
20
+      <ion-label >ฉัน</ion-label>
21 21
     </ion-tab-button>
22 22
     
23 23
   </ion-tab-bar>

+ 2 - 1
src/app/tabs/tabs.page.scss

@@ -1,6 +1,7 @@
1 1
 ion-label {
2 2
     font-family: "IBM Plex Sans Thai", sans-serif !important;
3
-    font-weight: 400;
3
+    font-weight: 500;
4
+    font-size: 14px;
4 5
 }
5 6
 
6 7
 ion-tab-bar {

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/assets/json/place.json