diff --git a/public/favicon.ico b/public/favicon.ico
index fea5aa5..1da54e4 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/system/roleAdminister/index.js b/src/api/system/roleAdminister/index.js
index b9c8ce2..b012702 100644
--- a/src/api/system/roleAdminister/index.js
+++ b/src/api/system/roleAdminister/index.js
@@ -125,7 +125,7 @@ export function saveRoleMenuList(data) {
// 菜单授权
export function roleMenuTree(data) {
return request({
- url: `/oms/apiadmin/sysmenu/listAllByRoleSid`,
+ url: `/oms/apiadmin/sysmenu/listAllByRoleSidG`,
method: 'POST',
data: data,
headers: {
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 93fe65a..4294f8f 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -75,7 +75,7 @@
密码
-
验证码
@@ -83,13 +83,14 @@
style="display: flex;flex-direction: row;align-items: center;width: 100%; margin-top: 5px;margin-left: -10px;">
- {{sendCodeText2}}
+ {{sendCodeText2}}
已有账号?
- 登录
+ 登录
@@ -121,9 +122,9 @@
{{item.orgName}}
-
+
-
+
@@ -218,6 +219,7 @@
check: false,
registerInfo: {
mobile: '',
+ password: "",
userSid: "",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44', // oms 资源sid
},
@@ -450,6 +452,16 @@
},
registerStep1() {
+ var passwordreg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{8,16}$/
+
+ if (!passwordreg.test(this.registerInfo.password)) {
+ this.$message({
+ message: '密码格式错误,必须为8至16位大小写字母和数字的组合',
+ type: 'warning'
+ })
+ return
+ }
+
if (!this.check) {
this.$message({
message: '请阅读并同意《宇信通服务协议》与《隐私协议》',
@@ -550,7 +562,8 @@
var params = {
userSid: this.registerInfo.userSid,
- orgSid: item.orgSid
+ orgSid: item.orgSid,
+ sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44', // oms 资源sid
}
selOrganization(params).then((response) => {