显示big picture

src/app/contract-detail/contract-detail.page.html

@@ -38,7 +38,7 @@
     </ion-item-group>
     <ion-item lines="none">
       <span>产品图片:</span>
-      <img slot="end" *ngIf="contract.imgsrc" (click)="showFullScreenImage(contract.imgsrc)" [src]="contract.imgsrc" class="title-image"/>
+      <img slot="end" *ngIf="contract.imgsrc" (click)="showFullScreenImage(contract)" [src]="contract.imgsrc" class="title-image"/>
     </ion-item>
 
     <ion-item>

src/app/contract-detail/contract-detail.page.scss

@@ -1,6 +1,10 @@
 .detail-header {
-    // background-color: var(--ion-color-dark);
-    padding: 20px;
-    width: 100%;
-    text-align: center;
-  }
+  // background-color: var(--ion-color-dark);
+  padding: 20px;
+  width: 100%;
+  text-align: center;
+}
+.title-image {
+  width: auto;
+  height: 60px;
+}

src/app/contract-detail/contract-detail.page.ts

@@ -34,7 +34,7 @@ export class ContractDetailPage implements OnInit {
           this.scpModifiedtime = JSON.parse(data).data[0].scpModifiedtime
           this.contractDetailList = JSON.parse(data).data
           for (let i of this.contractDetailList) {
-            // console.log(i)
+            i.imgsrc = i.pictures[0].smallPicture
             let data = await this.userData.getQAlog(val, i.pid)
             if (JSON.parse(data).data.length !== 0) {
               i.qalog = JSON.parse(data).data[0].mark
@@ -50,8 +50,8 @@ export class ContractDetailPage implements OnInit {
     this.defaultHref = `/contract-table`;
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
   }
 
   takePicture(contract) {

src/app/contract/contract.page.ts

@@ -33,7 +33,7 @@ export class ContractPage implements OnInit {
       },
       from: 0,
       size: 10,
-      sort: [],
+      sort: [{sscContractdate: {order: "desc"}}],
       aggs: {}
     };
     if (this.contractInfo.sscCode) {

src/app/sample-detail/sample-detail.page.html

@@ -46,7 +46,7 @@
 
     <ion-item lines="none">
       <span>产品图片:</span>
-      <img slot="end" [src]="sample.imgsrc" (click)="showFullScreenImage(sample.imgsrc)" class="title-image"/>
+      <img slot="end" [src]="sample.imgsrc" (click)="showFullScreenImage(sample)" class="title-image"/>
     </ion-item>
 
     <ion-item>

src/app/sample-detail/sample-detail.page.ts

@@ -74,8 +74,8 @@ export class SampleDetailPage implements OnInit {
     });
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
   }
 
   async saveDetail() {

src/app/sample/sample.page.ts

@@ -36,7 +36,7 @@ export class SamplePage implements OnInit {
       },
       from: 0,
       size: 10,
-      sort: [],
+      sort: [{sdCreateDate: {order: "desc"}}],
       aggs: {}
     };
     if (this.sampleInfo.sdDocument) {

src/app/store-pending/store-pending.page.html

@@ -15,7 +15,7 @@
   </ion-refresher>
   <ion-card *ngFor="let pending of pendingList" (click)="getStoreQCDetail(pending)">
     <ion-card-content class="pending-content">
-      <ion-item lines="none" *ngIf="pending.imgsrc" (click)="showFullScreenImage(pending.imgsrc)">
+      <ion-item lines="none" *ngIf="pending.imgsrc" (click)="showFullScreenImage(pending)">
         <span>产品图片:</span>
         <img slot="end" [src]="pending.imgsrc" class="title-image" />
       </ion-item>

src/app/store-pending/store-pending.page.ts

@@ -29,8 +29,8 @@ export class StorePendingPage implements OnInit {
     this.getList();
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url);
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data);
   }
 
   async getList() {

src/app/store-qc-detail/store-qc-detail.page.html

@@ -46,7 +46,7 @@
     </ion-item-group>
     <ion-item>
       <ion-label>产品图片：</ion-label>
-      <ion-img [src]="qc.pictures[0].smallPicture" (click)="showFullScreenImage(qc.pictures[0].smallPicture)" class="qc-product-img"></ion-img>
+      <ion-img [src]="qc.pictures[0].smallPicture" (click)="showFullScreenImage(qc)" class="qc-product-img"></ion-img>
     </ion-item>
     <ion-item>
       <ion-label>

src/app/store-qc-detail/store-qc-detail.page.ts

@@ -46,8 +46,8 @@ export class StoreQCDetailPage implements OnInit {
     this.getDetail()
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
   }
 
   async getDetail() {

src/app/store-qc-scanning/store-qc-scanning.page.ts

@@ -74,8 +74,8 @@ export class StoreQCScanningPage implements OnInit {
     this.scanCode = ''
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
   }
 
   // 获取扫描详情

src/app/store-sample-pending/store-sample-pending.page.html

@@ -33,7 +33,7 @@
     <ion-card-content class="storeSample-content">
       <ion-item lines="none">
         <span>产品图片:</span>
-        <img slot="end" (click)="showFullScreenImage(storeSample.imgsrc)" [src]="storeSample.imgsrc"
+        <img slot="end" (click)="showFullScreenImage(storeSample)" [src]="storeSample.imgsrc"
           class="title-image" />
       </ion-item>
       <ion-item>

src/app/store-sample-pending/store-sample-pending.page.ts

@@ -45,8 +45,8 @@ export class StoreSamplePendingPage implements OnInit {
     }
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(form) {
+    this.commonService.fullScreenImg(form)
   }
 
   // 通过code获取仓库样品详情

src/app/warehouse-manage-pending/warehouse-manage-pending.page.html

@@ -28,7 +28,7 @@
     <ion-card-content class="storeSample-content">
       <ion-item lines="none">
         <span>产品图片:</span>
-        <img slot="end" (click)="showFullScreenImage(warehouseManage.imgsrc)" [src]="warehouseManage.imgsrc" class="title-image" />
+        <img slot="end" (click)="showFullScreenImage(warehouseManage)" [src]="warehouseManage.imgsrc" class="title-image" />
       </ion-item>
       <ion-item>
         <ion-icon name="briefcase"></ion-icon>

src/app/warehouse-manage-pending/warehouse-manage-pending.page.ts

@@ -26,8 +26,8 @@ export class WarehouseManagePendingPage implements OnInit {
     this.getList();
   }
 
-  showFullScreenImage(url) {
-    this.commonService.fullScreenImg(url)
+  showFullScreenImage(data) {
+    this.commonService.fullScreenImg(data)
   }
 
   doRefresh(event) {

src/providers/common.service.ts

@@ -8,7 +8,11 @@ import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 export class commonService {
     constructor(private photoViewer: PhotoViewer, ) { }
 
-    fullScreenImg(url) {
-        this.photoViewer.show(url);
+    fullScreenImg(data) {
+        if (typeof data === 'string') {
+            this.photoViewer.show(data)
+        } else {
+            this.photoViewer.show(data.pictures[0].bigPicture);
+        }
     }
 }