修改删除提示的逻辑

李洪亮 · 李洪亮 · commit b65582e772b8 · 2022-07-28T10:00:55.000+08:00
diff --git a/src/app/note/note.component.scss b/src/app/note/note.component.scss
@@ -45,3 +45,7 @@
 .am-toast.am-toast-nomask.am-toast.am-toast-nomask.am-toast.am-toast-nomask-top {
     top: 60px;
 }
+.delete {
+    color: "#ffffff";
+    background: "#e94f4f";
+}
diff --git a/src/app/note/note.component.ts b/src/app/note/note.component.ts
@@ -320,20 +320,72 @@ export class NoteComponent implements OnInit, AfterViewInit {
             this.toast.info('请勾选一行', 1500);
             return false;
         }
-        this.modal.alert('删除', '确定要删除么', [
-            { text: '取消', onPress: () => { } },
-            {
-                text: '删除',
-                onPress: () =>
-                    new Promise(resolve => {
+        // this.modal.alert('删除', '确定要删除么', [
+        //     { text: '取消', onPress: () => { } },
+        //     {
+        //         text: '删除',
+        //         onPress: () =>
+        //             new Promise(resolve => {
+        //                 if (this.isHidden) {
+        //                     this.accountBook.cars[this.activeTabIndex].datas.forEach((data, i) => {
+        //                         if (this.setOfCheckedId.has(data.id)) {
+        //                             const data = cloneDeep(this.accountBook.cars[this.activeTabIndex].datas);
+        //                             data.splice(i, 1);
+        //                             this.accountBook.cars[this.activeTabIndex].datas = data;
+        //                             this.save(true);
+        //                             resolve(true);
+        //                         }
+        //                     })
+        //                 } else if (this.activeTabIndex === this.accountBook.cars.length) {
+
+        //                     this.accountBook.outCars.forEach((car, i) => {
+        //                         if (this.setOfCheckedId.has(car.id)) {
+        //                             const data = cloneDeep(this.accountBook.outCars);
+        //                             data.splice(i, 1);
+        //                             this.accountBook.outCars = data;
+        //                             this.save(true);
+        //                             resolve(true);
+        //                         }
+        //                     })
+        //                 } else {
+        //                     this.accountBook.guozhaCars.forEach((car, i) => {
+        //                         if (this.setOfCheckedId.has(car.id)) {
+        //                             const data = cloneDeep(this.accountBook.guozhaCars);
+        //                             data.splice(i, 1);
+        //                             this.accountBook.guozhaCars = data;
+        //                             this.save(true);
+        //                             resolve(true);
+        //                         }
+        //                     })
+        //                 }
+
+        //             }),
+        //         style: {
+        //             color: '#ffffff',
+        //             background: '#e94f4f'
+        //         }
+        //     }
+        // ]);
+
+        this.alertCtrl.create({
+            header: '删除',
+            message:'确定要删除么',
+            buttons: [
+                {
+                    text:'取消',
+                    role: 'cancel',
+                },
+                {
+                    text:'删除',
+                    cssClass: 'delete',
+                    handler: ()=>{
                         if (this.isHidden) {
                             this.accountBook.cars[this.activeTabIndex].datas.forEach((data, i) => {
                                 if (this.setOfCheckedId.has(data.id)) {
                                     const data = cloneDeep(this.accountBook.cars[this.activeTabIndex].datas);
                                     data.splice(i, 1);
                                     this.accountBook.cars[this.activeTabIndex].datas = data;
                                     this.save(true);
-                                    resolve(true);
                                 }
                             })
                         } else if (this.activeTabIndex === this.accountBook.cars.length) {
@@ -344,7 +396,6 @@ export class NoteComponent implements OnInit, AfterViewInit {
                                     data.splice(i, 1);
                                     this.accountBook.outCars = data;
                                     this.save(true);
-                                    resolve(true);
                                 }
                             })
                         } else {
@@ -354,18 +405,13 @@ export class NoteComponent implements OnInit, AfterViewInit {
                                     data.splice(i, 1);
                                     this.accountBook.guozhaCars = data;
                                     this.save(true);
-                                    resolve(true);
                                 }
                             })
                         }
-
-                    }),
-                style: {
-                    color: '#ffffff',
-                    background: '#e94f4f'
+                    }
                 }
-            }
-        ]);
+            ]
+        })
     }
     /**
      * 添加车辆弹出框

Original file line number	Diff line number	Diff line change
`@@ -45,3 +45,7 @@`
`45`	`45`	`.am-toast.am-toast-nomask.am-toast.am-toast-nomask.am-toast.am-toast-nomask-top {`
`46`	`46`	`top: 60px;`
`47`	`47`	`}`
	`48`	`+.delete {`
	`49`	`+ color: "#ffffff";`
	`50`	`+ background: "#e94f4f";`
	`51`	`+}`