From cb9fe5739f128f62d63b7ac6a34d5e83a2db1079 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Sat, 17 Jul 2021 13:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=B5=B7?=
 =?UTF-8?q?=E6=8A=A5=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goodsDetail/index.vue | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index 9b8ceec..1cad73e 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -334,6 +334,7 @@
 								that.canvasHidden = true
 								that.maskHidden = true
 							}
+							wx.hideToast()
 							console.log('海报生成成功')
 							console.log(res)
 							console.log('图片链接', that.imagePath)
@@ -369,35 +370,16 @@
 			},
 			formSubmit() {
 				var that = this;
-				uni.showLoading({title: '正在生成中'});
+				wx.showToast({
+					title: '生成海报中...',
+					icon: 'loading',
+					duration: 100000
+				});
 				Promise.all([that.getWxCode(), that.getBackground()]).then(res => {
 					that.createNewImg();
 				}).catch(err => {
 					this.$msg('生成失败,请稍后重试!');
 				})
-				
-				
-				// if(that.isShowButtonCount >= 2) {
-					
-				// }else {
-				// 	this.$msg('请稍后重试!')
-				// }
-				// that.$u.throttle(() => {
-				// 	wx.showToast({
-				// 		title: '生成海报中...',
-				// 		icon: 'loading',
-				// 		duration: 1000
-				// 	});
-				// 	console.log(that.onceCode)
-				// 	console.log(that.backgroundImg)
-				// 	if(that.onceCode && that.backgroundImg) {
-						
-				// 	}else if(!that.onceCode){
-				// 		this.$msg('小程序码生成失败!')
-				// 	}else if(!that.backgroundImg){
-				// 		this.$msg('海报背景图生成失败!')
-				// 	}
-				// }, 500);
 			},
 			//海报结束
 			getGoodsDetail() {