diff --git a/src/backyard/preference/Edit.vue b/src/backyard/preference/Edit.vue index e559944..8f61600 100644 --- a/src/backyard/preference/Edit.vue +++ b/src/backyard/preference/Edit.vue @@ -46,7 +46,6 @@ -
@@ -54,6 +53,7 @@
+
@@ -72,6 +72,19 @@
+
+ +
+ +
+
+ +
+ +
+ +
+
diff --git a/src/backyard/preference/Index.vue b/src/backyard/preference/Index.vue index e731ceb..6efae1a 100644 --- a/src/backyard/preference/Index.vue +++ b/src/backyard/preference/Index.vue @@ -52,6 +52,11 @@
+
+ 是否允许用户自主注册： + {{preference.allowRegister?'是':'否'}} +
+
zip下载大小限制： @@ -67,6 +72,12 @@
+ +
+ 用户默认总大小限制： + +
+
diff --git a/src/backyard/user/Login.vue b/src/backyard/user/Login.vue index 3f0b222..3026e04 100644 --- a/src/backyard/user/Login.vue +++ b/src/backyard/user/Login.vue @@ -1,55 +1,55 @@ + + + + diff --git a/src/common/model/preference/Preference.js b/src/common/model/preference/Preference.js index af4d286..5610208 100644 --- a/src/common/model/preference/Preference.js +++ b/src/common/model/preference/Preference.js @@ -22,6 +22,12 @@ export default class Preference extends BaseEntity { this.downloadDirMaxSize = -1 //文件数量 this.downloadDirMaxNum = -1 + //用户默认总大小限制 + this.defaultTotalSizeLimit = -1 + //是否允许自主注册 + this.allowRegister = false + //后台版本 + this.version = null this.validatorSchema = { name: { @@ -45,7 +51,9 @@ export default class Preference extends BaseEntity { copyright: this.copyright, record: this.record, downloadDirMaxNum: this.downloadDirMaxNum, - downloadDirMaxSize: this.downloadDirMaxSize + downloadDirMaxSize: this.downloadDirMaxSize, + defaultTotalSizeLimit: this.defaultTotalSizeLimit, + allowRegister: this.allowRegister } } diff --git a/src/common/model/user/User.js b/src/common/model/user/User.js index ac9ccd5..4dab564 100644 --- a/src/common/model/user/User.js +++ b/src/common/model/user/User.js @@ -14,6 +14,7 @@ export default class User extends BaseEntity { static LOCAL_STORAGE_KEY = "user"; static URL_LOGIN = '/api/user/login' + static URL_REGISTER = '/api/user/register' static URL_LOGOUT = '/api/user/logout' static URL_USER_CHANGE_PASSWORD = '/api/user/change/password' static URL_USER_RESET_PASSWORD = '/api/user/reset/password' @@ -37,9 +38,6 @@ export default class User extends BaseEntity { //local fields this.isLogin = false - //登录的密码，服务器返回字段中没有密码 - this.localPassword = null - this.validatorSchema = { username: { rules: [ @@ -184,45 +182,21 @@ export default class User extends BaseEntity { } - loginValidate() { + httpLogin(username, password, successCallback, errorCallback) { - if (!this.username) { - this.errorMessage = '账号必填' + let that = this + + if (!username) { + this.errorMessage = '用户名必填' return false } - if (!this.localPassword) { + if (!password) { this.errorMessage = '密码必填' return false } - return true - } - - getLoginForm() { - - return { - username: this.username, - password: this.localPassword - } - } - - getResetForm() { - return { - phone: this.phone, - password: this.password - } - } - - httpLogin(successCallback, errorCallback) { - - let that = this - - if (!this.loginValidate()) { - return - } - - let form = this.getLoginForm() + let form = {username, password} this.httpPost(User.URL_LOGIN, form, function (response) { @@ -233,6 +207,33 @@ export default class User extends BaseEntity { }, errorCallback) } + httpRegister(username, password, rePassword, successCallback, errorCallback) { + + let that = this + + if (!username) { + this.errorMessage = '用户名必填' + return + } + + if (!password) { + this.errorMessage = '密码必填' + return + } + + if (rePassword !== password) { + this.errorMessage = '两次密码输入不一致' + return + } + + let form = {username, password} + + this.httpPost(User.URL_REGISTER, form, function (response) { + that.innerLogin(response) + that.safeCallback(successCallback)(response) + }, errorCallback) + } + httpLogout(successCallback, errorCallback) { let that = this diff --git a/src/common/router/index.js b/src/common/router/index.js index 59fe214..4f70f4b 100644 --- a/src/common/router/index.js +++ b/src/common/router/index.js @@ -5,7 +5,8 @@ import ShareList from '../../backyard/share/List' import ShareDetail from '../../backyard/share/Detail' import MatterList from '../../backyard/matter/List' import MatterDetail from '../../backyard/matter/Detail' -import UserLogin from '../../backyard/user/Login.vue' +import UserLogin from '../../backyard/user/Login' +import UserRegister from '../../backyard/user/Register' import UserList from '../../backyard/user/List' import UserDetail from '../../backyard/user/Detail' import UserChangePassword from '../../backyard/user/ChangePassword' @@ -44,7 +45,6 @@ const router = new Router({ ] } }, - { path: 'matter/detail/:uuid', name: 'MatterDetail', @@ -74,6 +74,16 @@ const router = new Router({ breadcrumbs: [] } }, + { + path: 'user/register', + name: 'UserRegister', + component: UserRegister, + meta: { + title: '注册', + requiresAuth: false, + breadcrumbs: [] + } + }, { path: 'user/list', name: 'UserList', @@ -183,8 +193,7 @@ const router = new Router({ meta: { title: '分享详情', requiresAuth: false, - breadcrumbs: [ - ] + breadcrumbs: [] } }, {