From 8f0945e8d61a4a89a70d263712a0b5153d03f481 Mon Sep 17 00:00:00 2001
From: linju <8432241+linjuDcloud@user.noreply.gitee.com>
Date: Fri, 16 Apr 2021 23:35:27 +0800
Subject: [PATCH] 23

---
 App.vue                                       |  10 +-
 common/appInit.js                             |   6 +-
 manifest.json                                 |   3 +
 pages.json                                    |  28 +--
 pages/test/test.vue                           | 129 ++++++++------
 static/sharemenu/copyurl.png                  | Bin 0 -> 920 bytes
 static/sharemenu/more.png                     | Bin 0 -> 1538 bytes
 static/sharemenu/qq.png                       | Bin 0 -> 1605 bytes
 static/sharemenu/wechatfriend.png             | Bin 0 -> 2024 bytes
 static/sharemenu/wechatmoments.png            | Bin 0 -> 1758 bytes
 static/sharemenu/weibo.png                    | Bin 0 -> 2274 bytes
 uni_modules/uni-image-menu/changelog.md       |   0
 .../uni-image-menu/js_sdk/uni-image-menu.js   | 167 ++++++++++++++++++
 uni_modules/uni-image-menu/package.json       |  76 ++++++++
 uni_modules/uni-image-menu/readme.md          |   1 +
 .../uni-login-page/common/loginPage.mixin.js  |   5 +-
 .../pages/index/{index.nvue => index.vue}     |   8 +-
 .../uni-login-page/pages/index/pwd-login.vue  |   3 +-
 .../uni-quick-login/uni-quick-login.vue       |   3 +-
 uni_modules/uni-share/changelog.md            |   0
 uni_modules/uni-share/js_sdk/main.js          |  89 ++++++++++
 uni_modules/uni-share/package.json            |  76 ++++++++
 uni_modules/uni-share/readme.md               |   1 +
 .../utils/check-update.js                     |   4 +-
 24 files changed, 517 insertions(+), 92 deletions(-)
 create mode 100644 static/sharemenu/copyurl.png
 create mode 100644 static/sharemenu/more.png
 create mode 100644 static/sharemenu/qq.png
 create mode 100644 static/sharemenu/wechatfriend.png
 create mode 100644 static/sharemenu/wechatmoments.png
 create mode 100644 static/sharemenu/weibo.png
 create mode 100644 uni_modules/uni-image-menu/changelog.md
 create mode 100644 uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
 create mode 100644 uni_modules/uni-image-menu/package.json
 create mode 100644 uni_modules/uni-image-menu/readme.md
 rename uni_modules/uni-login-page/pages/index/{index.nvue => index.vue} (91%)
 create mode 100644 uni_modules/uni-share/changelog.md
 create mode 100644 uni_modules/uni-share/js_sdk/main.js
 create mode 100644 uni_modules/uni-share/package.json
 create mode 100644 uni_modules/uni-share/readme.md

diff --git a/App.vue b/App.vue
index 7f8aa297..9d303567 100644
--- a/App.vue
+++ b/App.vue
@@ -12,19 +12,13 @@
 			uni.preloadPage({
 				url: "/pages/ucenter/settings/settings",
 				complete:e=>{
-					console.log(e);
-				}
-			});
-			uni.preloadPage({
-				url: "uni_modules/uni-login-page/pages/index/index",
-				complete:e=>{
-					console.log(e);
+					// console.log(e);
 				}
 			});
 			// #ifdef APP-PLUS
 			//预加载一键登录
 				plus.oauth.getServices(oauthServices=>{
-					console.log(oauthServices);
+					// console.log(oauthServices);
 					oauthServices.forEach(({_id},item)=>{
 						if(_id=='provider'){
 							uni.preLogin({
diff --git a/common/appInit.js b/common/appInit.js
index fdcfeb54..9889ad31 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -33,9 +33,9 @@ export default function() {
 	list.forEach(item=>{
 		uni.addInterceptor(item,{
 			invoke(e){// 调用前拦截
-				console.log(e);
+				//console.log(e);
 				const token = uni.getStorageSync('uni_id_token')
-				console.log(token);
+				// console.log(token);
 				const url = e.url.split('?')[0]
 				//拦截强制登陆页面
 				if (needLogin.includes(url) && token == '') {
@@ -68,7 +68,7 @@ export default function() {
 				
 			},
 			complete(e){	// 完成回调拦截 
-				console.log(e);
+				//console.log(e);
 			},
 			returnValue(){// 返回结果拦截 
 				
diff --git a/manifest.json b/manifest.json
index 9ff5fc4c..f775f81e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,6 +7,9 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
+		}, 
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
diff --git a/pages.json b/pages.json
index ddcc79b4..48609cb9 100644
--- a/pages.json
+++ b/pages.json
@@ -215,20 +215,20 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},
-	"condition": {
-		"list": [
-			{
-				"path": "uni_modules/uni-login-page/pages/index/index"
-			},
-			{
-				"path": "pages/test/test"
-			},
-			{
-				"path":"pages/ucenter/settings/settings"
-			}
-		],
-		"current":2
-	},
+	// "condition": {
+	// 	"list": [
+	// 		{
+	// 			"path": "uni_modules/uni-login-page/pages/index/index"
+	// 		},
+	// 		{
+	// 			"path": "pages/test/test"
+	// 		},
+	// 		{
+	// 			"path":"pages/ucenter/settings/settings"
+	// 		}
+	// 	],
+	// 	"current":1
+	// },
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#007AFF",
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 1c253787..22f4e106 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -8,77 +8,92 @@
 		<text>应用相关权限</text>
 		<button type="default" @click="openAppPermissionSetting">打开</button>
 		<button type="default" @click="iosSetting">iosSetting</button> -->
-		<button type="default" @click="openCamera">打开相机</button>
-		<button type="default" @click="openGridPage">打开一个需要登陆的页面</button>
+		<!-- <button type="default" @click="openCamera">打开相机</button> -->
+		<!-- <button type="default" @click="openGridPage">打开一个需要登陆的页面</button> -->
+		<button type="default" @click="showShare">打开分享</button>
+		<!-- <uni-bottom-menu ref="bottomMenu" @clickItem="clickItem" :list="menus"></uni-bottom-menu> -->
 	</view>
 </template>
 
 <script>
-	import permision from '@/js_sdk/wa-permission/permission.js';
+	// import permision from '@/js_sdk/wa-permission/permission.js';
+	import uniShare from 'uni_modules/uni-share/js_sdk/main.js';
 	export default {
 		data() {
 			return {
-
 			}
 		},
 		onLoad() {
-			uni.addInterceptor('showToast',{
-				invoke(e){// 调用前拦截 
-					console.log(e)
-					e.title = "645"
-				},
-				success(e){// 成功回调拦截 
-					console.log(e)
-				},
-				fail(e){// 失败回调拦截 
-					console.log(e)
-				},
-				complete(e){
-					console.log(e)
-				},
-				returnValue(e){// 返回结果拦截 
-					console.log(e)
-				}
-			})
+			/*
 			
-			return 
-			/*
-				当某个权限调用失败
-				1.先检测手机的该模块是否打开
-				2.检测当前应用是否被授权了该模块对应的权限
-				提示，并点击跳转到设置
-			*/
-			this.changeAction('chooseImage', {
-				after_action: e => {
-					console.log('changeAction', e);
-					if(e.errCode === 11){
-						uni.showModal({
-							content: '无权限',
-							confirmText:"前往设置",
-							success(e) {
-								if(e.confirm){
-									permision.gotoAppPermissionSetting()
-								}
-							}
-						});
-					}
-				}
-			})
+			// uni.addInterceptor('showToast',{
+			// 	invoke(e){// 调用前拦截 
+			// 		console.log(e)
+			// 		e.title = "645"
+			// 	},
+			// 	success(e){// 成功回调拦截 
+			// 		console.log(e)
+			// 	},
+			// 	fail(e){// 失败回调拦截 
+			// 		console.log(e)
+			// 	},
+			// 	complete(e){
+			// 		console.log(e)
+			// 	},
+			// 	returnValue(e){// 返回结果拦截 
+			// 		console.log(e)
+			// 	}
+			// })
 			
-			this.changeAction(["navigateTo", "redirectTo", "reLaunch", "switchTab"], {
-				before_action: e => {
-					let needLoginUrls = ['/pages/grid/grid']//需要登陆的页面
-					let token = uni.getStorageSync('uni-id-token')
-					if (needLoginUrls.includes(e.url) && token == '') {
-						console.log('该页面需要登陆，即将跳转到login页面');
-						uni.showToast({title:'该页面需要登陆，即将跳转到login页面',icon:'none'})
-						return false
-					}
-					return true
-				}
-			})
+			// return 
+			// 
+			// 	当某个权限调用失败
+			// 	1.先检测手机的该模块是否打开
+			// 	2.检测当前应用是否被授权了该模块对应的权限
+			// 	提示，并点击跳转到设置
+			// 
+			// this.changeAction('chooseImage', {
+			// 	after_action: e => {
+			// 		console.log('changeAction', e);
+			// 		if(e.errCode === 11){
+			// 			uni.showModal({
+			// 				content: '无权限',
+			// 				confirmText:"前往设置",
+			// 				success(e) {
+			// 					if(e.confirm){
+			// 						permision.gotoAppPermissionSetting()
+			// 					}
+			// 				}
+			// 			});
+			// 		}
+			// 	}
+			// })
+			
+			// this.changeAction(["navigateTo", "redirectTo", "reLaunch", "switchTab"], {
+			// 	before_action: e => {
+			// 		let needLoginUrls = ['/pages/grid/grid']//需要登陆的页面
+			// 		let token = uni.getStorageSync('uni-id-token')
+			// 		if (needLoginUrls.includes(e.url) && token == '') {
+			// 			console.log('该页面需要登陆，即将跳转到login页面');
+			// 			uni.showToast({title:'该页面需要登陆，即将跳转到login页面',icon:'none'})
+			// 			return false
+			// 		}
+			// 		return true
+			// 	}
+			// })
+			
+			*/
 		},
 		methods: {
+			showShare(){
+				uniShare()
+			},
+			clickItem(e){
+				console.log(e);
+				uni.showToast({
+					title: e
+				});
+			},
 			openCamera(){
 				uni.chooseImage({
 					sourceType: ["camera"],
diff --git a/static/sharemenu/copyurl.png b/static/sharemenu/copyurl.png
new file mode 100644
index 0000000000000000000000000000000000000000..270e6aee210a59d179d67ac3e44d169d030a8721
GIT binary patch
literal 920
zcmeAS@N?(olHy`uVBq!ia0vp^c_7Te3?x6cUOUOaz^E4B6XNQ6=HkF2pnE8Bz@}Gk
zp8xpy_Sf%|A3k0F{N?_)?+4#~2)S_e>gTVwzJ6Qr{MG)q?;m~t@#o*aWzS!B-+xqg
z^X}CzU%k&=>U;3`_rHJTx9<M`|NrRwk6-@$S^oTG%GH}mS8jw}xO(W_htGfh{QLjk
z4IDo8)AQSb4s|FA@(cbY(<jZQR&-N5=4bSoPhY2$m5N;07NJ=sdE0O5x6D5Q{sre)
z(>}APPW}?eP%ZVY_k7_$;nO?9fAqh7qqY5p*hk}xKrdkEKlF5Q49U3n_Eu!LW1z&b
zkFlCsT1yx;4||p_^0D+XIlp*IW=j2k{fW<<A}oJzjN1F(+WdKW@wC)R`DJ0#BQIWh
zy>dy$>Xa<owQEzd<j(D@?{R$;xG?%+h03*t*%7nEt;|ite>KkDs^#R=bv3@9`&Y}7
zY1gxM&RjELno;aoRvV|Jc?Zh#ygc$=X+QsR;+f4k|2!YTOTowPS?-Tz*!26p#p(u=
zPp4W%c$T-s?MP%i_4UlnI~wP5R~N)Fo{oNa#zJr1CLfXGuFhu^8+eU)PiE@$K5@IL
zGHG^-m`ZvglT@MXBQDjr+b7rR^j%+D!TYr0AJ?hEy5P2=KZ@*6e>}CF@_2T6K%ae_
zgXKK?_M$oSr!JJSKezRCuFSr&D_qC<zukUfcduod#lF?T;W@pJj|jTU6e1CSn{H>W
z%YA)<@!!Ya@-fYR-xtJOzCO|7(LbB=%~wUVMPF!K=FDTL){AkKcRsj0?t`Lq)w1{L
zYHv6gEjJn@v#ZqpsO)*=RJhL1XZC@^x>w&jXYBhPIZNuysp~p>=gtyY#6J0j<%(5)
zr)75QDJ<XfZEKZt>fs$z)*F9c^srsB%zyho<2Mi2u_+fvA6fJK#2uN9rgyf48(D5?
nF}(AP-$~3&&7^(hvxojwds$A2CHpo46Apu?tDnm{r-UW|->C5L

literal 0
HcmV?d00001

diff --git a/static/sharemenu/more.png b/static/sharemenu/more.png
new file mode 100644
index 0000000000000000000000000000000000000000..bca03ce8015e5317bad3c5fd6cf7d566d6cacea6
GIT binary patch
literal 1538
zcmd^;|3A|S9LFb#n{s%NzPQ$xOQDG5%eeAog-7z(i57949v<n0u%>k7Dh^9RJzRv@
z*svzVw2$vg`(m-#42uo>(kjDl=H}aNbNb;P_eb38@p`}BzrNqk$K!>DhX!r~?*fBB
zpl!iHu&|At{B=wWH*(?kF%}54$qgP7etP}?tqmF*0CZZdOePx}9hFL@R4P@c*DozC
zG3fN+;o;VnmWuN7T0Fj|r$;0bVXLYz7>r7#Vlo(fKA(Wc*VWcGH8$4Za2@UKGO6^F
zT&`BDM@B~anas-aa$<e`;Nak!wl*9VTaCkMG#U<@-PzH>WHMJ)R>sE0x;i`i`}@1Q
zx>zjM>gwwJ+}x5zBNmI>0f0`YOC*xzm6ZjRN~hCtIGp9>Wg?MSSy7=>Dy0$$iA4H(
zO=TsWM&t2#0)gOlbMp{~BNPhpH8or=x2~@4gFw(mCNC~7ZoFAvS2r{?gvDSQNF)FN
zUJ{9zii-C3cK-12^z^iFVnU%%)Kpgk6bg+-n^7nxCnvR9?cCg)czRl|*R$E|w^ZuH
z`1smWSpEh$#LckK^O?PpMXwzhazOc!)rgLD|CVB&rvG9$HUHRAhVn?zY)dXyo81r_
zT>i_`Z3%j7yYP<mwoP~RpGO7hF+EPI!b@HDvu)&0d2<fV3q_v?um36{y`Kb~h*M>K
z0D%ncf?<B)*QVxQ%pmx_R`fu+wGGXhX1#ec0lwYO7d)~boREKick)FWE78H&CR3BV
zT_=cp9iWYeEiK53Q-`?Za{*uWkr%bD%a@cHWtTY>k!hUH`fyymYrq2nEzx1=tQ`_f
zpqlskc|p~gM?#K$lHIreP4L7A0?h3{Zq{sx96t1x@cpcd!OXLp2|!Y0X;GTYPI^UC
zT3XGw0!rD%rPy?3;X+@M=n*<W2laA7n%Xr4Wf@b(ve5%ppZjLQT<(XVES+{{9qvP)
z^>`~D%Py3q9V_Z%q-5~mK!jspss-Gw>u#hyI0l^aj$uxY^R`V!`9wW7u+Hz>o0`w{
z52`Sl&!QRCz=EQ;M1j!!8tWq9N_a@BRp5U<PeY-I6HhF1|4<VpQ12-U<y7MJh_&T4
z<<{{R#wF=|KB8b=)2paO&#utGKF-J541Y?Wd{y|6YTC!1MRaQiPK<KYk{Pir+ve}c
z)bIv4%FiA3c^4;&naF!Tda}4=xm$)$TWAmPPR2g6Ik+I*Nx4T+TOAlba%;U<c*A?%
zK7Kuc(T1^tQ2-3ZskiWTN74mPNsHrD3MNf5Z1@V8N?<IW9Ee69&2?^RGGE1jS&*x8
zxfb!t)7yFXg^zk$<ix2x13A`Z&k=a_8BED@$alQF>*9}|J+-V~AhGgyu2K)8_KiTW
zFzx6jjarLH&4r<&2~~g$5`GA&YK=g-CS`_RbtZL$L%%s%!gBZbC@T=Ru_HA}nFmsY
zBIZ5@Y0s6(CLNS^*OoVAV#|}+a7{bAdy@JJ)U87IIPZpZgG$OeX35B{R-Kk4m^INM
zaGsB9{&l&786e**f*U5=Z1M<raH*SGkSKQlA<iT=(+6B>oO?XS*Ek3(bD>Hg&DZ$R
z@nqsnv#n0S@6m)fKW^ChXk4df9yi834xe&iV%;?4>60vF1kI0?6BB>+B`hPps9L^-
zXjBsaZ1n~Y!aZmCZmQK@?2?H5@l9b-#_g8WTjGnWjBNj^vUEhY9$RH`=iZrS0u{cU
cV5@_8&5Cj(m^-#?loAwtIuzFE|MSCt04w9j5C8xG

literal 0
HcmV?d00001

diff --git a/static/sharemenu/qq.png b/static/sharemenu/qq.png
new file mode 100644
index 0000000000000000000000000000000000000000..28e745655ba66f66917144ff8ef4f4eb39395a15
GIT binary patch
literal 1605
zcmdT@`8(7J93I4?R5DbwijvK`71?z(t{h<;C5#*y#}<Z=V~1RsRFor2XtxNpv`aCr
z7}m`oH)9Mlt}qx!e9yIi#y-#ce%@c-_jy0>BfQO3F;Qtz3<e`+VQyl-uYvzjSYZEd
zB#m@pF#HzyYmTN$Rlxrj`&s;ZK=wA$xC95&A+siM6GSa&pk6&t#)kX2$TtXWT0)9v
z;MhTk2cWN*aQh0f2B0lpk>y=<f`?>J!dDu=aUK#m0NJ&Ge@w&1jo=1=t^?@rOn4hY
zd$~wC8y?v}9u7kYivCyy?80bh9|R)k`&oEu6H%iAbS|<3p&#d9#wKFc2nO~-tS!X7
z1JtPnR`*aCL96EB)G>&;g*1Id%$q=+I$&iN1z_~?D0I0F@aP0h8o_t7uuB^lKLq{y
z1uA60DWg!u9J~jk18Ybw1OB>;)-J&5;}ClXsau3ICZKE0pk@u=(he$D14HY`zPZJ3
zh<`VDwFwNOLmE^dZU{=BfV64=m1^L6D>%BbZy)`<1mEd_)Tw}B1JJdKyq<=6AW9j5
z#&}4>BCK5t-0A=$1|WP3*tUX%_d^9tICBEx>>x3NkaaT{)(`D}3v~e|c7dPf;iqE|
zp&d*dhH#(3?h>c_`+ZyqwYPBqPNm8S*_{s=KTg<l?cr@_hKFJMt8QM1Iyq^Rwc`)r
zZAo-NpUndb8C%iP+^2oPh(tHlX*X?kLuzbAsTz}ey_64w5x8Svf^+m^u1+jCNZ?Kg
ztvlG^#N=`K6r8a5B|oEsrW7$dlh$}i$x?YQ#dxgMAqw{A*2Aj&QYHr``ITaGj%Ud|
z3yH2=Q$5YuBWdlCz?Z#@0B%K^M_yjy3F8nig7RC-y9BQax%0F@lILu@xm%`eg6Zj^
z$DuS8w@Og~-x<p?iNK_4AuURq>ni2ok=7>_+MNZivS~S{5_&lY9Xub}C0TP`c(ytF
zbPJZ;y!Y-wFx@sG=PFyLt(2^uyjy|>Gk>#^g6BR;8|0aR$(zl2$Nc6parM+QMIA{V
zfg<9%f`+PHKb%|K3yvydJ=XP!^I&zJO!O{bc+p-dE~rKDIC_FTmj)RZ+n?Nt3H4os
zT@&%Q$@z19x4CT|XDfQM!KoE$c96>e$8q$A=B!fJ^EV&ee4DqO<k~f0ucqsn^2L#d
z>29?wg7Gl9pK+3-H0SmgBa-uz6RsvX;243eWloPT)Wme=XK|wVY7Se7Wno)_)e3b(
z#Z#9RSTRk(#llp1_40<42g`hHQIU&|c)r%*=cE!5N_UXlEYHl7I!aL%P-h6sISI88
zB|@e>sdAcS+tR|>la`n3(l7)>!zB05vs(;LlY;0W#?R*z$(aN+z?q=^{b)hLQO?$Z
z2cO2Z^Boy{HF^Gqf}?TX?M5_W*Mh18NuO6k#xid05kv%i)BEH^=}`bz(|*yfAY#md
zMtrm|ns+vzoocgzx22JdN~GAU-Yyf#L9;2@7Bu~UJtf&A&#i;rhv^4d6`_|tC=8^!
z#;(Mq^6TkgGZ?WoBsD@-agqBPk8gUd*2bKi<;r6AI>?0B7y8_<D3PH|5-dZBZ|}y>
zd=UxStoJ+`cw|XQo4<KGJ>(UR`qDpKp!!hmhcW#(L~IKo2bNJZsG2VGuSOJ|#=P%|
z<y1*(CrsU+`fgB58+$WZg-ndmGvH=yzYwY%uU{S^DG1f~7Jm~*q5}=4SDVA?b&Pd`
zwnLa5^R?E7w(BfcBbM{u_;r<MJ#+498bZ8T{^HjY|I|>4j>)`!qxN6?+twp?au@PS
z-(h*G*LdX#(obp1-Q|^$HzLXDrzEqcUZ^|M<8RdImU{N(inzDz<j%bIE+4vZ#%f+P
w{|m9$?Md<nxe5JvUL2l6O4Htr8WTfg$g<&g>8EqK`xC}knA(_>8+pY43$IL@vH$=8

literal 0
HcmV?d00001

diff --git a/static/sharemenu/wechatfriend.png b/static/sharemenu/wechatfriend.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6af3472fe40c35b6a31e2ceb4a0d64a4f1db3db
GIT binary patch
literal 2024
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
YoKL7YX6RVB`D74h2bg`mZScLn0aHIo8~^|S

literal 0
HcmV?d00001

diff --git a/static/sharemenu/wechatmoments.png b/static/sharemenu/wechatmoments.png
new file mode 100644
index 0000000000000000000000000000000000000000..6445df06def179c84852804a4701a5b29efd6e9b
GIT binary patch
literal 1758
zcmdT^>oXgO9!>9BtQA+ORgc#8-mN~p^`>diP!yGj&|!&cOFd$hBwM$dZHsMnU9Z+F
zMXGAISj{Sxl6bT%HB}@LA)-Q(%EKcOi4u{=wV&@_aA(f>otg9D%$fPkoB{;=JkZ3}
z1ONa4gM<8$yL$aE8h^2S*Y8h{004grMTABMxYEG?FW7DVzg0;qZOzN1i)>UJC-KT`
zN(T1^o|pUYh1=-4%&di<v^wp!cDqJg*SOr$u+;c&{XJFI+qc#~q8M|dogqr<!3@7s
zbRSQ;_ii$j8GM@I>opMoo4V-B3=WutNz_ZZ{0AG_&$oF$%Qfq(JJK8T`0RzdJQaU-
zbB?BDFgIB4bjZILXU{T&Jm_8^2K3xyXykM(Vk#=-W5&lVZZtc7LB+q!Nk+{itf*HP
zws_)gNxPKnGZA=(;fI`#@nePrPQoih)enW0MT?J?)hpAV*$RzPv@I5>KJDmswzOMo
zJ8MdfQm@ymb?VZ^3Y}ipv-YNGxur|iJ-9xc!Oe<dUrL+9#?D+#{&-!bRmpec{qjHG
zD?SXZ505EnWkN!}piryVR*7osB)@jA^>xaq7g!NtQ&AAcxmVKH=O@E%F5LNvm&aEL
zwsq<y_42w#G4+`}u`xNK7#&yA(Q}xXnJZ1pFJ7*8;CVSgEQJ4LC}KLgQdILuSXC{4
z@@(n3I}MT}@?YG267)wTJVI?>VrLlch~-$LwqwT>pDVI%>|=CBAG>Aq5nj2OszHQh
z(!NYm8sKeZ#dM6$a+DIKDwVEplmot*Sv}r$_`}oD1OUKbPq4plWXimBb~_drzTZgh
zTZL$@c)m}FtjKf%{l~)M75Q`=r{U-YjtM8VqZf5}-?M<A;P+LpGzl`#t!`Wr?TO3-
zM_VGic{{Eg!}-v0PqRgJ+4QKkqn2Gm#5ObsnRxU9;g1kkmx2f<XC9%jAtAy1_0UkD
z3zOIA5}kWAnfW0IH0O2J@~U}xyg@;%Wy$_)S9)t|`|RBckA;qm0|QJg&sd9-4h>fy
z7ANJu68R-}Q@*vldNAT)d7&}X-ol*E)0h)NA5nrV9ccT&{jfly#YwF0P%p*&E(BzR
z8MTLq2TKcI8)Muwl*d7b%rRsB17qbLUw`FA{rykVx;fJU!V&R_Z(D6d`Hwp`Z~yVq
zMLL>D*WSi{x>5=JEs{OoJ6wim#~9vJ?ER25d~GwQW`%<(*%PJFo*d}FeR=ssUtsMD
z>0XmTM$Q)!op0p{v^CrDrkPp2cE7iC4<ZI7)r#xo$DLYLZMYkiVnKbP%Yo~38@3`O
zY<S=i*ONlBR>X&Gki7lPvXa7iXnFG9Emt#U5ib6RdOn{hZ4Z}8jf8~;%1pBscOcdV
z5L1_D`La0kEa>OPCLWqujJXT&^d{Ox+7<0gh0wIWmOa2UR3%^Q%x=SD;VeZ2WJY?C
z<n0b;@~C%cEjlX@AB5VbgFPkPq}mrz-v6{BM1rg?+xDk&QH4e|LsU-*d)!+Nwc~Ym
zd(O1hzK}yL!Bj)5ZtA&%DOqsV8KP~)lE~JJf!NbJ5XU7VPdIYPd)f8hgV^`enoPKJ
zN7%f&>oT*}N<w!1fG-zys+F2;k_mK{h<rZTR!5|?!9ZI;_Af-_<h(;FmP!c}MB4ti
zEV_k(EtZ%y`o7fZd$t}sVxPlI-;R5@!WPTYVXG9MaD0R_{($3P4&ly7oN0P72@4Z^
zm+^IWp<%HhNa{X5kb3Lb@M)@O(X%&f*AUlyMU16)(j?Z1e-xDWE*y8BkQ=duXp8fk
zA?`q&WFp<-yuyt5+j{yXLWqEM34P$n$e=FCqG{s?Dp_>g4jF7O<IX}e&=pLWVDXYL
zwZ@~JSo$4JX!WKMk_W-`<@SSn^L247adlt%I2x`f@vwO+A~%DZL$89>@Yy3>v@W5Q
zTOC=C(z{Cq9m7#+JD^RVL#!#T$US!r!$;3Qct$L}1$Icpc{e(^+*CRpl9QrUa;Jwy
z!uZm51EnDELBs42m2$1XSp4ihBrUb-)F>zIO+tPP@_mo%NRJu1{a*XYo)XdbLf|h)
ztSb8&-LjwDAKSu43?4jHb_a-87#EjO?~?yMUPcWgzfEf59$bSe1(<L{&^<pE<(&wc
cF(uFgv}7;VyJi#e?yvxY1K|FxewXw93q9MQLjV8(

literal 0
HcmV?d00001

diff --git a/static/sharemenu/weibo.png b/static/sharemenu/weibo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8affa79cb02b8a2cf880e3df2017c136767f12c7
GIT binary patch
literal 2274
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
D?n@74

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-image-menu/changelog.md b/uni_modules/uni-image-menu/changelog.md
new file mode 100644
index 00000000..e69de29b
diff --git a/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js b/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
new file mode 100644
index 00000000..82a07ad3
--- /dev/null
+++ b/uni_modules/uni-image-menu/js_sdk/uni-image-menu.js
@@ -0,0 +1,167 @@
+var nvMask,nvImageMenu;
+export default {
+	show(list,callback){
+		
+		if(!list){
+			list = [{
+				"img":"/static/sharemenu/wechatfriend.png",
+				"text":"图标文字"
+			}]
+		}
+		
+		//以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
+		var screenWidth = plus.screen.resolutionWidth
+		//以360px宽度屏幕为例，上下左右边距及2排按钮边距留25像素，图标宽度55像素，同行图标间的间距在360宽的屏幕是30px，但需要动态计算，以此原则计算4列图标分别的left位置
+		//图标下的按钮文字距离图标5像素，文字大小12像素
+		//底部取消按钮高度固定为44px
+		//TODO 未处理横屏和pad，这些情况6个图标应该一排即可
+		var margin = 25,
+			iconWidth = 55,
+			icontextSpace = 5,
+			textHeight = 12
+		var left1 = margin / 360 * screenWidth
+		var iconSpace = (screenWidth - (left1 * 2) - (iconWidth * 4)) / 3 //屏幕宽度减去左右留白间距，再减去4个图标的宽度，就是3个同行图标的间距
+		if (iconSpace <= 5) { //屏幕过窄时，缩小边距和图标大小，再算一次
+			margin = 15
+			iconWidth = 40
+			left1 = margin / 360 * screenWidth
+			iconSpace = (screenWidth - (left1 * 2) - (iconWidth * 4)) / 3 //屏幕宽度减去左右留白间距，再减去4个图标的宽度，就是3个同行图标的间距
+		}
+		var left2 = left1 + iconWidth + iconSpace
+		var left3 = left1 + (iconWidth + iconSpace) * 2
+		var left4 = left1 + (iconWidth + iconSpace) * 3
+		var top1 = left1
+		var top2 = top1 + iconWidth + icontextSpace + textHeight + left1
+		nvMask = new plus.nativeObj.View("nvMask", { //先创建遮罩层
+			top: '0px',
+			left: '0px',
+			height: '100%',
+			width: '100%',
+			backgroundColor: 'rgba(0,0,0,0.2)'
+		});
+		nvMask.addEventListener("click", function() { //处理遮罩层点击
+			nvMask.hide();
+			nvImageMenu.hide();
+		})
+		nvImageMenu = new plus.nativeObj.View("nvImageMenu", { //创建底部图标菜单
+			bottom: '0px',
+			left: '0px',
+			height: (iconWidth + textHeight + 2 * margin)*(parseInt(list.length/4)+1) +44+'px',//'264px',
+			width: '100%',
+			backgroundColor: 'rgb(255,255,255)'
+		});
+		
+		let myList = []
+		list.forEach((item,i)=>{
+			myList.push({
+				tag: 'img',
+				src: item.img,
+				position: {
+					top: eval('top'+( parseInt(i/4) +1)),
+					left: eval('left'+(1+i%4)),
+					width: iconWidth,
+					height: iconWidth
+				}
+			})
+			myList.push({
+				tag: 'font',
+				text: item.text,
+				textStyles: {
+					size: textHeight
+				},
+				position: {
+					top: eval('top'+(parseInt(i/4)+1)) + iconWidth + icontextSpace,
+					left: eval('left'+(1+i%4)),
+					width: iconWidth,
+					height: textHeight
+				}
+			})
+		})
+		
+		//绘制底部图标菜单的内容
+		nvImageMenu.draw([
+			{
+				tag: 'rect',//菜单顶部的分割灰线
+				color: '#e7e7e7',
+				position: {
+					top: '0px',
+					height: '1px'
+				}
+			},
+			{
+				tag: 'font',
+				id: 'sharecancel',//底部取消按钮的文字
+				text: '取消分享',
+				textStyles: {
+					size: '14px'
+				},
+				position: {
+					bottom: '0px',
+					height: '44px'
+				}
+			},
+			{
+				tag: 'rect',//底部取消按钮的顶部边线
+				color: '#e7e7e7',
+				position: {
+					bottom: '45px',
+					height: '1px'
+				}
+			},
+			...myList
+		])
+		nvMask.show()
+		nvImageMenu.show() //5+应支持从底部向上弹出的动画
+		
+		
+		
+		nvImageMenu.addEventListener("click",e=>{ //处理底部图标菜单的点击事件，根据点击位置触发不同的逻辑
+			// console.log("click menu"+JSON.stringify(e));
+			if (e.screenY > plus.screen.resolutionHeight - 44) { //点击了底部取消按钮
+				nvMask.hide();
+				nvImageMenu.hide();
+			} else if (e.clientX < 5 || e.clientX > screenWidth - 5 || e.clientY < 5) {
+				//屏幕左右边缘5像素及菜单顶部5像素不处理点击
+			} else { //点击了图标按钮
+				var iClickIndex = -1 //点击的图标按钮序号，第一个图标按钮的index为0
+				var iRow = e.clientY < (top2 - (left1 / 2)) ? 0 : 1
+				var iCol = -1
+				if (e.clientX < (left2 - (iconSpace / 2))) {
+					iCol = 0
+				} else if (e.clientX < (left3 - (iconSpace / 2))) {
+					iCol = 1
+				} else if (e.clientX < (left4 - (iconSpace / 2))) {
+					iCol = 2
+				} else {
+					iCol = 3
+				}
+				if (iRow == 0) {
+					iClickIndex = iCol
+				} else {
+					iClickIndex = iCol + 4
+				}
+				// console.log("点击按钮的序号: " + iClickIndex);
+				if (iClickIndex >= 0 && iClickIndex <= 5) { //处理具体的点击逻辑，此处也可以自行定义逻辑。如果增减了按钮，此处也需要跟着修改
+					callback(iClickIndex)
+				}
+			}
+		})
+		/* nvImageMenu.addEventListener("touchstart", function(e) {
+			if (e.screenY > (plus.screen.resolutionHeight - 44)) {
+				//TODO 这里可以处理按下背景变灰的效果
+			}
+		})
+		nvImageMenu.addEventListener("touchmove", function(e) {
+			//TODO 这里可以处理按下背景变灰的效果
+			if (e.screenY > plus.screen.resolutionHeight - 44) {}
+		})
+		nvImageMenu.addEventListener("touchend", function(e) {
+			//TODO 这里可以处理释放背景恢复的效果
+		})
+		*/
+	},
+	hide(){
+		nvMask.hide()
+		nvImageMenu.hide()
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-image-menu/package.json b/uni_modules/uni-image-menu/package.json
new file mode 100644
index 00000000..5938aa93
--- /dev/null
+++ b/uni_modules/uni-image-menu/package.json
@@ -0,0 +1,76 @@
+{
+  "id": "uni-image-menu",
+  "displayName": "uni-image-menu",
+  "version": "1.0.0",
+  "description": "uni-image-menu",
+  "keywords": [
+    "uni-image-menu"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "JS SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-image-menu/readme.md b/uni_modules/uni-image-menu/readme.md
new file mode 100644
index 00000000..960d129c
--- /dev/null
+++ b/uni_modules/uni-image-menu/readme.md
@@ -0,0 +1 @@
+# uni-image-menu
\ No newline at end of file
diff --git a/uni_modules/uni-login-page/common/loginPage.mixin.js b/uni_modules/uni-login-page/common/loginPage.mixin.js
index 3dd8e485..c7382bd5 100644
--- a/uni_modules/uni-login-page/common/loginPage.mixin.js
+++ b/uni_modules/uni-login-page/common/loginPage.mixin.js
@@ -1,8 +1,5 @@
 const helpPage = '/pages/ucenter/help/help';	// 帮助页面
-import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
+import {mapMutations} from 'vuex';
 let mixin = {
 	// // 监听帮助按钮
 	// onNavigationBarButtonTap(event) {
diff --git a/uni_modules/uni-login-page/pages/index/index.nvue b/uni_modules/uni-login-page/pages/index/index.vue
similarity index 91%
rename from uni_modules/uni-login-page/pages/index/index.nvue
rename to uni_modules/uni-login-page/pages/index/index.vue
index 727e7285..fef3ef5f 100644
--- a/uni_modules/uni-login-page/pages/index/index.nvue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -27,7 +27,7 @@
 				<text class="tip-text">未注册的手机号验证通过后将自动注册</text>
 
 				<!-- 其他登录方式 -->
-				<view class="auth-box">
+				<view class="auth-box" v-if="loginList.includes('password')">
 					<text class="login-text" hover-class="hover" @click="toPwdLogin">密码登录</text>
 					<!-- <text class="login-text" hover-class="hover" @click="openLoginList">其他登录方式</text> -->
 				</view>
@@ -40,7 +40,8 @@
 </template>
 
 <script>	
-var univerify_first,currentWebview;//是否一键登陆优先
+var univerify_first,currentWebview;//是否一键登陆优先
+import baseappConfig from '@/baseapp.config.json';
 	import mixin from '../../common/loginPage.mixin.js';
 	var currentPage;
 	export default {
@@ -49,9 +50,11 @@ var univerify_first,currentWebview;//是否一键登陆优先
 			return {
 				phoneArea: ['+86'],
 				currenPhoneArea: '+86',
+				loginList:[]
 			}
 		},
 		onLoad(e) {
+			this.loginList = baseappConfig.router.login
 			univerify_first = e.univerify_first
 			//#ifdef APP-PLUS
 			if(univerify_first){
@@ -64,6 +67,7 @@ var univerify_first,currentWebview;//是否一键登陆优先
 		onReady() {
 			//#ifdef APP-PLUS
 			if(univerify_first){
+				console.log('开始一键登陆');
 				this.$refs.uniQuickLogin.login('univerify')
 				setTimeout(() => {
 					currentWebview.setStyle({
diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.vue b/uni_modules/uni-login-page/pages/index/pwd-login.vue
index 4d236a0e..5c7b792a 100644
--- a/uni_modules/uni-login-page/pages/index/pwd-login.vue
+++ b/uni_modules/uni-login-page/pages/index/pwd-login.vue
@@ -30,7 +30,8 @@
 					<text class="login-text" @click="toRetrievePwd">找回密码</text>
 				</view>
 			</view>
-		</view>
+		</view>
+		<uni-quick-login ref="uniQuickLogin"></uni-quick-login>
 	</view>
 </template>
 
diff --git a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
index a7c102a6..8ce6233d 100644
--- a/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
+++ b/uni_modules/uni-quick-login/components/uni-quick-login/uni-quick-login.vue
@@ -58,10 +58,9 @@
 		mounted() {
 			//获取当前环境能用的快捷登陆方式
 			// #ifdef APP-PLUS
-				uni.showLoading();
 				plus.oauth.getServices(oauthServices=>{
 					this.oauthServices = oauthServices
-					console.log(oauthServices);
+					// console.log(oauthServices);
 				},err=>{
 					uni.hideLoading()
 					uni.showModal({
diff --git a/uni_modules/uni-share/changelog.md b/uni_modules/uni-share/changelog.md
new file mode 100644
index 00000000..e69de29b
diff --git a/uni_modules/uni-share/js_sdk/main.js b/uni_modules/uni-share/js_sdk/main.js
new file mode 100644
index 00000000..a21ed964
--- /dev/null
+++ b/uni_modules/uni-share/js_sdk/main.js
@@ -0,0 +1,89 @@
+import uniImageMenu from 'uni_modules/uni-image-menu/js_sdk/uni-image-menu.js';
+let old_menus = [{
+		"img": "/static/sharemenu/wechatfriend.png",
+		"text": "微信好友",
+		"share":{
+			"provider":"weixin",
+			"scene":"WXSceneSession"
+		}
+	},
+	{
+		"img": "/static/sharemenu/wechatmoments.png",
+		"text": "微信朋友圈",
+		"share":{
+			"provider":"weixin",
+			"scene":"WXSceneSession"
+		}
+	},
+	{
+		"img": "/static/sharemenu/weibo.png",
+		"text": "微博",
+		"share":{
+			"provider":"sinaweibo"
+		}
+	},
+	{
+		"img": "/static/sharemenu/qq.png",
+		"text": "QQ",
+		"share":{
+			"provider":"qq"
+		}
+	},
+	{
+		"img": "/static/sharemenu/copyurl.png",
+		"text": "复制",
+		"share":false
+	},
+	{
+		"img": "/static/sharemenu/more.png",
+		"text": "更多",
+		"share":"more"
+	}
+]
+let menus = []
+plus.oauth.getServices(services=>{	//只显示有服务的项目
+	let servicesList = services.map(e=>e.id)
+	console.log(servicesList);
+	old_menus.forEach(item=>{
+		console.log(item.share.provider);
+		if(servicesList.includes(item.share.provider)){
+			menus.push(item)
+		}
+	})
+	
+},err=>{
+	uni.showModal({
+		title: '获取服务供应商失败：' +JSON.stringify(err),
+		showCancel: false,
+		confirmText: '知道了'
+	});
+	console.error('获取服务供应商失败：' + JSON.stringify(err));
+})
+
+let shareContent = {
+	type: 0,
+	href: "https://uniapp.dcloud.io/api/plugins/share?id=share",
+	title: "主标题",
+	summary: "分享内容的摘要",
+	imageUrl: "https://uniapp.dcloud.io/api/plugins/share?id=share",
+}
+export default (callback) => {
+	uniImageMenu.show(menus,e=>{
+		console.log(e);
+		if(e<4){
+			uni.share({
+				...menus[e].share,
+				...shareContent,
+				success: function(res) {
+					console.log("success:" + JSON.stringify(res));
+				},
+				fail: function(err) {
+					console.log("fail:" + JSON.stringify(err));
+				},
+				complete() {
+					uniImageMenu.hide()
+				}
+			})
+		}
+	})
+}
diff --git a/uni_modules/uni-share/package.json b/uni_modules/uni-share/package.json
new file mode 100644
index 00000000..ad36fb88
--- /dev/null
+++ b/uni_modules/uni-share/package.json
@@ -0,0 +1,76 @@
+{
+  "id": "uni-share",
+  "displayName": "uni-share",
+  "version": "1.0.0",
+  "description": "uni-share",
+  "keywords": [
+    "uni-share"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "JS SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-share/readme.md b/uni_modules/uni-share/readme.md
new file mode 100644
index 00000000..574d27ef
--- /dev/null
+++ b/uni_modules/uni-share/readme.md
@@ -0,0 +1 @@
+# uni-share
\ No newline at end of file
diff --git a/uni_modules/uni-upgrade-center-app/utils/check-update.js b/uni_modules/uni-upgrade-center-app/utils/check-update.js
index 4fb4d42a..46f69f19 100644
--- a/uni_modules/uni-upgrade-center-app/utils/check-update.js
+++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js
@@ -3,7 +3,9 @@ import callCheckVersion from './call-check-version'
 // 推荐再App.vue中使用
 const PACKAGE_INFO_KEY = '__package_info__'
 
-export default function() {
+export default function() {
+	
+	return
 	// #ifdef APP-PLUS
 	callCheckVersion().then(async (e) => {
 		if (!e.result) return;
-- 
GitLab