From f763279a235f64ca497e43a6178fa58745885655 Mon Sep 17 00:00:00 2001
From: linju <8432241+linjuDcloud@user.noreply.gitee.com>
Date: Mon, 19 Apr 2021 21:36:33 +0800
Subject: [PATCH] 23

---
 baseapp.config.json => baseapp.config.js      |   5 +-
 common/appInit.js                             |  64 +--
 manifest.json                                 |   6 +-
 pages.json                                    |  43 +-
 pages/ucenter/about/about.vue                 |   2 +-
 .../{settings.nvue => settings--.nvue}        |  22 +-
 pages/ucenter/settings/settings.vue           | 368 ++++++++++--------
 store/modules/user.js                         |   1 +
 .../uni-list-item/uni-list-item.vue           |   2 +-
 .../uni-login-page/pages/index/index.vue      |  82 ++--
 .../pages/phone-code/phone-code.vue           |   7 +-
 .../pages/pwd-login/pwd-login.vue             |  10 +-
 .../static/login/img/smsCode.png              | Bin 0 -> 5688 bytes
 .../static/login/img/username.png             | Bin 0 -> 7010 bytes
 .../uni-quick-login/uni-quick-login.vue       | 145 ++++---
 15 files changed, 426 insertions(+), 331 deletions(-)
 rename baseapp.config.json => baseapp.config.js (69%)
 rename pages/ucenter/settings/{settings.nvue => settings--.nvue} (90%)
 create mode 100644 uni_modules/uni-login-page/static/login/img/smsCode.png
 create mode 100644 uni_modules/uni-login-page/static/login/img/username.png

diff --git a/baseapp.config.json b/baseapp.config.js
similarity index 69%
rename from baseapp.config.json
rename to baseapp.config.js
index 3f9d764..a8b719a 100644
--- a/baseapp.config.json
+++ b/baseapp.config.js
@@ -1,7 +1,8 @@
-{
+module.exports = {
 	"router":{
-		"needLogin":[
+		"needLogin":[	//配置需要路由拦截的页面地址，在打开这些页面之前会自动检查（不联网）uni_id_token的值是否存在/过期等
 			"/pages/ucenter/edit/edit",
+			"/pages/ucenter/settings/settings",
 			"/uni_modules/uni-login-page/pages/index/pwd-retrieve"
 		],
 		"login":["univerify","password","weixin","apple","code"]
diff --git a/common/appInit.js b/common/appInit.js
index 9889ad3..4dece03 100644
--- a/common/appInit.js
+++ b/common/appInit.js
@@ -1,12 +1,12 @@
-import baseappConfig from '@/baseapp.config.json';
+import baseappConfig from '@/baseapp.config.js';
 // #ifdef APP-PLUS
-import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update';
+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';
-// #endif
-export default function() {
-
-	// 初始化appVersion
-	initAppVersion();
+// #endif
+export default function() {
+
+	// 初始化appVersion
+	initAppVersion();
 
 	//自定义路由拦截
 	const {"router":{needLogin,login}} = baseappConfig //需要登陆的页面
@@ -50,11 +50,11 @@ export default function() {
 				if(url=='/uni_modules/uni-login-page/pages/index/index'){
 					//一键登录（univerify）、密码登陆（password）、快捷登录&验证码登陆（!univerify&password）
 					if(login[0]=='univerify'){
-						console.log(e.url,url);
+						// console.log(e.url,url);
 						if(e.url==url){ e.url+= '?' }
 						e.url += "univerify_first=true"
 					}else if(login[0]=='password'){
-						e.url = "/uni_modules/uni-login-page/pages/index/pwd-login"
+						e.url = "/uni_modules/uni-login-page/pages/pwd-login/pwd-login"
 					}else{
 						//默认即是
 					}
@@ -64,8 +64,8 @@ export default function() {
 			success(){	// 成功回调拦截 
 				
 			},
-			fail(){		// 失败回调拦截 
-				
+			fail(err){		// 失败回调拦截 
+				console.log(err);
 			},
 			complete(e){	// 完成回调拦截 
 				//console.log(e);
@@ -105,22 +105,22 @@ export default function() {
    // 	}
    // })
    // #endif
-}
-/**
- * // 初始化appVersion
- */
-function initAppVersion() {
-	// #ifdef APP-PLUS
-	let appid = plus.runtime.appid;
-	plus.runtime.getProperty(appid, (wgtInfo) => {
+}
+/**
+ * // 初始化appVersion
+ */
+function initAppVersion() {
+	// #ifdef APP-PLUS
+	let appid = plus.runtime.appid;
+	plus.runtime.getProperty(appid, (wgtInfo) => {
 		let appVersion = plus.runtime;
-		let currentVersion = appVersion.versionCode > wgtInfo.versionCode ? appVersion : wgtInfo;
-		getApp({
-			allowDefault: true
+		let currentVersion = appVersion.versionCode > wgtInfo.versionCode ? appVersion : wgtInfo;
+		getApp({
+			allowDefault: true
 		}).appVersion = {
-			...currentVersion,
-			appid,
-			hasNew:true
+			...currentVersion,
+			appid,
+			hasNew:true
 		}
 		// 检查更新小红点
 		callCheckVersion()
@@ -131,13 +131,13 @@ function initAppVersion() {
 					allowDefault: true
 				}).appVersion.hasNew = true;
 			}
-		})
+		})
 	});
 	
 	// 检查更新
-	checkUpdate();
-	// #endif
-}
+	checkUpdate();
+	// #endif
+}
 
 // 设备网络状态变化事件
 function eventListenerNetwork () {
@@ -172,9 +172,9 @@ function eventListenerNetwork () {
 function changeAction(actions, {before_action,after_action}) {
 	if(typeof actions == 'string'){
 		actions = [actions]
-	}
-	if (!before_action) {
-		before_action = () => true
+	}
+	if (!before_action) {
+		before_action = () => true
 	}
 	actions.forEach(action=>{
 		let old_action = uni[action]
diff --git a/manifest.json b/manifest.json
index f775f81..0af6d83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,9 +7,9 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
-		"compatible": {
-			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
-		}, 
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
diff --git a/pages.json b/pages.json
index c871719..cc89f76 100644
--- a/pages.json
+++ b/pages.json
@@ -23,17 +23,9 @@
 				"navigationBarTitleText": "",
 				"app-plus": {
 					"animationType": "none",
-					"popGesture": "none",
-					"navigationStyle": "custom",
-					"backgroundColor": "transparent"
-					// "titleNView": {
-					// 	"buttons": [{
-					// 		"text": "帮助",
-					// 		"type": "none",
-					// 		"fontSize": "16px",
-					// 		"width": "60px"
-					// 	}]
-					// }
+					"popGesture": "none"
+					// "navigationStyle": "custom",
+					// "backgroundColor": "transparent",
 				}
 			}
 		}, {
@@ -159,7 +151,6 @@
 				"navigationBarTitleText": "帮助",
 				"enablePullDownRefresh": false
 			}
-
 		}
 	    ,{
 	        "path" : "pages/test/test",
@@ -186,20 +177,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":1
-	// },
+	"condition": {
+		"list": [
+			{
+				"path": "uni_modules/uni-login-page/pages/index/index"
+			},
+			{
+				"path": "pages/test/test"
+			},
+			{
+				"path":"pages/ucenter/settings/settings"
+			}
+		],
+		"current":0
+	},
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#007AFF",
diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue
index 878761b..f0dc826 100644
--- a/pages/ucenter/about/about.vue
+++ b/pages/ucenter/about/about.vue
@@ -16,7 +16,7 @@
 	</view>
 </template>
 <script>
-import baseappConfig from '@/baseapp.config.json';
+import baseappConfig from '@/baseapp.config.js';
 	export default {
 		onLoad() {
 			// #ifdef APP-PLUS
diff --git a/pages/ucenter/settings/settings.nvue b/pages/ucenter/settings/settings--.nvue
similarity index 90%
rename from pages/ucenter/settings/settings.nvue
rename to pages/ucenter/settings/settings--.nvue
index 0832405..085c433 100644
--- a/pages/ucenter/settings/settings.nvue
+++ b/pages/ucenter/settings/settings--.nvue
@@ -1,10 +1,11 @@
 <template>
 	<view class="content">
 		<!-- 功能列表 -->
-		<uni-list class="content">
+		<uni-list>
 			<uni-list-item v-for="(item,index) in agreeList" :key="index" :title="item.title"
 				:clickable="true" @click="itemClick(item)" :showSwitch="item.showSwitch" :switchChecked="item.isChecked"
-				:link="!item.showSwitch"></uni-list-item>
+				:link="!item.showSwitch"
+			></uni-list-item>
 		</uni-list>
 		<!-- 退出按钮 -->
 		<view class="bottom-back" @click="clickLogout">
@@ -71,7 +72,10 @@
 			},
 			changePwd(){
 				uni.navigateTo({
-					url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ (this.userInfo?this.userInfo.phone:'') +'&phoneArea=+86'
+					url:'/uni_modules/uni-login-page/pages/pwd-retrieve/pwd-retrieve?phoneNumber='+ (this.userInfo&&this.userInfo.phone?this.userInfo.phone:'') +'&phoneArea=+86',
+					fail:err=> {
+						console.log(err);
+					}
 				});
 			},
 			checkPush(){
@@ -198,7 +202,8 @@
 				}
 			},
 			itemClick(item) {
-				if (!item.to && item.event) {
+				console.log(item);
+				if (item.event) {
 					this[item.event](item);
 				}
 			},
@@ -227,11 +232,12 @@
 	.content {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		width: 100%;
-		height: 100%;
+		width: 750rpx;
+		height: 100vh;
 		/* #endif */
 		flex-direction: column;
 		flex: 1;
+		background-color: #E5E5E5;
 	}
 
 	.bottom-back {
@@ -248,11 +254,11 @@
 		/* #endif */
 		border-width: 0;
 		border-radius: 0;
-		background-color: #007AFF;
+		background-color: #FFFFFF;
 	}
 
 	.bottom-back-text {
 		font-size: 40rpx;
-		color: #FFFFFF;
+		color: #999999;
 	}
 </style>
diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index 0e42d04..44db2db 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -1,58 +1,63 @@
 <template>
-	<view class="content">
+	<view class="content">
 		<!-- 功能列表 -->
-		<uni-list class="content">
-			<uni-list-item v-for="(item,index) in agreeList" :key="index" :title="item.title"
+		<uni-list :border="false" class="mb10" v-for="(sublist,index) in agreeList">
+			<uni-list-item :border="false" class="mb1" v-for="(item,index) in sublist" :key="index" :title="item.title"
 				:clickable="true" @click="itemClick(item)" :showSwitch="item.showSwitch" :switchChecked="item.isChecked"
 				:link="!item.showSwitch"></uni-list-item>
-		</uni-list>
-		<!-- 退出按钮 -->
-		<button class="bottom-back" @click="clickLogout">
-			<text class="bottom-back-text" v-if="userInfo">退出登录</text>
-			<text class="bottom-back-text" v-else>登录</text>
-		</button>
+		</uni-list>
+		<!-- 退出按钮 -->
+		<view class="bottom-back" @click="clickLogout">
+			<text class="bottom-back-text" v-if="userInfo">退出登录</text>
+			<text class="bottom-back-text" v-else>登录</text>
+		</view>
 	</view>
 </template>
 
 <script>
-	import {isOn,setting} from './dc-push/push.js';
-	import {mapMutations,mapGetters} from 'vuex';
+	import {
+		isOn,
+		setting
+	} from './dc-push/push.js';
+	import {
+		mapMutations,
+		mapGetters
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				agreeList: [{
-						title: '个人资料',
-						event:'toEdit'
-					},
-					{
-						title: '修改密码',
-						event:'changePwd'
-					},
-					// {
-					// 	title: '注销用户',
-					// 	event: ''
-					// },
-					//#ifdef APP-PLUS
-					{
-						title: '推送功能',
-						name: 'push',
-						event: 'openSetting',
-						isChecked: false,
-						showSwitch: true
-					},
-					// {
-					// 	title: '清理缓存',
-					// 	event: ''
-					// },
-					//#endif
-
+				agreeList: [
+					[{
+							title: '个人资料',
+							event: 'toEdit'
+						},
+						{
+							title: '修改密码',
+							event: 'changePwd'
+						}
+					],
+					[
+						//#ifdef APP-PLUS
+						{
+							title: '推送功能',
+							name: 'push',
+							event: 'openSetting',
+							isChecked: false,
+							showSwitch: true
+						},
+						{
+							title: '清理缓存',
+							event: 'clearTmp'
+						},
+						//#endif
+					]
 				]
 			}
-		},
-		computed:{
-			...mapGetters({
-				'userInfo':'user/info'
-			})
+		},
+		computed: {
+			...mapGetters({
+				'userInfo': 'user/info'
+			})
 		},
 		onLoad() {
 			this.initSoterAuthentication();
@@ -63,25 +68,29 @@
 		methods: {
 			...mapMutations({
 				logout: 'user/logout'
-			}),
-			toEdit(){
-				uni.navigateTo({
-					url: '/pages/ucenter/edit/edit'
-				});
-			},
-			changePwd(){
-				uni.navigateTo({
-					url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ (this.userInfo?this.userInfo.phone:'') +'&phoneArea=+86'
-				});
-			},
-			checkPush(){
-				// 手机端获取推送是否开启
-				//#ifdef APP-PLUS
-				let pushIsOn = isOn();
-				this.agreeList.forEach(item => {
-					item.name == 'push' ? (item.isChecked = pushIsOn) : '';
-				})
-				//#endif
+			}),
+			toEdit() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-users/pages/uni-id-users/edit'
+				});
+			},
+			changePwd() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-login-page/pages/pwd-retrieve/pwd-retrieve?phoneNumber=' + (this
+						.userInfo && this.userInfo.phone ? this.userInfo.phone : '') + '&phoneArea=+86',
+					fail: err => {
+						console.log(err);
+					}
+				});
+			},
+			checkPush() {
+				// 手机端获取推送是否开启
+				//#ifdef APP-PLUS
+				let pushIsOn = isOn();
+				this.agreeList.forEach(item => {
+					item.name == 'push' ? (item.isChecked = pushIsOn) : '';
+				})
+				//#endif
 			},
 			/**
 			 * 添加生物认证选项
@@ -101,7 +110,7 @@
 				uni.checkIsSupportSoterAuthentication({
 					success: (res) => {
 						res.supportMode.forEach(item => {
-							this.agreeList.push(checkAuthModeList.find(mode => mode.name == item));
+							this.agreeList.push([checkAuthModeList.find(mode => mode.name == item)]);
 						})
 					},
 					fail: (err) => {
@@ -109,98 +118,124 @@
 					}
 				})
 				// #endif
-			},
-			/**
-			 * 开始生物认证
+			},
+			/**
+			 * 开始生物认证
 			 */
-			startSoterAuthentication(item) {
-				// 检查是否开启认证
-				this.checkIsSoterEnrolledInDevice(item)
-				.then(()=>{
-					// 开始认证
-					uni.startSoterAuthentication({
-						requestAuthModes: [item.name],
-						challenge: '123456',	// 微信端挑战因子
-						authContent: `请用${item.title}`,
-						success:(res)=> {
-							if(res.errCode == 0){
-								/**
-								 * 验证成功后开启自己的业务逻辑
-								 * 
-								 * app端以此为依据 验证成功
-								 * 
-								 * 微信小程序需要再次通过后台验证resultJSON与resultJSONSignature获取最终结果
-								 */
-								return uni.showToast({
-									title: `${item.title}成功`,
-									icon: 'none'
-								});
-							}
-							uni.showToast({
-								title: '认证失败请重试',
-								icon: 'none'
-							});
-						},
-						fail:(err)=> {
-							uni.showToast({
-								title: `认证失败:${err.errCode}`,
-								icon: 'none'
-							});
-						}
-					})
+			startSoterAuthentication(item) {
+				// 检查是否开启认证
+				this.checkIsSoterEnrolledInDevice(item)
+					.then(() => {
+						// 开始认证
+						uni.startSoterAuthentication({
+							requestAuthModes: [item.name],
+							challenge: '123456', // 微信端挑战因子
+							authContent: `请用${item.title}`,
+							success: (res) => {
+								if (res.errCode == 0) {
+									/**
+									 * 验证成功后开启自己的业务逻辑
+									 * 
+									 * app端以此为依据 验证成功
+									 * 
+									 * 微信小程序需要再次通过后台验证resultJSON与resultJSONSignature获取最终结果
+									 */
+									return uni.showToast({
+										title: `${item.title}成功`,
+										icon: 'none'
+									});
+								}
+								uni.showToast({
+									title: '认证失败请重试',
+									icon: 'none'
+								});
+							},
+							fail: (err) => {
+								console.log(`认证失败:${err.errCode}`);
+								uni.showToast({
+									title: `认证失败`,
+									icon: 'none'
+								});
+							}
+						})
+					})
+			},
+			checkIsSoterEnrolledInDevice(mode) {
+				return new Promise((resolve, reject) => {
+					uni.checkIsSoterEnrolledInDevice({
+						checkAuthMode: mode.name,
+						success: (res) => {
+							if (res.isEnrolled) {
+								return resolve(res);
+							}
+							uni.showToast({
+								title: `设备未开启${mode.title}`,
+								icon: 'none'
+							});
+							reject(res);
+						},
+						fail: (err) => {
+							uni.showToast({
+								title: `${mode.title}失败`,
+								icon: 'none'
+							});
+							reject(err);
+						}
+					})
 				})
-			},
-			checkIsSoterEnrolledInDevice(mode){
-				return new Promise((resolve, reject)=>{
-					uni.checkIsSoterEnrolledInDevice({
-						checkAuthMode:mode.name,
-						success: (res) => {
-							if(res.isEnrolled){
-								return resolve(res);
-							}
-							uni.showToast({
-								title: `设备未开启${mode.title}`,
-								icon: 'none'
-							});
-							reject(res);
-						},
-						fail: (err) => {
-							uni.showToast({
-								title: `${mode.title}失败`,
-								icon: 'none'
-							});
-							reject(err);
-						}
-					})
-				})
 			},
-			clickLogout() {
-				if(this.userInfo){
-					uni.showModal({
-						title: '提示',
-						content: '是否退出登录',
-						cancelText: '取消',
-						confirmText: '确定',
-						success: res => {
-							if(res.confirm){
-								this.logout();
-								uni.navigateBack();
-							}
-						},
-						fail: () => {},
-						complete: () => {}
-					});
-				}else{
-					uni.navigateTo({
-						url: '/uni_modules/uni-login-page/pages/index/index'
-					});
-				}
+			clickLogout() {
+				if (this.userInfo) {
+					uni.showModal({
+						title: '提示',
+						content: '是否退出登录',
+						cancelText: '取消',
+						confirmText: '确定',
+						success: res => {
+							if (res.confirm) {
+								this.logout();
+								uni.navigateBack();
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					});
+				} else {
+					uni.navigateTo({
+						url: '/uni_modules/uni-login-page/pages/index/index'
+					});
+				}
 			},
-			itemClick(item) {
-				if (!item.to && item.event) {
+			itemClick(item) {
+				console.log(item);
+				if (item.event) {
 					this[item.event](item);
 				}
 			},
+			clearTmp() {
+				uni.showLoading({
+					title: '清除中',
+					mask: true
+				});
+				uni.getSavedFileList({
+					success:res=>{
+						if (res.fileList.length > 0) {
+							uni.removeSavedFile({
+								filePath: res.fileList[0].filePath,
+								complete:res=>{
+									console.log(res);
+									uni.hideLoading()
+								}
+							});
+						}else{
+							uni.hideLoading()
+						}
+					},
+					complete:e=>{
+						console.log(e);
+					}
+				});
+			},
 			/**
 			 * 打开设置页面
 			 */
@@ -217,25 +252,29 @@
 		flex: 1;
 		width: 100%;
 		height: 100%;
-	}
-	uni-button:after{
-		border: none;
-		border-radius: 0;
 	}
+
+	uni-button:after {
+		border: none;
+		border-radius: 0;
+	}
+
 	/* #endif */
 	.content {
 		/* #ifndef APP-NVUE */
 		display: flex;
-		width: 100%;
-		height: 100%;
+		width: 750rpx;
+		height: 100vh;
 		/* #endif */
 		flex-direction: column;
-		flex: 1;
+		flex: 1;
+		background-color: #F9F9F9;
 	}
 
 	.bottom-back {
+		margin-top: 10px;
 		width: 750rpx;
-		height: 120rpx;
+		height: 44px;
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
@@ -246,12 +285,23 @@
 		border: none;
 		/* #endif */
 		border-width: 0;
-		border-radius: 0;
-		background-color: #007AFF;
+		border-radius: 0;
+		background-color: #FFFFFF;
 	}
 
 	.bottom-back-text {
-		font-size: 40rpx;
-		color: #FFFFFF;
+		font-size: 33rpx;
+	}
+
+	.mb10 {
+		margin-bottom: 10px;
+	}
+
+	.content /deep/ .uni-list {
+		background-color: #F9F9F9;
+	}
+
+	.mb1 {
+		margin-bottom: 1px;
 	}
 </style>
diff --git a/store/modules/user.js b/store/modules/user.js
index c987d1b..66f102b 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -28,6 +28,7 @@ let state = {
 			state.info = null;
 			state.hasLogin = false;
 			uni.setStorageSync('userInfo', null);
+			uni.setStorageSync('uni_id_token', '');
 		}
 	},
 	actions = {
diff --git a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
index 7f1eced..f5d744a 100644
--- a/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
+++ b/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue
@@ -370,7 +370,7 @@ $list-item-pd: $uni-spacing-col-lg $uni-spacing-row-lg;
 	/* #endif */
 	height: $uni-img-size-base;
 	width: $uni-img-size-base;
-	marin-right: 10px;
+	margin-right: 10px;
 }
 
 .uni-icon-wrapper {
diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue
index fef3ef5..55f3f59 100644
--- a/uni_modules/uni-login-page/pages/index/index.vue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="wrap">
+	<view class="wrap">
 		<!-- <uni-nav-bar left-icon="back" left-text="返回" right-text="菜单" title="导航栏组件"></uni-nav-bar> -->
 		<view class="wrap-content">
 			<view class="content">
@@ -27,10 +27,10 @@
 				<text class="tip-text">未注册的手机号验证通过后将自动注册</text>
 
 				<!-- 其他登录方式 -->
-				<view class="auth-box" v-if="loginList.includes('password')">
+				<!-- <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>
+					<text class="login-text" hover-class="hover" @click="openLoginList">其他登录方式</text>
+				</view> -->
 			</view>
 		</view>
 		<!-- 登录按钮弹窗 -->
@@ -39,9 +39,9 @@
 	</view>
 </template>
 
-<script>	
-var univerify_first,currentWebview;//是否一键登陆优先
-import baseappConfig from '@/baseapp.config.json';
+<script>	
+var univerify_first,currentWebview;//是否一键登陆优先
+import baseappConfig from '@/baseapp.config.js';
 	import mixin from '../../common/loginPage.mixin.js';
 	var currentPage;
 	export default {
@@ -49,38 +49,44 @@ import baseappConfig from '@/baseapp.config.json';
 		data() {
 			return {
 				phoneArea: ['+86'],
-				currenPhoneArea: '+86',
-				loginList:[]
+				currenPhoneArea: '+86',
+				// loginList:[]
 			}
-		},
-		onLoad(e) {
-			this.loginList = baseappConfig.router.login
-			univerify_first = e.univerify_first
-			//#ifdef APP-PLUS
-			if(univerify_first){
-				const pages = getCurrentPages();
-				currentWebview = pages[pages.length - 1].$getAppWebview();
-				currentWebview.hide();
+		},
+		onLoad(e) {
+			// this.loginList = baseappConfig.router.login
+			univerify_first = e.univerify_first
+			//#ifdef APP-PLUS
+			if(univerify_first){
+				const pages = getCurrentPages();
+				currentWebview = pages[pages.length - 1].$getAppWebview();
+				currentWebview.setStyle({
+					"top":"2000px"
+				})
 			}
-			//#endif
-		},
-		onReady() {
-			//#ifdef APP-PLUS
-			if(univerify_first){
-				console.log('开始一键登陆');
-				this.$refs.uniQuickLogin.login('univerify')
-				setTimeout(() => {
-					currentWebview.setStyle({
-						titleNView:{
-							autoBackButton:true,
-							backgroundColor:"#FFFFFF"
-						}
-					})
-					currentWebview.show()
-				}, 1500);
-			}
-			//#endif
-		},
+			//#endif
+		},
+		onReady() {
+			//#ifdef APP-PLUS
+			if(univerify_first){
+				console.log('开始一键登陆');
+				setTimeout(()=>{
+					this.$refs.uniQuickLogin.login('univerify')
+				},100)
+				setTimeout(() => {
+					currentWebview.setStyle({
+						titleNView:{
+							autoBackButton:true,
+							backgroundColor:"#FFFFFF"
+						}
+					})
+					currentWebview.setStyle({
+						"top":"0"
+					})
+				}, 1500);
+			}
+			//#endif
+		},
 		computed: {
 			canGetShortMsg() {
 				return this.isPhone;
@@ -112,7 +118,7 @@ import baseappConfig from '@/baseapp.config.json';
 			 */
 			toPwdLogin() {
 				uni.navigateTo({
-					url: './pwd-login'
+					url: '../pwd-login/pwd-login'
 				})
 			},
 			openLoginList() {
diff --git a/uni_modules/uni-login-page/pages/phone-code/phone-code.vue b/uni_modules/uni-login-page/pages/phone-code/phone-code.vue
index e9f5c43..1ff2fa4 100644
--- a/uni_modules/uni-login-page/pages/phone-code/phone-code.vue
+++ b/uni_modules/uni-login-page/pages/phone-code/phone-code.vue
@@ -8,6 +8,9 @@
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
 				<uni-forms ref="form" :value="formData" :rules="rules">
 					<uni-forms-item name="phone">
+						<!-- <uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
+							v-model="formData.phone" maxlength="11" placeholder="请输入手机号码">
+						</uni-easyinput> -->
 						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
 							v-model="formData.code" maxlength="6" placeholder="请输入验证码">
 							<template slot="right">
@@ -112,6 +115,6 @@
 <style>
 	@import url("../../common/loginPage.css");
 	.phone-input-box{
-		margin-top: 20rpx;
-	}
+		margin-top: 10px;
+	}
 </style>
diff --git a/uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue b/uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue
index 5c7b792..13a4872 100644
--- a/uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue
+++ b/uni_modules/uni-login-page/pages/pwd-login/pwd-login.vue
@@ -3,13 +3,13 @@
 		<view class="wrap-content">
 			<view class="content">
 				<!-- 顶部文字 -->
-				<text class="content-top-title">手机号密码登录</text>
+				<text class="content-top-title">用户名密码登录</text>
 				<login-ikonw class="login-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
 				<uni-forms ref="form" :value="formData" :rules="rules">
 					<uni-forms-item name="phone">
 						<uni-easyinput type="number" class="phone-input-box" :inputBorder="false"
-							v-model="formData.phone" maxlength="11" placeholder="请输入手机号">
+							v-model="formData.phone" maxlength="11" placeholder="请输入手机号/用户名/邮箱">
 							<template slot="left">
 								<!-- 当前仅支持中国大陆手机号 -->
 								<!-- <picker mode="selector" :range="phoneArea" @change="selectPhoneArea"> -->
@@ -59,9 +59,8 @@
 					title: '请输入正确的手机号',
 					icon: 'none'
 				});
-
 				uni.navigateTo({
-					url: './pwd-retrieve?phoneNumber=' + this.formData.phone + '&phoneArea=' + this.currenPhoneArea
+					url: '../pwd-retrieve/pwd-retrieve?phoneNumber=' + this.formData.phone + '&phoneArea=' + this.currenPhoneArea
 				})
 			},
 			/**
@@ -134,16 +133,13 @@
 
 <style>
 	@import url("../../common/loginPage.css");
-
 	.phone-input-box {
 		margin-top: 20rpx;
 	}
-
 	.auth-box {
 		justify-content: flex-start;
 		margin-top: 20rpx;
 	}
-
 	.login-text-sub {
 		color: #8a8f8b;
 	}
diff --git a/uni_modules/uni-login-page/static/login/img/smsCode.png b/uni_modules/uni-login-page/static/login/img/smsCode.png
new file mode 100644
index 0000000000000000000000000000000000000000..0df73b8e01efbf5ad869e5b1ee904d4583ac2a9d
GIT binary patch
literal 5688
zcmb_g_fr#0v<)F(LQO&!kx-Q0q$4HLd#}=qh#<Z9gc^#304maZ@4XYGDuRG?6+w!C
zbm<^IzW4rx_rvbaoV#c4ox3w<&fYj(Z548oyCeVrfLu*gQUCTF`EP-VZ})1`nj8Rt
z=AWA46T<+j-RwJQhDsg7|9pdw$TWdNTlXUn!*$#rx#M5>61`^MrkX`f2y<@>qgZ(n
zB*dR=h6dR*DeLg&DZqFPYdirh&Jy;7_Jd46p3K&3b1$egqmGj-bbq(!qSE_PWTjHz
zy5i=S-&wW!Ao3L$ihc+Yv{L|KkY7Nm2$9DaJQp|_=@bMdfP=>fSo4wqmQSWV3#}+v
zkU-B7q`|xG+wlJ%V8etyCmmN5^buokiUm>P%~_(zRC&i(?4MOXlHA7YLE>Js3}_&1
zAG5bGfUl#zl$e+o)BhoHczfn7c+EiemavKxuLd@LXN3D>K{?(_m}-og;foA5He2H#
zGELV&basg&<>dgO1P+XmQ3cyNsBq%(jeJ<6XUBft&0%JeQy0?j8!qlV>I(W^#%9yz
zp+s5&3>3g35lk7_W2CJ3FI00C)UaM-teV6~d;oI<JdsR)1+XUjAPQ?Y=oNe<Y!7O9
z98N|b4n(Hl1`S@4LYG7MC4z~oLw~;-F}6li2fG7@Nde=J3QXf)*a8#f?)Xop2ASkx
zk>|?+=Zs6h{?H&g)x#Y{RINfX`4h$;>fIGnR*0MHQM@2SR&J$<9`*1ZXx<}$#CoPs
z-IeI)87&~aK!t_6-xeehGV*8L#j@ECct{yUVx!|?3ApeVL9Z|8-;87$*U%8Tg7kN?
z0ZGG6>KWH?^eXrzvb&OQQD-5a==D6QL+hEZAlW3V*^wG315ro7J59Cs;<3FJXAAH!
zcu=Q}%|4s`f(`iSmX)`n-jp4PjH!N^Iu9w5_^0O~tLNwNh#gqZQAc+Fhi|<PBP06!
z&lT`G()6Kn4+bR#ybcYB-!qy!8?c%rb@*&q%C`Abq0-%6lzolE8AztEa@q}RW(G`>
z4(wY3mt#!X6=X5UPvEHeVkgTssi)zSkb!+Bisf~u)Vv!-Bq6YJ`Ox>(Y;DkOKR*M9
zhn%SXgN1>KSahdTh{#PLbR<u5d1uxs!oZp}PZF)0$M*E|e1TY!6nf|AG%5-^O<WwN
zh!h8sDS2FVIj@#esn(xqcvuvRah|XNJK)I^MD4PN8kIjwED$$O#DO~sgSaw6m|!9x
zmq=%l$@x7G-H6-%bDK6}Ex~OC5E&cZL+o3Rmij6Wm8xf-(lU$DTkhgGoD2-ZMUWIX
z@`v1D+u$AYdP$r>x=IARKt<3G5xf`i^=-ZgWib!}@ZchsKUKt2gCs85K8vfU@gEU2
z1lza^zQDnMIcR`1l~DC&9(3H74gA)K!6pAb&)#y95(f;571%|RQ{brH!3i6o^;o=X
z2(f4oWg!^vWU1ZsZh!ZIYGkSNGt&M*&MP~G2_`5&a7rc}ZNI+3p@SH_AjDtzv}=Dz
z0;i{=3Q8%~NgP-u!lwt644f5_{AjO$5Wcm$qg0q5S6ryQ|Kp1j%o69kxAgK#<4N8H
zEPnJ<6;s3?gCsg>1EWXR*BHzYt3zsS{=vFQ!VQu*JoD<;zTJ<=mb4gNE*djl8Z(uf
zEWVqt;~&L_MGcD62Qh55mj}VV=ldt~44lJB%PVu^t4qHF*lbNSQFM3%L(Woj2lNiF
zM?cNcsON?cBTLKyPd=a2aBF|`q3d!)5!V|nG`#A?w-{0KuSwl^U{fL`>)FC$clYG$
zW6cL>%@DzRvUGiUEU|ADKP@36DLkt^0_BJ6!2B5ZNYd4>tl1A3(<j3fYF)o2VSk4W
z6m*0~D=F;ygXl8>{wu3qZHlxbduYqPBKLKP#!juIv?N)z?1{%)z+>(0qKg?8TItq1
zqwnP}3c{#*oaQl+`5C5d%`KFk_hP?txEQJ4mj3Y{6?@P7MaAjoxkGR)L>}DFYXT9a
zc^$(o*yu;&I9v7pY`mx8d>QBO6G4U!sEq+BQ0f~BGZgH4A9GJ~97Y_xec9O@=<6cX
zxbgT?t+`9<)Y`NH5T~%^Am;zjf3Uy&yN8;5a5F#ej82FOSJlN`0~h0hCCOe44w*JS
zbwBRc%1YB7bYJ_W+@1J-R#+`zzH=uV0zJZH>sbsnA@f|%BgP1v$g}Soh9~_!r6GZ^
zPdUi3@!!D~`H?0>F2;exK-cuv?evY#CJQi1$eLlHRLz2xtu5y9*J*7no2O&q^w!Pv
znS{YRQSl(JhDm82emVis{aD6S{-!TBE>;QWf#(+=l>!<sg~#l-s8OJ!;0b?r>-e`B
zXDT^72BkuE*6C)=l|mJE+5s}@gN%^1O+b9J?#~J#-d9P2af3xmaL&PzkL~FuSE0P$
z7}g^}tRvR<!h=lj&9UdWP9x{V_7aSkZ4C!4DrZ%I?E>r0UGrVckBX=(DGIj!Sec#)
z9Dip{O&ve3nOOibe5s<$arH}BnqXpZH|nq5e0rKS<LqC9R4zIJhclFxFr!`jLY=Io
z<a<$*DqbbXm?FR7-&^rw;|cdg1Hn{f8z-tfxaNp&WCK|o$#?W?`-+ayj;Q_ld-0KX
zR=Ao6HpIu_s!u+?PEXNWo{xJ`@?NgWJT~(*K>?uoJ&O%mKjNXhVPk-e`I3@p+DzTg
z?U>pA@;P{Iqi8%mS84cly5~b#^LD6?5x=0lGb_gxX;C!~<7h){p}j?t*`2<_z(C3#
zY(a+mr;)xJ;JfS#z)i}x!NdcuQZ~>>1*5k75MYlx^%X@%#ezA4Z7L|{ZL+Sg99n=e
z43aS5!1!&!1Yz<ZD^9>XQRLsJJTfdS-LU%}<^4x9D}Ym)k<tZhVen68r%SU$eD&3j
zzAmXRRe+XKWK8J^ezYlZz-~$+Ywu&sSX+hWtXpo-^m92hW>;oVrE=rp!jb`2ugN^|
zpNt68zVYayq2=$XU5?}r43UBo>(14ExNvgFHGDp@=Go_;sKc+hiy8>K;p2VtkFv(v
z{VWgXCgJoZ7X&#q*Md*QCr?}7A~&~TyCH%);hrsOzd~0LdpP>}9X4o35WU1J5fYh#
zpUeTp&T-01&)S=@$Q<`D9_8Yb6eCdvvq=095+b$F=(0AZa0Pa-ul&Vw+F0Ny0Q@<W
z--dS5ZHz^_sc$C|H9einlPq$bpCLE*e6i5DNc>{4QwF4;=1EChV&O)u7+)!b*1pOa
zz`p7fP4dz|JB5zaWI;x}pD_?5+ifG4YiYa>yk>@_6s1_APKc&N^9g%gg@(WZ)CL^D
z+_`^=ZtJz1)Vt!gRRYN>UuuR2Hd+}7uy)(3h~hQb=_6t$wipF7YXq}{Ohiu;Y3CA^
z%2|NSD2JU|_g-nDxiw;@Jr(yJ?!zodQYL^_q4>+>z7<{-(M;qOD6bOo-L9#JO=*&h
z1u?*)Sm52*f*gS8+Gn23ykm$KjzFCUJdkzV`c}o4EIzf5XDk2i>!`evh(L@pZnc@5
zsgzaoC2zeuvqK&|Q%<BC6hQ%a#^)YaG!r#QxNrtN@SS43J1C4n?&ajqQ%My)_i-Uz
z`%0^m=klH*2v}%J42SXr&x!6$3lqAKMj0P$OPVBNpW(ZqE~G`rP2v;k&TiKudc+-2
zP6-K`Xi*;DIA3;5Gtty$7_+Cx79`P*LDj}*P`XRE+4M8nZHbZXsma=3uQnxZ$zDCf
zfB!GrT-MvkrJ1RTCxy$Gu+4BA_{Mb2q(I&b9Z!wh1$)Op>l_vR;G<;Jyr<qySDAg|
zDa~5pj>@F)VF**89w!?F^LXoLQb*F*BJkatK!Lr2$6He4boL6OJb?hCF740kw^`%1
zT308he;<RC>&aLVV#zM`Drfe`w}Jffxs~SQujF?hkyLV^_wTkWH#8gu#ZcE*@j(~0
z^!6|8ETpZ+=0@Zsl=eZl*pq}D&gtNBdaBQ;%&6Jk2n>nrhcL1^j-2P8%JdAsgXw*a
z(oSj-$A<ZC-qRDvz+!A4vvi(6#Vnobei3OMrwe9jnKLH|G%LCXW{$Q&HufOBEEzb*
z1IGY<)cOKI0i)1F9F6xeiGRqw-=vC$!g9ZDzhzA?fKk*2cYt$g-BC2;nLZdFd2ldT
z@udZySY3&u9Pn0*JvNr~lxZ9((IWP0P#wA;i+9TCqPDxRfEF*7oC=FP+!@Agmj$Y~
z@pX&vz-GG{#`BQyH&lYY0+K7(%xCIoICTmeX^#7~+_<yyzf5TQ|LK*>vRRA96<9H?
zt7F|@6CU2Nv;ASB3v?GY5FI>hr+{~NNI8XLOfUK0;0+pO(H}&4JpT2u7LwM#MS{kZ
z%oHXw#ZrZX?38GFGv-#OLO-vRqF9D&m~uP+g5-ZF6=Y<VY+i@V*h%XNeI{$4*Fi*V
zuaOB5mtKD$Lvh`S2DK2KMc3XBR-hpXcD8fVL1!`j8uI5Go_K@I_{89vO(7#f<!&hO
zMGO<Ne@cxhv(92<HNMnuq(B#+$gRX2K^)cRdw{UCUk)-D^HlyvR30CTAwWB>tCMxA
z#2d4-vxQsXbhTVKXAh<yj~^|Ld*KCaWeTACXL6;}`0Rx{8oc=P8tRz@7X1Sk4CtOI
z$In|M3NCv~P6iUjuHN~_NJuocH@i&i<JlYG9x+Hzs8r2Zh_{E@Uu@g6e_zX1Uu|gY
zc_@#=FlBzWv(RI;4t!PQN?F%HXp;A-EI~a>R$OKyh?UsR>~wYW&G{WFY@D#Zi}|I5
zAMxmzRn;F5tMb}!+CtA;8EB+Ta{WW~m_0rl&Nq?81r-u>c`6&7;Pj$v&wCpGYjkFM
z+X4-Ks?osQPu{eZl@V9ihBeLq+Ij6;C}ypjwU471r^TQIS*!0@IWJlBA-6dqQKl$U
z51Wdaft4=n`i#4y|Cxu?onZ$u(RZ8=>Wac-l<!@}GUV*)W=KKS0_^C9TG0Zl_p_LP
zJSA7%_J#u=_9*cCcWtuG9u{e*P90jsyxn^}k}az>|Mwo}P+5Gtsc9>}x=xHg2RiE|
z_*SupHXXZ@hf>IxSt=jsnl{4ixqlT(1WY)W=ki*^RSgO`WxXKz#~MBJ6ol1*<Z@zr
z5dns?Q9NFS<=G&3oK@Jz*Yw%5q|XP|6(9NT{Oi?k2CeeYtwL+-842N-EEvrXEoJfF
zuVM{4KM46Jj;Z*{+1Z_Nm|FEt)`+Ge(-L>GKUfN}dDo@zw>15|b#M=7cw<c~-2Ny7
z^`!8*j&ezR6qY+}9kx6VjRc097TweA8Y^TVid!Rb_N9Y|U$mW>XRG_KJDSstSLto<
zF<HSeQ*p99f5N`K35lC>d(&t=*G5IUJ!==X`?S%uD33z}j)5<})91eVe#Fq^_l#@H
zk-^-PcDdn_9Qs2@w%pqNU6-h48mIuYcPrY5%9l*)9qCJc&-xvC%PbjbhjfPairkcq
z*`W^#8%owqEvSEJtI-)O?2+sZXAHTXKkuJCxXOreEnD*~`8etDAsM+wF=Cz4Y2&v+
z=rtB@&tcpYrh7%WRB3jY8NLslBVn?rMl5}nI9g(<c_7v1mHg?a(I7ngG`6B%NH<Xn
zopNwBGz7n%Xd?`kk2SpVaZ-U}zM<)YUE*X~)>?w@<I^%~-wOyyz83S`D>xrd<tj#`
zG6l*Vol(ER+_l2qT|zl8p)w{`<PzRO70V^X!i=9bFzl)!yp-4Tr(F(>F9DJzD_Gur
zQd`6D^)>5ohx!JT9vP9o^Z|*-i(;a9<FtbL79XVq+z2isx53)1j60+m`g0!6X+#~F
zIHr#3rPRSyv5lGzz^^Z|33|i|vIofqrr`AhMdhctNG`{j8j6H|;MaN6#Gc8m2JscH
zd#oG@Bftf{iTj@U*0**({+0MT3AN+5Q27q?$g8@%(>uJ?*3377X&IJ~y64MW_jpP>
zZtqVBkTaCO_R2CFRL&A$9cO@PNdrVW{d~{4+HZYTy*ecAxgqFW;efiEZCJ?x4HgKi
zl{l0!Pg3BS&!YPE<lkCCeb>$NkeRv#5-x)zp$GV@_XbV6Ng9DbuG1P~6*@_Z4>92M
z9Mr&PB{y8v=ZPcG?ROq{kkR9zo(xuG$4mB<$Ep02?8B4*)*ue8{+#qysjJB^F{pBg
z;5DFiAM53v#sLk#c?R(Rra<V$l9C+_7Q7~R%iU>KIs$o}Cj^P2s7dql4CC-|AbMti
z|KyML0zFpfVRbLoV%R|iq^XuCw5;68@W9JERUr9$<b8mBiHwi7Tc5)(C*TkKYNtGe
z-~zZ{wj9H=X7V%ZWgMy<T(@#S-BZENaRG!`C3GkBO=_qC8Xf>kSnw9R%Q*#`3`Eav
z2L|qhf}<it2CRxmS+vr@xm%ih*u4Hbq#|Xn31{7_DWroADDeRzJn+L|AUB<Ay+6Bz
zm0*i$yf%m$cFu4=w}LI%2<+fN5)gUbkdx1;^ync_8J1l1WF%WkODkX<2-EWmR*AIj
z%0NxWf;Tm7_@sLhriTnUps?!sD;|l(N^;G=7!*H<-Yw?q8G6xlo2Y>&9KbGX>1wmB
z0utfCpIfvgTq;qibR#LOl{O+)!wb|<mv90tu!l%Q=lGM~T;>Ib%-P76rSG(Aec_R8
zG8yb;0x*mW!3B0EhuhBw2(eZo{tg*;9OywFse%lt(#f&=ely+J-}K$csK)OXwGoH5
z^{SW<D0&lo@JiLgGUAPaeZ!>cOAssfQShJuQEV$ozA`A0MVAs{!a7ISD7<FJk!<-l
zrBA;X5cyXpU&!%*%b6XRKf&iD<NAbM_`yHs$7oDhCvgx$O@pAUqq>&e^S1B3EO;DN
zI#*!U(2fU+`!44GnB7Jwj(t`^=_cbLeji=x6i*vvCjiB*pAxiVu$iRGkN8p^<|;1J
z6U01TIUSph$A|%83rArPPPJ?`ad`7xso1M$Rn%GJsOQ_ypQcP`BUBps$HVVuVW%3v
zN4tW+d)BO0+{p3i>Zc|(-AF~E2N$goe_H!+g}zVLe(ZtHD-Wp2=PK1hL97)E-X=Vt
zB8ZLV5>7h^mM1Zbz}FFI-c9;eu5qksDu=#zH6nW87*$l-=aG{Wt<O6OUk2pF44*Z@
zXf_3s3ym)SFaz7#45$9=DkpZ)*m+%(r~FnbevBJv5LpFzHIdY_FwOt9k&t^6jT0D!
zml5?lfC%^VP7=%BR18O;4uO)VlP(j!C?5`qeM$ru?I4a)17>>rX!+8D<k=+&p?O-9
zpV*QMCB%+3kdEri9<zjG;l#sRB?u+8fpkDE(J+bXOD>BLA+LDNK#GzJ(9xAGC!Z4*
z&`U2p4bhY$g?{e)GYe?2leSyaW(3NE2W{pl#>EMzf;_HKv(c5!5IXbP4LVhWlOs>h
z19z=E-o?nDHS=~X?s~8?U(Y%lnUu)a5@XWLZ>OgnEYW4<Z!Vz((YIq)5;U&85qvG@
YYNhrFi}}TOI}rw`DQPR#$lFBx4}4aJ{r~^~

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-login-page/static/login/img/username.png b/uni_modules/uni-login-page/static/login/img/username.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fed1639679ad6c7154b2f4a052b4d460ec6c071
GIT binary patch
literal 7010
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
DEqWmc

literal 0
HcmV?d00001

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 8ce6233..9194b18 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
@@ -1,17 +1,14 @@
 <template>
 	<view class="quick-login-box">
-		<view class="item" v-for="({id},index) in oauthServices" :key="index" @click="login(id)" v-if="config[id].isChecked">
-			<image class="logo" :src="config[id].logo" mode="widthFix"></image>
-			<text class="login-title">{{config[id].text}}</text>
+		<view class="item" v-for="({id,logo,text,path},index) in servicesList" :key="index" @click="path?to(path):login(id,false)">
+			<image class="logo" :src="logo" mode="widthFix"></image>
+			<text class="login-title">{{text}}</text>
 		</view>
 	</view>
 </template>
-
 <script>
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex';
+	import {mapGetters,mapMutations} from 'vuex';
+	//前一个窗口的页面地址。控制点击切换快捷登陆方式是创建还是返回
 	export default {
 		data() {
 			return {
@@ -41,25 +38,49 @@
 						"logo": "../../static/login/img/qq.png",
 						"isChecked":false //暂未提供该登陆方式的接口示例
 					},
-					"sinaweibo": {
-						"text": "微博登录",
+					"sinaweibo": {
+						"text": "微博登录",
 						"logo": "../../static/login/img/sinaweibo.png",
-						"isChecked":false //暂未提供该登陆方式的接口示例
-					}
+						"isChecked":false //暂未提供该登陆方式的接口示例
+					}
 				},
-				providerList: [],
-				oauthServices:[],
-				univerifyStyle: {
+				servicesList:[
+					{
+						"text": "账号登陆",
+						"logo": "../../static/login/img/username.png",
+						"path":"/uni_modules/uni-login-page/pages/pwd-login/pwd-login"
+					},
+					{
+						"text": "短信登陆",
+						"logo": "../../static/login/img/smsCode.png",
+						"path":"/uni_modules/uni-login-page/pages/index/index"
+					}
+				],
+				univerifyStyle: { //一键登陆弹出窗的样式配置参数
 					"fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。
 					"backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff  
 				}
 			}
+		},
+		created() {
+			let servicesList = this.servicesList
+			//去掉当前页面对应的登陆选项
+			for (var i = 0; i < servicesList.length; i++) {
+				if(servicesList[i].path == this.getRoute(1)){
+					servicesList.splice(i,1)
+				}
+			}
 		},
 		mounted() {
 			//获取当前环境能用的快捷登陆方式
 			// #ifdef APP-PLUS
 				plus.oauth.getServices(oauthServices=>{
 					this.oauthServices = oauthServices
+					oauthServices.forEach(({id})=>{
+						if(this.config[id].isChecked){
+							this.servicesList.push({...this.config[id],id})
+						}
+					})
 					// console.log(oauthServices);
 				},err=>{
 					uni.hideLoading()
@@ -71,27 +92,28 @@
 					console.error('获取服务供应商失败：' + JSON.stringify(err));
 				})
 			// #endif
-			
-			/*
-			uni.getProvider({
-				"service": "oauth",
-				success: res => {
-					this.providerList = res.provider.map((name) => {
-						return {...this.config[name],name}
-					})
-					this.login('univerify')
-				},
-				fail: (err) => {
-					console.error('获取服务供应商失败：' + JSON.stringify(err));
-				}
-			})
-			*/
 		},
 		methods: {
 			...mapMutations({
 				setUserInfo: 'user/login'
-			}),
-			login(type) {
+			}),
+			getRoute(n=0){
+				let pages = getCurrentPages();
+				console.log('route-pages-length',pages.length);
+				if(n>pages.length){ return '' }
+				return '/'+pages[pages.length - n].route
+			},
+			to(path){
+				console.log('比较',this.getRoute(2),path)
+				if(this.getRoute(2)==path){ // 控制路由是重新打开还是返回，避免重复打开页面
+					uni.navigateBack();
+				}else{
+					uni.navigateTo({url:path})
+				}
+			},
+			login(type,navigateBack=true) {
+				console.log(arguments);
+				console.log('services',services);
 				let oauthService = this.oauthServices.find((service) => service.id == type)
 				// #ifdef APP-PLUS
 				//uni.showLoading({mask: true});
@@ -122,24 +144,33 @@
 					fail: (err) => {
 						uni.hideLoading()
 						console.log(err);
-						switch (err.errCode){
-							case 30002:
-								console.log('在一键登陆界面，点击其他登陆方式');
-								break;
-							case 30003:
-								console.log('关闭了登陆');
-								uni.navigateBack()
-								break;
-							case 30006:
-								uni.showModal({
-									title: "登陆服务初始化错误",
-									content:err.metadata.error_data,
-									showCancel: false,
-									confirmText: '知道了',
+						
+						if(type=='univerify'){
+							if(err.metadata.error_data){
+								uni.showToast({
+									title: "一键登陆:"+err.metadata.error_data,
+									icon: 'none'
 								});
-								break;
-							default:
-								break;
+							}
+							switch (err.errCode){
+								case 30002:
+									console.log('在一键登陆界面，点击其他登陆方式');
+									break;
+								case 30003:
+									console.log('关闭了登陆');
+									if(navigateBack){ uni.navigateBack() }
+									break;
+								case 30006:
+									uni.showModal({
+										title: "登陆服务初始化错误",
+										content:err.metadata.error_data,
+										showCancel: false,
+										confirmText: '知道了',
+									});
+									break;
+								default:
+									break;
+							}
 						}
 					}
 				})
@@ -153,7 +184,7 @@
 						uni.setStorageSync('uni_id_uid', result.uid)
 						uni.setStorageSync('uni_id_token', result.token)
 						uni.setStorageSync('uni_id_token_expired', result.tokenExpired)
-				
+
 						delete result.userInfo.token
 						this.setUserInfo(result.userInfo)
 						if(type=='univerify'){
@@ -164,7 +195,18 @@
 							icon: 'none'
 						});
 						uni.hideLoading()
-						uni.navigateBack()
+						var delta = 0
+						//判断需要返回几层
+						let pages = getCurrentPages();
+						console.log(pages);
+						pages.forEach((page,index)=>{
+							console.log(pages[pages.length-index-1].route.split('/'));
+							if(pages[pages.length-index-1].route.split('/')[1] == 'uni-login-page'){
+								delta ++
+							}
+						})
+						console.log('delta:'+delta);
+						uni.navigateBack({delta})
 					}
 				})
 			},
@@ -195,7 +237,6 @@
 		width: 750rpx;
 		justify-content: space-around;
 	}
-
 	.item {
 		flex-direction: column;
 		justify-content: center;
-- 
GitLab