From b42cb5a8ce3a546f585574e9297bcc4de9df4bfd Mon Sep 17 00:00:00 2001
From: lxz <lxz15516116653@163.com>
Date: Wed, 17 Jan 2024 18:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json           |  4 +--
 pages/oaHome/oaHome.vue | 76 ++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6f5950b..c40472b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
 	// "appid" : "__UNI__3A527D1",
 	"appid": "__UNI__A495155",
 	"description": "",
-	"versionName": "1.0.2",
-	"versionCode": 102,
+	"versionName": "1.0.6",
+	"versionCode": 106,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 685a535..19b5bbf 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -3,7 +3,7 @@
 		<view class="" style="background-color: #2B63E3;height: var(--status-bar-height);" />
 		<view class="head">
 			<view class="" style="float: right;margin-top: 20rpx;">
-				<Myindex url='/pages/index/index' />
+				<Myindex url='/pages/oaHome/oaHome' />
 			</view>
 			<view class="head-content ">
 				<view class="identity">
@@ -380,9 +380,10 @@
 			await this.$onLaunched;
 			this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain
 			this.options.data = bj;
-			this.initTask()
+			// this.initTask()
 		},
 		async onShow() {
+			this.initTask()
 			await this.$onLaunched;
 			if (uni.getStorageSync('uniMP')) this.uniMP = true;
 			userInfo().then(({
@@ -466,44 +467,43 @@
 				});
 			},
 			saveCode() {
-				// this.$refs.uqrcode.save({
-				// 	success: () => {
-				// 		uni.showToast({
-				// 			icon: 'success',
-				// 			title: '保存成功'
-				// 		});
-				// 	}
-				// });
-				var pages = getCurrentPages();
-				var page = pages[pages.length - 1];
-				console.log("当前页" + pages.length - 1);
-				var bitmap = null;
-				var currentWebview = page.$getAppWebview();
-				bitmap = new plus.nativeObj.Bitmap('amway_img');
-				// 将webview内容绘制到Bitmap对象中  
-				currentWebview.draw(bitmap, function() {
-					console.log('截屏绘制图片成功');
-					bitmap.save("_doc/a.jpg", {}, function(i) {
-						console.log('保存图片成功：' + JSON.stringify(i));
-						uni.saveImageToPhotosAlbum({
-							filePath: i.target,
-							success: function() {
-								bitmap.clear(); //销毁Bitmap图片  
-								uni.showToast({
-									title: '保存图片成功',
-									mask: false,
-									duration: 1500
-								});
-							}
+				this.$refs.uqrcode.save({
+					success: () => {
+						uni.showToast({
+							icon: 'success',
+							title: '保存成功'
 						});
-					}, function(e) {
-						console.log('保存图片失败：' + JSON.stringify(e));
-					});
-				}, function(e) {
-					console.log('截屏绘制图片失败：' + JSON.stringify(e));
+					}
 				});
-				//currentWebview.append(amway_bit);    
-
+				// var pages = getCurrentPages();
+				// var page = pages[pages.length - 1];
+				// console.log("当前页" + pages.length - 1);
+				// var bitmap = null;
+				// var currentWebview = page.$getAppWebview();
+				// bitmap = new plus.nativeObj.Bitmap('amway_img');
+				// // 将webview内容绘制到Bitmap对象中  
+				// currentWebview.draw(bitmap, function() {
+				// 	console.log('截屏绘制图片成功');
+				// 	bitmap.save("_doc/a.jpg", {}, function(i) {
+				// 		console.log('保存图片成功：' + JSON.stringify(i));
+				// 		uni.saveImageToPhotosAlbum({
+				// 			filePath: i.target,
+				// 			success: function() {
+				// 				bitmap.clear(); //销毁Bitmap图片  
+				// 				uni.showToast({
+				// 					title: '保存图片成功',
+				// 					mask: false,
+				// 					duration: 1500
+				// 				});
+				// 			}
+				// 		});
+				// 	}, function(e) {
+				// 		console.log('保存图片失败：' + JSON.stringify(e));
+				// 	});
+				// }, function(e) {
+				// 	console.log('截屏绘制图片失败：' + JSON.stringify(e));
+				// });
+				// //currentWebview.append(amway_bit);    
 			},
 
 			leftClick(e) {