修复创造者账号无法登录问题

@@ -84,7 +84,11 @@ export class LoginModel {
   // {"password":"523acd319228efde34e8a30268ee8ca5e4fc421d72affa531676e1765940d22c","phone":"13625644528","loginType":0,"oldPassword":"BA5FD74F827AF9B271FE17CADC489C36","deviceId":"60da5af6-9c59-3566-8622-8c6c00710994"}
   // {"password":"523acd319228efde34e8a30268ee8ca5e4fc421d72affa531676e1765940d22c","phone":"13625644528","loginType":0,"oldPassword":"BA5FD74F827AF9B271FE17CADC489C36","deviceId":"60da5af6-9c59-3566-8622-8c6c00710994"}
   appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
   appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
     let bean: Record<string, string | number> = {};
     let bean: Record<string, string | number> = {};
-    bean['phone'] = phone
+    if (loginType == 0) {
+      bean['phone'] = phone
+    } else {
+      bean['userName'] = phone
+    }
     bean['loginType'] = loginType
     bean['loginType'] = loginType
     bean['deviceId'] = '60da5af6-9c59-3566-8622-8c6c00710994'
     bean['deviceId'] = '60da5af6-9c59-3566-8622-8c6c00710994'
     bean['password'] = password
     bean['password'] = password

@@ -196,7 +196,6 @@ struct LoginPage {
     Column() {
     Column() {
       TextInput({ placeholder: "请输入账号", controller: this.phoneController })
       TextInput({ placeholder: "请输入账号", controller: this.phoneController })
         .fontSize(16)
         .fontSize(16)
-        .maxLength(11)
         .height(48)
         .height(48)
         .backgroundColor("#F5F5F5")
         .backgroundColor("#F5F5F5")
         .borderRadius(4)
         .borderRadius(4)

 import { Logger } from 'wdKit/src/main/ets/utils/Logger'
 import { Logger } from 'wdKit/src/main/ets/utils/Logger'
 import { LoginModel } from './LoginModel'
 import { LoginModel } from './LoginModel'
 import { LoginBean } from './LoginBean'
 import { LoginBean } from './LoginBean'
-import { SPHelper } from 'wdKit'
+import { SPHelper, StringUtils } from 'wdKit'
 import { CheckVerifyBean } from './CheckVerifyBean'
 import { CheckVerifyBean } from './CheckVerifyBean'
 import cryptoFramework from '@ohos.security.cryptoFramework'
 import cryptoFramework from '@ohos.security.cryptoFramework'
 import buffer from '@ohos.buffer'
 import buffer from '@ohos.buffer'
@@ -66,11 +66,17 @@ export class LoginViewModel {
   }
   }
 
 
   async appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
   async appLoginByPassword(phone: string, loginType: number, password: string, oldPassword: string) {
-
+    let newLoginType: number
+    let isPhone = this.verifyIsPhoneNumber(phone)
+    if (isPhone) {
+      newLoginType = 0;
+    } else {
+      newLoginType = 8;
+    }
     return new Promise<LoginBean>(async (success, fail) => {
     return new Promise<LoginBean>(async (success, fail) => {
       let passwordNew = await this.doMd(password)
       let passwordNew = await this.doMd(password)
       Logger.debug(TAG, "PASSWORD:" + passwordNew)
       Logger.debug(TAG, "PASSWORD:" + passwordNew)
-      this.loginModel.appLoginByPassword(phone, loginType, passwordNew, oldPassword).then((data: LoginBean) => {
+      this.loginModel.appLoginByPassword(phone, newLoginType, passwordNew, oldPassword).then((data: LoginBean) => {
         SPHelper.default.saveSync(SpConstants.USER_FIRST_MARK, data.firstMark)
         SPHelper.default.saveSync(SpConstants.USER_FIRST_MARK, data.firstMark)
         SPHelper.default.saveSync(SpConstants.USER_ID, data.id)
         SPHelper.default.saveSync(SpConstants.USER_ID, data.id)
         SPHelper.default.saveSync(SpConstants.USER_JWT_TOKEN, data.jwtToken)
         SPHelper.default.saveSync(SpConstants.USER_JWT_TOKEN, data.jwtToken)
@@ -234,4 +240,18 @@ export class LoginViewModel {
       })
       })
     })
     })
   }
   }
+
+
+  public verifyIsPhoneNumber(phone: string): boolean {
+    const regex = /^1[3-9]\d{9}$/;
+    let isMatch: boolean;
+    if (StringUtils.isEmpty(phone)) {
+      return false;
+    } else if (phone.length != 11) {
+      return false;
+    } else {
+      isMatch = regex.test(phone)
+    }
+    return isMatch;
+  }
 }
 }