Showing
6 changed files
with
52 additions
and
17 deletions
| @@ -205,6 +205,18 @@ | @@ -205,6 +205,18 @@ | ||
| 205 | ] | 205 | ] |
| 206 | } | 206 | } |
| 207 | ] | 207 | ] |
| 208 | + }, | ||
| 209 | + { | ||
| 210 | + "name": "wdLogin", | ||
| 211 | + "srcPath": "./features/wdLogin", | ||
| 212 | + "targets": [ | ||
| 213 | + { | ||
| 214 | + "name": "default", | ||
| 215 | + "applyToProducts": [ | ||
| 216 | + "default" | ||
| 217 | + ] | ||
| 218 | + } | ||
| 219 | + ] | ||
| 208 | } | 220 | } |
| 209 | ] | 221 | ] |
| 210 | } | 222 | } |
| @@ -17,4 +17,6 @@ export { ViewType } from './src/main/ets/enum/ViewType'; | @@ -17,4 +17,6 @@ export { ViewType } from './src/main/ets/enum/ViewType'; | ||
| 17 | 17 | ||
| 18 | export { DurationEnum } from './src/main/ets/enum/DurationEnum'; | 18 | export { DurationEnum } from './src/main/ets/enum/DurationEnum'; |
| 19 | 19 | ||
| 20 | -export { ScreenType } from './src/main/ets/enum/ScreenType'; | ||
| 20 | +export { ScreenType } from './src/main/ets/enum/ScreenType'; | ||
| 21 | + | ||
| 22 | +export { SpConstants } from './src/main/ets/constants/SpConstants'; |
| 1 | + | ||
| 2 | +export class SpConstants{ | ||
| 3 | + static USER_JWT_TOKEN="jwtToken" | ||
| 4 | + static USER_REFRESH_TOKEN="refreshToken" | ||
| 5 | + static USER_Type="userType" | ||
| 6 | + static USER_NAME="userName" | ||
| 7 | + static USER_ID="userId" | ||
| 8 | + static USER_FIRST_MARK="firstMark" | ||
| 9 | + static USER_LONG_TIME_NO_LOGIN_MARK="longTimeNoLoginMark" | ||
| 10 | + static USER_STATUS="user_status" | ||
| 11 | + static USER_TEMP_TOKEN="tempToken" | ||
| 12 | + | ||
| 13 | +} |
| @@ -78,7 +78,7 @@ export struct LoginInputComponent { | @@ -78,7 +78,7 @@ export struct LoginInputComponent { | ||
| 78 | }) | 78 | }) |
| 79 | 79 | ||
| 80 | 80 | ||
| 81 | - }.margin({ top: 15 }).height(61).alignItems(VerticalAlign.Center).justifyContent(FlexAlign.Start) | 81 | + }.margin({ top: 12 }).height(48).alignItems(VerticalAlign.Center).justifyContent(FlexAlign.Start) |
| 82 | 82 | ||
| 83 | } | 83 | } |
| 84 | } | 84 | } |
| @@ -209,9 +209,9 @@ struct LoginPage { | @@ -209,9 +209,9 @@ struct LoginPage { | ||
| 209 | .id("password_icon") | 209 | .id("password_icon") |
| 210 | 210 | ||
| 211 | }.margin({ top: 12 }) | 211 | }.margin({ top: 12 }) |
| 212 | - .height(61) | 212 | + .height(48) |
| 213 | .width('100%') | 213 | .width('100%') |
| 214 | - }.padding({ left: 32, right: 32 }).width('100%').margin({ top: 46 }) | 214 | + }.padding({ left: 25, right: 25 }).width('100%').margin({ top: 36 }) |
| 215 | 215 | ||
| 216 | } | 216 | } |
| 217 | 217 |
| @@ -5,6 +5,9 @@ import { SPHelper } from 'wdKit' | @@ -5,6 +5,9 @@ import { SPHelper } from 'wdKit' | ||
| 5 | import { CheckVerifyBean } from './CheckVerifyBean' | 5 | import { CheckVerifyBean } from './CheckVerifyBean' |
| 6 | import cryptoFramework from '@ohos.security.cryptoFramework' | 6 | import cryptoFramework from '@ohos.security.cryptoFramework' |
| 7 | import buffer from '@ohos.buffer' | 7 | import buffer from '@ohos.buffer' |
| 8 | +import { | ||
| 9 | + SpConstants | ||
| 10 | +} from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants' | ||
| 8 | 11 | ||
| 9 | const TAG = "LoginViewModel" | 12 | const TAG = "LoginViewModel" |
| 10 | 13 | ||
| @@ -31,15 +34,14 @@ export class LoginViewModel { | @@ -31,15 +34,14 @@ export class LoginViewModel { | ||
| 31 | 34 | ||
| 32 | return new Promise<LoginBean>((success, fail) => { | 35 | return new Promise<LoginBean>((success, fail) => { |
| 33 | this.loginModel.appLogin(phone, loginType, verificationCode).then((data: LoginBean) => { | 36 | this.loginModel.appLogin(phone, loginType, verificationCode).then((data: LoginBean) => { |
| 34 | - //todo 保存登录数据 | ||
| 35 | - SPHelper.default.save("firstMark", data.firstMark) | ||
| 36 | - SPHelper.default.save("id", data.id) | ||
| 37 | - SPHelper.default.save("jwtToken", data.jwtToken) | ||
| 38 | - SPHelper.default.save("longTimeNoLoginMark", data.longTimeNoLoginMark) | ||
| 39 | - SPHelper.default.save("refreshToken", data.refreshToken) | ||
| 40 | - SPHelper.default.save("status", data.status) | ||
| 41 | - SPHelper.default.save("userType", data.userType) | ||
| 42 | - SPHelper.default.save("userName", data.userName) | 37 | + SPHelper.default.save(SpConstants.USER_FIRST_MARK, data.firstMark) |
| 38 | + SPHelper.default.save(SpConstants.USER_ID, data.id) | ||
| 39 | + SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken) | ||
| 40 | + SPHelper.default.save(SpConstants.USER_LONG_TIME_NO_LOGIN_MARK, data.longTimeNoLoginMark) | ||
| 41 | + SPHelper.default.save(SpConstants.USER_REFRESH_TOKEN, data.refreshToken) | ||
| 42 | + SPHelper.default.save(SpConstants.USER_STATUS, data.status) | ||
| 43 | + SPHelper.default.save(SpConstants.USER_Type, data.userType) | ||
| 44 | + SPHelper.default.save(SpConstants.USER_NAME, data.userName) | ||
| 43 | 45 | ||
| 44 | success(data) | 46 | success(data) |
| 45 | }).catch(() => { | 47 | }).catch(() => { |
| @@ -54,8 +56,14 @@ export class LoginViewModel { | @@ -54,8 +56,14 @@ export class LoginViewModel { | ||
| 54 | let passwordNew = await this.doMd(password) | 56 | let passwordNew = await this.doMd(password) |
| 55 | Logger.debug(TAG, "PASSWORD:" + passwordNew) | 57 | Logger.debug(TAG, "PASSWORD:" + passwordNew) |
| 56 | this.loginModel.appLoginByPassword(phone, loginType, passwordNew, oldPassword).then((data: LoginBean) => { | 58 | this.loginModel.appLoginByPassword(phone, loginType, passwordNew, oldPassword).then((data: LoginBean) => { |
| 57 | - //todo 保存登录数据 | ||
| 58 | - SPHelper.default.save("userName", data.userName) | 59 | + SPHelper.default.save(SpConstants.USER_FIRST_MARK, data.firstMark) |
| 60 | + SPHelper.default.save(SpConstants.USER_ID, data.id) | ||
| 61 | + SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken) | ||
| 62 | + SPHelper.default.save(SpConstants.USER_LONG_TIME_NO_LOGIN_MARK, data.longTimeNoLoginMark) | ||
| 63 | + SPHelper.default.save(SpConstants.USER_REFRESH_TOKEN, data.refreshToken) | ||
| 64 | + SPHelper.default.save(SpConstants.USER_STATUS, data.status) | ||
| 65 | + SPHelper.default.save(SpConstants.USER_Type, data.userType) | ||
| 66 | + SPHelper.default.save(SpConstants.USER_NAME, data.userName) | ||
| 59 | 67 | ||
| 60 | success(data) | 68 | success(data) |
| 61 | }).catch((value: string) => { | 69 | }).catch((value: string) => { |
| @@ -69,8 +77,8 @@ export class LoginViewModel { | @@ -69,8 +77,8 @@ export class LoginViewModel { | ||
| 69 | return new Promise<CheckVerifyBean>((success, reject) => { | 77 | return new Promise<CheckVerifyBean>((success, reject) => { |
| 70 | this.loginModel.checkVerifyCode(phone, verifyCode).then((data: CheckVerifyBean) => { | 78 | this.loginModel.checkVerifyCode(phone, verifyCode).then((data: CheckVerifyBean) => { |
| 71 | //todo 保存数据 | 79 | //todo 保存数据 |
| 72 | - SPHelper.default.save("tempToken", data.temToken) | ||
| 73 | - SPHelper.default.save("jwtToken", data.jwtToken) | 80 | + SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.temToken) |
| 81 | + SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken) | ||
| 74 | success(data) | 82 | success(data) |
| 75 | 83 | ||
| 76 | }, (value: string) => { | 84 | }, (value: string) => { |
-
Please register or login to post a comment