增加 clientType 区分普通用户还是管理员

uni_modules/uni-id-pages/common/login-page.mixin.js

@@ -4,40 +4,45 @@ let mixin = {
 	data() {
 		return {
 			config,
+			redirect: '',
 			isMounted: false
 		}
 	},
 	onUnload() {
 		// #ifdef H5
-		document.onkeydown = false
+		document.onkeydown = false
 		// #endif
 	},
 	mounted() {
-		this.isMounted = true;
+		this.isMounted = true;
 	},
 	onLoad(e) {
-		if (e.is_weixin_redirect) {
-			uni.showLoading({
-				mask: true
-			})
-			
-			if( window.location.href.includes('#') ){
-				// 将url通过 ? 分割获取后面的参数字符串 再通过 & 将每一个参数单独分割出来
-				let paramsArr = window.location.href.split('?')[1].split('&')
-				paramsArr.forEach(item=>{
-					let arr = item.split('=')
-					if(arr[0] == 'code'){
-						 e.code = arr[1]
-					}
-				})
-			}
+		if (e.is_weixin_redirect) {
+			uni.showLoading({
+				mask: true
+			})
+
+			if( window.location.href.includes('#') ){
+				// 将url通过 ? 分割获取后面的参数字符串 再通过 & 将每一个参数单独分割出来
+				let paramsArr = window.location.href.split('?')[1].split('&')
+				paramsArr.forEach(item=>{
+					let arr = item.split('=')
+					if(arr[0] == 'code'){
+						 e.code = arr[1]
+					}
+				})
+			}
 			this.$nextTick(n => {
-				console.log(this.$refs.uniFabLogin);
+				console.log(this.$refs.uniFabLogin);
 				this.$refs.uniFabLogin.login({
 					code:e.code
 				}, 'weixin')
 			})
 		}
+
+		if (e.redirect) {
+			this.redirect = e.redirect
+		}
 	},
 	computed: {
 		needAgreements() {
@@ -66,12 +71,18 @@ let mixin = {
 					console.log('不存在 隐私政策协议组件');
 				}
 			}
+		},
+		isAdmin () {
+			return config.clientType === "admin"
 		}
 	},
 	methods: {
 		loginSuccess(e) {
-			loginSuccess(e)
+			loginSuccess({
+				...e,
+				redirect: this.redirect
+			})
 		}
 	}
 }
-export default mixin
+export default mixin

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

+import pagesJson from '@/pages.json'
+
 export default function(e = {}) {
 	const {
-		showToast = true, toastText = '登录成功', autoBack = true
+		showToast = true, toastText = '登录成功', autoBack = true, redirect = ''
 	} = e
 	console.log({
 		toastText,
@@ -14,24 +16,35 @@ export default function(e = {}) {
 	}
 	if (autoBack) {
 		let delta = 0; //判断需要返回几层
-		let pages = getCurrentPages();
+		let pages = getCurrentPages();
 		uni.$emit('uni-id-pages-login-success',pages)
-		console.log(pages);
+		console.log(pages);
 		pages.forEach((page, index) => {
 			if (pages[pages.length - index - 1].route.split('/')[3] == 'login') {
 				delta++
 			}
-		})
-		console.log('判断需要返回几层:',pages, delta);
-		// #ifdef H5
-		if(e.loginType == 'weixin'){
-			console.log('window.history',window.history);
-			return window.history.go(-3)
-		}
-		// #endif
-		
+		})
+		console.log('判断需要返回几层:',pages, delta);
+		// #ifdef H5
+		if (redirect) {
+			return uni.reLaunch({
+				url: redirect
+			})
+		}
+		if(e.loginType == 'weixin'){
+			console.log('window.history',window.history);
+			return window.history.go(-3)
+		}
+		if (delta) {
+			const page = pagesJson.pages[0]
+			return uni.reLaunch({
+				url: `/${page.path}`
+			})
+		}
+		// #endif
+
 		uni.navigateBack({
 			delta
 		})
 	}
-}
+}

uni_modules/uni-id-pages/config.js

@@ -5,6 +5,7 @@ export default {
 		登录类型 未列举到的或运行环境不支持的，将被自动隐藏。
 		如果需要在不同平台有不同的配置，直接用条件编译即可
 	*/
+	"clientType": "user", // 客户端类型 user 普通用户，admin 管理员
 	"loginTypes": [
 		// "qq",
 		// "xiaomi",
@@ -43,13 +44,13 @@ export default {
 			"web": "xxxxxx"
 		}
 	},
-	/**
-	 * 密码强度 
-	 * super（超强：密码必须包含大小写字母、数字和特殊符号，长度范围：8-16位之间） 
-	 * strong（强: 密密码必须包含字母、数字和特殊符号，长度范围：8-16位之间） 
-	 * medium (中：密码必须为字母、数字和特殊符号任意两种的组合，长度范围：8-16位之间) 
-	 * weak（弱：密码必须包含字母和数字，长度范围：6-16位之间）
-	 * 为空或false则不验证密码强度
-	 */
+	/**
+	 * 密码强度
+	 * super（超强：密码必须包含大小写字母、数字和特殊符号，长度范围：8-16位之间）
+	 * strong（强: 密密码必须包含字母、数字和特殊符号，长度范围：8-16位之间）
+	 * medium (中：密码必须为字母、数字和特殊符号任意两种的组合，长度范围：8-16位之间)
+	 * weak（弱：密码必须包含字母和数字，长度范围：6-16位之间）
+	 * 为空或false则不验证密码强度
+	 */
 	"passwordStrength":"medium"
-}
+}

uni_modules/uni-id-pages/pages/login/login-withpwd.vue

@@ -21,11 +21,11 @@
 		<button class="uni-btn" type="primary" @click="pwdLogin">登录</button>
 		<!-- 忘记密码 -->
 		<view class="link-box">
-			<view>
+			<view v-if="!isAdmin">
 				<text class="forget">忘记了？</text>
 				<text class="link" @click="toRetrievePwd">找回密码</text>
 			</view>
-			<text class="link" @click="toRegister">注册账号</text>
+			<text class="link" @click="toRegister">{{isAdmin ? '注册管理员账号': '注册账号'}}</text>
 		</view>
 		<!-- 悬浮登录方式组件 -->
 		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
@@ -99,16 +99,16 @@
 						icon: 'none'
 					});
 				}
-				
+
 				if (this.needAgreements && !this.agree) {
 					return this.$refs.agreements.popup(this.pwdLogin)
 				}
-				
+
 				let data = {
 					"password": this.password,
 					"captcha": this.captcha
 				}
-				
+
 				if (/^1\d{10}$/.test(this.username)) {
 					data.mobile = this.username
 				}else if(/@/.test(this.username)) {
@@ -116,7 +116,7 @@
 				}else{
 					data.username = this.username
 				}
-				
+
 				uniIdCo.login(data).then(e => {
 					this.loginSuccess(e)
 				}).catch(e => {
@@ -128,13 +128,12 @@
 					}
 				})
 			},
-			/* 前往注册 */
-			toRegister(e) {
-				console.log(e);
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/register/register'
-				})
-			}
+      /* 前往注册 */
+      toRegister() {
+        uni.navigateTo({
+          url: this.isAdmin ? '/uni_modules/uni-id-pages/pages/register/register-admin': '/uni_modules/uni-id-pages/pages/register/register'
+        })
+      }
 		}
 	}
 </script>
@@ -142,7 +141,7 @@
 <style lang="scss" scoped>
 	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
 	@media screen and (min-width: 690px) {
-		
+
 	}
 	.forget{
 		font-size: 12px;

uni_modules/uni-id-pages/pages/register/register-admin.vue

+<!-- 创建超级管理员 -->
+<template>
+	<view class="uni-content">
+		<match-media :min-width="690">
+			<view class="login-logo">
+				<image :src="logo"></image>
+			</view>
+			<!-- 顶部文字 -->
+			<text class="title title-box">创建超级管理员</text>
+		</match-media>
+		<uni-forms ref="form" :value="formData" :rules="rules" validate-trigger="submit" err-show-type="toast">
+			<uni-forms-item name="username" required>
+				<uni-easyinput :inputBorder="false" :focus="focusUsername" @blur="focusUsername = false"
+					class="input-box" placeholder="请输入用户名" v-model="formData.username" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="nickname">
+				<uni-easyinput :inputBorder="false" :focus="focusNickname" @blur="focusNickname = false" class="input-box" placeholder="请输入用户昵称" v-model="formData.nickname"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password" v-model="formData.password" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword" @blur="focusPassword = false"
+					class="input-box" maxlength="20" :placeholder="'请输入' + (config.passwordStrength == 'weak'?'6':'8') + '-16位密码'" type="password"
+					v-model="formData.password" trim="both" />
+			</uni-forms-item>
+			<uni-forms-item name="password2" v-model="formData.password2" required>
+				<uni-easyinput :inputBorder="false" :focus="focusPassword2" @blur="focusPassword2 =false"
+					class="input-box" placeholder="再次输入密码" maxlength="20" type="password" v-model="formData.password2"
+					trim="both" />
+			</uni-forms-item>
+			<uni-forms-item>
+				<uni-captcha ref="captcha" scene="register" v-model="formData.captcha" />
+			</uni-forms-item>
+			<uni-id-pages-agreements scope="register" ref="agreements" ></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="submit">注册</button>
+			<button @click="navigateBack" class="register-back">返回</button>
+			<match-media :min-width="690">
+				<view class="link-box">
+					<text class="link" @click="toLogin">已有账号？点此登录</text>
+				</view>
+			</match-media>
+		</uni-forms>
+	</view>
+</template>
+
+<script>
+	import rules from './validator.js';
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	const uniIdCo = uniCloud.importObject("uni-id-co", {customUI: true})
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				formData: {
+					username: "",
+					nickname: "",
+					password: "",
+					password2: "",
+					captcha: ""
+				},
+				rules,
+				focusUsername:false,
+				focusNickname:false,
+				focusPassword:false,
+				focusPassword2:false,
+				logo: "/static/logo.png"
+			}
+		},
+		onReady() {
+			this.$refs.form.setRules(this.rules)
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.submit()
+				}
+			};
+			// #endif
+		},
+		methods: {
+			/**
+			 * 触发表单提交
+			 */
+			submit() {
+				this.$refs.form.validate().then((res) => {
+					if(this.formData.captcha.length != 4){
+						this.$refs.captcha.focusCaptchaInput = true
+						return uni.showToast({
+							title: '请输入验证码',
+							icon: 'none'
+						});
+					}
+					if (this.needAgreements && !this.agree) {
+						return this.$refs.agreements.popup(()=>{
+							this.submitForm(res)
+						})
+					}
+					this.submitForm(res)
+				}).catch((errors) => {
+					let key = errors[0].key
+					key = key.replace(key[0], key[0].toUpperCase())
+					console.log(key);
+					this['focus'+key] = true
+				})
+			},
+			submitForm(params) {
+				uniIdCo.registerAdmin(this.formData).then(e => {
+					console.log(e);
+					uni.navigateBack()
+				})
+				.catch(e => {
+					console.log(e);
+					console.log(e.message);
+					//更好的体验：登录错误，直接刷新验证码
+					this.$refs.captcha.getImageCaptcha()
+					uni.showModal({
+						title: '提示',
+						content: e.errMsg || `创建失败: ${e.errCode}`,
+						showCancel: false
+					})
+				})
+			},
+			navigateBack() {
+				uni.navigateBack()
+			},
+			toLogin() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+				})
+			},
+			registerByEmail() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/register/register-by-email'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+	
+	@media screen and (max-width: 690px) {
+		.uni-content{
+			margin-top: 15px;
+			height: 100%;
+			background-color: #fff;
+		}
+	}
+	@media screen and (min-width: 690px) {
+		.uni-content{
+			padding: 30px 40px 60px;
+		}
+		
+		.link-box {
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex-direction: row;
+			justify-content: space-between;
+			margin-top: 10px;
+		}
+		
+		.link {
+			font-size: 12px;
+		}
+	}
+	
+	.uni-content ::v-deep .uni-forms-item__label {
+		position: absolute;
+		left: -15px;
+	}
+
+	button {
+		margin-top: 15px;
+	}
+</style>