Merge branch 'dev' into 'master'

1.0.18

See merge request !5

uni_modules/uni-id-pages/changelog.md

+## 1.0.18（2022-09-20）
+- 修复 微信小程序端 WXSS 编译报错的bug
+## 1.0.17（2022.09-19）
+- 修复 无法退出登录的bug
+## 1.0.16（2022-09-19）
+- 修复 在 Edge 浏览器下 input[type="password"] 会出现浏览器自带的密码查看按钮
+- 优化 退出登录重定向页面为 uniIdRouter.loginPage
+- 新增 注册账号页面支持返回登录页面
 ## 1.0.15（2022-09-19）
 - 更新表结构，解决在uni-admin中部分clientDB操作没有权限的问题
 ## 1.0.14（2022-09-16）

uni_modules/uni-id-pages/common/common.js

-import config from '../config'
+import pagesJson from '@/pages.json'
 const uniIdCo = uniCloud.importObject("uni-id-co")
 export default {
 	async logout() {
@@ -6,10 +6,8 @@ export default {
 		uni.removeStorageSync('uni_id_token');
 		uni.setStorageSync('uni_id_token_expired', 0)
 		uni.redirectTo({
-			url: config.isAdmin ? '/uni_modules/uni-id-pages/pages/login/login-withpwd': '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+			url: `/${pagesJson.uniIdRouter?.loginPage ?? 'uni_modules/uni-id-pages/pages/login/login-withoutpwd'}`,
 		});
-		// uniIdRouter -> loginPage
-		
 		uni.$emit('uni-id-pages-logout')
 	},
 }

uni_modules/uni-id-pages/common/login-page.scss

+// 隐藏 edge 浏览器的密码查看按钮
+
+/* #ifdef H5 */
+.input-box ::v-deep{
+  .uni-input-input[type="password"] {
+    &::-ms-reveal {
+      display: none;
+    }
+  }
+}
+/* #endif */
+
 .uni-content {
   padding: 0 60rpx;
 }
@@ -15,13 +27,13 @@
 	margin-left: calc(50% - 200px);
 	/* #endif */
 	/* #ifdef H5 */
-	margin: 0 auto;
-	position: relative;
-	top: 100px;
+	margin: 0 auto;
+	position: relative;
+	top: 100px;
 	padding: 30px 40px 80px 40px;
 	max-width: 450px;
 	max-height: 450px;
-	border-radius: 10px;
+	border-radius: 10px;
 	box-shadow: 0 0 20px #efefef;
 	background-color: #FFF;
 	/* #endif */
@@ -31,12 +43,12 @@
   	display: flex;
   	justify-content: center;
   }
-  
+
   .login-logo image {
 	width: 60px;
   	height: 60px;
   }
-  
+
   .register-back{
 	  display: none;
   }
@@ -95,9 +107,8 @@
 	margin: 15px 0 0 0;
 	color: #FFF !important;
 	border-radius: 5px;
-}
-
-.uni-body.uni_modules-uni-id-pages-pages-login-login-withoutpwd{
-	height: auto !important;
-}
-	
\ No newline at end of file
+}
+
+.uni-body.uni_modules-uni-id-pages-pages-login-login-withoutpwd{
+	height: auto !important;
+}

uni_modules/uni-id-pages/package.json

 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.0.15",
+	"version": "1.0.18",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",

uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email.vue

@@ -31,7 +31,8 @@
 				<view class="link-box">
 					<text class="link" @click="retrieveByPhone">通过手机验证码找回密码</text>
 					<view></view>
-				</view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
 			</match-media>
 		</uni-forms>
 		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
@@ -182,7 +183,12 @@
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve'
 				})
-			}
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
 		}
 	}
 </script>
@@ -199,7 +205,7 @@
 		.uni-content{
 			padding: 30px 40px 40px;
 		}
-		
+
 		.link-box {
 			/* #ifndef APP-NVUE */
 			display: flex;
@@ -208,7 +214,7 @@
 			justify-content: space-between;
 			margin-top: 10px;
 		}
-		
+
 		.link {
 			font-size: 12px;
 		}

uni_modules/uni-id-pages/pages/retrieve/retrieve.vue

@@ -31,7 +31,8 @@
 				<view class="link-box">
 					<text class="link" @click="retrieveByEmail">通过邮箱验证码找回密码</text>
 					<view></view>
-				</view>
+          <text class="link" @click="backLogin">返回登录</text>
+        </view>
 			</match-media>
 		</uni-forms>
 		<uni-popup-captcha @confirm="submit" v-model="formData.captcha" scene="reset-pwd-by-sms" ref="popup"></uni-popup-captcha>
@@ -206,7 +207,12 @@
 				uni.navigateTo({
 					url: '/uni_modules/uni-id-pages/pages/retrieve/retrieve-by-email'
 				})
-			}
+			},
+      backLogin () {
+        uni.redirectTo({
+          url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+        })
+      }
 		}
 	}
 </script>
@@ -231,7 +237,7 @@
 			justify-content: space-between;
 			margin-top: 10px;
 		}
-		
+
 		.link {
 			font-size: 12px;
 		}

uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd.vue

@@ -31,7 +31,8 @@
 
 <script>
 	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	const uniIdCo = uniCloud.importObject("uni-id-co", {
+  import passwordMod from '@/uni_modules/uni-id-pages/common/password.js'
+  const uniIdCo = uniCloud.importObject("uni-id-co", {
 		customUI:true
 	})
 	export default {
@@ -58,37 +59,8 @@
 							}
 						]
 					},
-					newPassword: {
-						rules: [{
-								required: true,
-								errorMessage: '请输入新密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							}
-						]
-					},
-					newPassword2: {
-						rules: [{
-								required: true,
-								errorMessage: '请确认密码',
-							},
-							{
-								pattern: /^.{6,20}$/,
-								errorMessage: '密码为6 - 20位',
-							},
-							{
-								validateFunction: function(rule, value, data, callback) {
-									if (value != data.newPassword) {
-										callback('两次输入密码不一致')
-									};
-									return true
-								}
-							}
-						]
-					}
-				},
+          ...passwordMod.getPwdRules('newPassword', 'newPassword2')
+        },
 				logo: "/static/logo.png"
 			}
 		},
@@ -122,16 +94,16 @@
 								oldPassword,
 								newPassword
 							}).then(e => {
-								console.log(e);
-								uni.removeStorageSync('uni_id_token');
+								console.log(e);
+								uni.removeStorageSync('uni_id_token');
 								uni.setStorageSync('uni_id_token_expired', 0)
-								uni.redirectTo({
-									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
+								uni.redirectTo({
+									url:'/uni_modules/uni-id-pages/pages/login/login-withpwd'
 								})
-							}).catch(e => {
-								uni.showModal({
-									content: e.message,
-									showCancel: false
+							}).catch(e => {
+								uni.showModal({
+									content: e.message,
+									showCancel: false
 								});
 							})
 					}).catch(errors => {
@@ -153,10 +125,10 @@
 			margin-top: 15px;
 		}
 	}
-	
+
 	@media screen and (min-width: 690px) {
 		.uni-content{
 			padding: 30px 40px 40px;
 		}
 	}
-</style>
+</style>

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package-lock.json

 {
   "name": "uni-id-co",
-  "version": "1.0.15",
+  "version": "1.0.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json

 {
   "name": "uni-id-co",
-  "version": "1.0.15",
+  "version": "1.0.18",
   "description": "",
   "main": "index.js",
   "keywords": [],