From 68755989311e8a25275f75e716665f8261517112 Mon Sep 17 00:00:00 2001
From: linju-json <linju@dcloud.io>
Date: Thu, 16 Dec 2021 18:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DH5=E7=AB=AF=E5=9C=A8about?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E5=BC=95=E5=8F=91=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ucenter/about/about.vue                 |   2 +-
 pages/ucenter/ucenter.vue                     |   2 +-
 .../common/uni-config-center/push/config.json |  10 ++
 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               | 158 ++++++++++--------
 7 files changed, 111 insertions(+), 86 deletions(-)
 create mode 100644 uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/push/config.json

diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 72637e3..9cd345d 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -87,7 +87,7 @@
 						"text":  this.$t('common').wechatBbs,
 						"share": {
 							"provider": "weixin",
-							"scene": "WXSenceTimeline"
+							"scene": "WXSceneTimeline"
 						}
 					},
 					{
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 444bd91..eb6cba3 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -310,7 +310,7 @@
 							"text": this.$t('common').wechatBbs,
 							"share": {
 								"provider": "weixin",
-								"scene": "WXSenceTimeline"
+								"scene": "WXSceneTimeline"
 							}
 						},
 						{
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/push/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/push/config.json
new file mode 100644
index 0000000..8bf55e9
--- /dev/null
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/push/config.json
@@ -0,0 +1,10 @@
+{
+	"goEasy": {
+		"commonKey": "BC-01f554db12604b46ae8373907e28794d",
+		"clientKey": "PC-bfb6b6517e7f4c4f8b9285911fd3be27",
+		"subscribeKey": "BS-ac71890d8612459bb4b22429cf406be3",
+		"restKey": "PR-77f4630e731e4b5f8078aea77268cba4",
+		"secretKey": "4bfeca3985504b3d",
+		"restHost":"rest-hangzhou.goeasy.io"
+	}
+}
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..d96f552 100644
--- a/uni_modules/uni-share/readme.md
+++ b/uni_modules/uni-share/readme.md
@@ -1,85 +1,95 @@
 #### 本功能基于[底部图标菜单](https://ext.dcloud.net.cn/plugin?id=4858)封装而成。
 ### 示例代码
 ```
-<template>
-	<button type="default" @click="uniShare">显示</button>
-</template>
+<template>
+	<button type="default" @click="uniShare">显示</button>
+</template>
 <script>
 	import uniShare from '@/uni_modules/uni-share/js_sdk/uni-share.js';
 	export default {
-		methods: {
-			uniShare() {
-				uniShare.show({
-					content: { //公共的分享参数配置  类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
-						type: 0,
-						href: 'https://uniapp.dcloud.io/',
-						title: '标题',
-						summary: '描述',
-						imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png'
-					},
-					menus: [{
-							"img": "/static/app-plus/sharemenu/wechatfriend.png",
-							"text": "微信好友",
-							"share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5
-								"provider": "weixin",
-								"scene": "WXSceneSession"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/wechatmoments.png",
-							"text": "微信朋友圈",
-							"share": {
-								"provider": "weixin",
-								"scene": "WXSenceTimeline"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/mp_weixin.png",
-							"text": "微信小程序",
-							"share": {
-								provider: "weixin",
-								scene: "WXSceneSession",
-								type: 5,
-								miniProgram: {
-									id: '123',
-									path: '/pages/list/detail',
-									webUrl: '/#/pages/list/detail',
-									type: 0
-								},
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/weibo.png",
-							"text": "微博",
-							"share": {
-								"provider": "sinaweibo"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/qq.png",
-							"text": "QQ",
-							"share": {
-								"provider": "qq"
-							}
-						},
-						{
-							"img": "/static/app-plus/sharemenu/copyurl.png",
-							"text": "复制",
-							"share": "copyurl"
-						},
-						{
-							"img": "/static/app-plus/sharemenu/more.png",
-							"text": "更多",
-							"share": "shareSystem"
-						}
-					],
-					cancelText: "取消分享",
-				}, e => { //callback
-					console.log(e);
+		onBackPress({from}) {
+			console.log(from);
+			if(from=='backbutton'){
+				this.$nextTick(function(){
+					uniShare.hide()
 				})
+				return uniShare.isShow;
 			}
-		}
-	}
+		},
+		methods: {
+			uniShare() {
+				uniShare.show({
+					content: { //公共的分享参数配置  类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图）
+						type: 0,
+						href: 'https://uniapp.dcloud.io/',
+						title: '标题',
+						summary: '描述',
+						imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png'
+					},
+					menus: [{
+							"img": "/static/app-plus/sharemenu/wechatfriend.png",
+							"text": "微信好友",
+							"share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5
+								"provider": "weixin",
+								"scene": "WXSceneSession"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/wechatmoments.png",
+							"text": "微信朋友圈",
+							"share": {
+								"provider": "weixin",
+								"scene": "WXSceneTimeline"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/mp_weixin.png",
+							"text": "微信小程序",
+							"share": {
+								provider: "weixin",
+								scene: "WXSceneSession",
+								type: 5,
+								miniProgram: {
+									id: '123',
+									path: '/pages/list/detail',
+									webUrl: '/#/pages/list/detail',
+									type: 0
+								},
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/weibo.png",
+							"text": "微博",
+							"share": {
+								"provider": "sinaweibo"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/qq.png",
+							"text": "QQ",
+							"share": {
+								"provider": "qq"
+							}
+						},
+						{
+							"img": "/static/app-plus/sharemenu/copyurl.png",
+							"text": "复制",
+							"share": "copyurl"
+						},
+						{
+							"img": "/static/app-plus/sharemenu/more.png",
+							"text": "更多",
+							"share": "shareSystem"
+						}
+					],
+					cancelText: "取消分享",
+				}, e => { //callback
+					console.log(uniShare.isShow);
+					console.log(e);
+				})
+			}
+		}
+	}
 </script>
 
 ```
\ No newline at end of file
-- 
GitLab