From 66ed9016760d5384f7b9decd3d41ffe8d684aece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Tue, 10 Aug 2021 18:10:33 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6=E7=BC=A9=E6=94=BE=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=97=B6=E8=BD=BB=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/lf-previewImage/lf-previewImage.vue  | 13 ++++++++++---
 canteen/pages/index/index.vue                       |  1 -
 .../components/lf-previewImage/lf-previewImage.vue  | 13 ++++++++++---
 supplier/pages/index/index.vue                      |  1 -
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/canteen/components/lf-previewImage/lf-previewImage.vue b/canteen/components/lf-previewImage/lf-previewImage.vue
index 0143b20..a72abee 100644
--- a/canteen/components/lf-previewImage/lf-previewImage.vue
+++ b/canteen/components/lf-previewImage/lf-previewImage.vue
@@ -92,7 +92,6 @@
 		created(){
 			// TODO PC端屏蔽遮罩滚动穿透
 			// TODO PC端滚轮放大缩小
-			// TODO 放大缩小百分比显示
 			// TODO 双击时会被关掉
 		},
 		methods: {
@@ -117,8 +116,12 @@
 			},
 			// movable 缩放事件
 			scale(event){
-				let scale = event.detail.scale;
-				this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来
+				let scale = parseInt(event.detail.scale * 100) +'%';
+				uni.showToast({
+					title: scale,
+					icon: 'none',
+					position: 'bottom'
+				})
 			},
 			// 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能
 			mousewheel(event){
@@ -227,4 +230,8 @@
 			}
 		}
 	}
+	// 轻提示框样式
+	/deep/.uni-sample-toast{
+		z-index: 1002;
+	}
 </style>
diff --git a/canteen/pages/index/index.vue b/canteen/pages/index/index.vue
index 1f2d0ee..a2a1bd1 100644
--- a/canteen/pages/index/index.vue
+++ b/canteen/pages/index/index.vue
@@ -38,7 +38,6 @@
 			}
 		},
 		onShow() {
-			// todo 优化：显示订单角标
 			this.getHomeData();
 		},
 		onReady() {
diff --git a/supplier/components/lf-previewImage/lf-previewImage.vue b/supplier/components/lf-previewImage/lf-previewImage.vue
index 0143b20..a72abee 100644
--- a/supplier/components/lf-previewImage/lf-previewImage.vue
+++ b/supplier/components/lf-previewImage/lf-previewImage.vue
@@ -92,7 +92,6 @@
 		created(){
 			// TODO PC端屏蔽遮罩滚动穿透
 			// TODO PC端滚轮放大缩小
-			// TODO 放大缩小百分比显示
 			// TODO 双击时会被关掉
 		},
 		methods: {
@@ -117,8 +116,12 @@
 			},
 			// movable 缩放事件
 			scale(event){
-				let scale = event.detail.scale;
-				this.$msg(scale); // TODO 轻提示层级不够，没有被显示出来
+				let scale = parseInt(event.detail.scale * 100) +'%';
+				uni.showToast({
+					title: scale,
+					icon: 'none',
+					position: 'bottom'
+				})
 			},
 			// 鼠标滚动缩放事件，目前会触发浏览器页面滚动事件，暂时先不要这个功能
 			mousewheel(event){
@@ -227,4 +230,8 @@
 			}
 		}
 	}
+	// 轻提示框样式
+	/deep/.uni-sample-toast{
+		z-index: 1002;
+	}
 </style>
diff --git a/supplier/pages/index/index.vue b/supplier/pages/index/index.vue
index c14b788..7826038 100644
--- a/supplier/pages/index/index.vue
+++ b/supplier/pages/index/index.vue
@@ -39,7 +39,6 @@
 			}
 		},
 		onShow() {
-			// todo 优化：显示订单角标
 			this.getData();
 		},
 		onReady(){