From 3ac79d95108eb9f58f679ecdb21c14123e06ea63 Mon Sep 17 00:00:00 2001
From: anne-lxm <1076217653@qq.com>
Date: Thu, 16 Dec 2021 21:00:48 +0800
Subject: [PATCH] update uni-share

---
 .gitignore                                    |  1 -
 jest.config.js                                |  6 +---
 pages/ucenter/about/about.vue                 | 29 ++++++++++---------
 pages/ucenter/ucenter.vue                     |  6 ++--
 uni_modules/uni-share/changelog.md            |  4 +++
 .../uni-share/js_sdk/uni-image-menu.js        | 19 ++++++------
 uni_modules/uni-share/package.json            |  2 +-
 uni_modules/uni-share/readme.md               | 12 +++++++-
 8 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index c42bb5c..47acc20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@ package-lock.json
 /uni_modules\uni-config-center\uniCloud\cloudfunctions\common\uni-config-center\uni-id\config.json
 /manifest.json
 /env.js
-/jest.config.js
 /vue.config.js
diff --git a/jest.config.js b/jest.config.js
index 15d7ec9..7526eb9 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -8,11 +8,7 @@ module.exports = {
     moduleFileExtensions: ['js', 'json'],
     rootDir: __dirname,
 	 testMatch: ["<rootDir>/pages/**/*test.[jt]s?(x)"],
-	 // testMatch: ["<rootDir>/pages/ucenter/about/about.test.js"],
+	 // testMatch: ["<rootDir>/pages/ucenter/settings/settings.test.js"],
     testPathIgnorePatterns: ['/node_modules/'],
 	 testSequencer:path.join(__dirname, "testSequencer.js")
-	 //pages/ucenter/userinfo/userinfo.test.js
-	 //pages/ucenter/login-page/pwd-login/pwd-login.test.js
-	 
-	 
 }
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 91473c3..9cd345d 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -19,20 +19,20 @@
 	</view>
 </template>
 <script>
-	// #ifdef APP-PLUS
+// #ifdef APP
 	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
-	const uniShare = new UniShare()
-	// #endif
-	export default {
-		// #ifdef APP-PLUS
-		onBackPress({from}) {
-			if(from=='backbutton'){
-				this.$nextTick(function(){
-					uniShare.hide()
-				})
-				return uniShare.isShow;
-			}
-		},
+	const uniShare = new UniShare()
+// #endif
+	export default {
+		// #ifdef APP
+		onBackPress({from}) {
+			if(from=='backbutton'){
+				this.$nextTick(function(){
+					uniShare.hide()
+				})
+				return uniShare.isShow;
+			}
+		},
 		// #endif
 		onLoad() {
 			// #ifdef APP-PLUS
@@ -41,7 +41,8 @@
 		},
 		computed: {
 			uniStarterConfig() {
-				return getApp({allowDefault: true}).globalData.config
+				console.log(getApp());
+				return getApp().globalData.config
 			}
 		},
 		data() {
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 271f7e1..b3fca2d 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -37,7 +37,7 @@
 	} from 'vuex';
 	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
 	import callCheckVersion from '@/uni_modules/uni-upgrade-center-app/utils/call-check-version';
-	// #ifdef APP
+	// #ifdef APP-PLUS
 	import UniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
 	const uniShare = new UniShare()
 	// #endif
@@ -149,7 +149,9 @@
 			// console.log(loginRes,'-------------');
 			// this.uniToken = loginRes.token
 			// console.log(313,this.userInfo,this.hasLogin);
+			
 			//#ifdef APP-PLUS
+			console.log(this.appVersion,"this.appVersion--------");
 			this.ucenterList[this.ucenterList.length - 2].unshift({
 				title:this.$t('mine.checkUpdate'),// this.this.$t('mine.checkUpdate')"检查更新"
 				rightText: this.appVersion.version + '-' + this.appVersion.versionCode,
@@ -324,7 +326,7 @@
 							"text": this.$t('common').wechatBbs,
 							"share": {
 								"provider": "weixin",
-								"scene": "WXSenceTimeline"
+								"scene": "WXSceneTimeline"
 							}
 						},
 						{
diff --git a/uni_modules/uni-share/changelog.md b/uni_modules/uni-share/changelog.md
index e3cd23f..c858c67 100644
--- a/uni_modules/uni-share/changelog.md
+++ b/uni_modules/uni-share/changelog.md
@@ -1,3 +1,7 @@
+## 2.0.2（2021-12-16）
+修复在某些情况下报：`Cannot read property 'hide' of undefined`的问题
+## 2.0.1（2021-11-29）
+修改错误的scene值WXSenceTimeline(分享到朋友圈)更正为WXSceneTimeline
 ## 2.0.0（2021-10-14）
 支持监听返回操作(如：物理返回，全面屏手机侧滑)关闭分享弹窗
 ## 1.0.6（2021-08-25）
diff --git a/uni_modules/uni-share/js_sdk/uni-image-menu.js b/uni_modules/uni-share/js_sdk/uni-image-menu.js
index 9b4e07d..43fe656 100644
--- a/uni_modules/uni-share/js_sdk/uni-image-menu.js
+++ b/uni_modules/uni-share/js_sdk/uni-image-menu.js
@@ -59,7 +59,7 @@ class NvImageMenu {
 			bottom: '0px',
 			left: '0px',
 			height: (iconWidth + textHeight + 2 * margin) * Math.ceil(list.length / 4) + 44 +
-			'px', //'264px',
+				'px', //'264px',
 			width: '100%',
 			backgroundColor: 'rgb(255,255,255)'
 		});
@@ -127,10 +127,10 @@ class NvImageMenu {
 			},
 			...myList
 		])
-		nvMask.show()
+		nvMask.show()
 		nvImageMenu.show()
 		// 开始动画
-		/*
+		/*
 			plus.nativeObj.View.startAnimation({
 				type: 'slide-in-bottom',
 				duration: 300
@@ -139,7 +139,7 @@ class NvImageMenu {
 				// 关闭原生动画
 				plus.nativeObj.View.clearAnimation();
 				nvImageMenu.show()
-			});
+			});
 		*/
 
 
@@ -194,10 +194,11 @@ class NvImageMenu {
 	}
 
 	hide() {
-		nvMask.hide()
-		nvImageMenu.hide()
-		this.isShow = false
+		if (this.isShow) {
+			nvMask.hide()
+			nvImageMenu.hide()
+			this.isShow = false
+		}
 	}
 }
-
-export default NvImageMenu
+export default NvImageMenu
\ No newline at end of file
diff --git a/uni_modules/uni-share/package.json b/uni_modules/uni-share/package.json
index 4a2a3e1..fa43a0e 100644
--- a/uni_modules/uni-share/package.json
+++ b/uni_modules/uni-share/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-share",
   "displayName": "uni-share",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "底部弹出宫格图标式的分享菜单，可覆盖原生组件。",
   "keywords": [
     "分享菜单"
diff --git a/uni_modules/uni-share/readme.md b/uni_modules/uni-share/readme.md
index a3d201c..dced6d6 100644
--- a/uni_modules/uni-share/readme.md
+++ b/uni_modules/uni-share/readme.md
@@ -7,6 +7,15 @@
 <script>
 	import uniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
 	export default {
+		onBackPress({from}) {
+			console.log(from);
+			if(from=='backbutton'){
+				this.$nextTick(function(){
+					uniShare.hide()
+				})
+				return uniShare.isShow;
+			}
+		},
 		methods: {
 			uniShare() {
 				uniShare.show({
@@ -30,7 +39,7 @@
 							"text": "微信朋友圈",
 							"share": {
 								"provider": "weixin",
-								"scene": "WXSenceTimeline"
+								"scene": "WXSceneTimeline"
 							}
 						},
 						{
@@ -75,6 +84,7 @@
 					],
 					cancelText: "取消分享",
 				}, e => { //callback
+					console.log(uniShare.isShow);
 					console.log(e);
 				})
 			}
-- 
GitLab