diff --git a/commons/basic/src/main/ets/constants/BasicConstant.ets b/commons/basic/src/main/ets/constants/BasicConstant.ets index 7d32c54..e2b14bb 100644 --- a/commons/basic/src/main/ets/constants/BasicConstant.ets +++ b/commons/basic/src/main/ets/constants/BasicConstant.ets @@ -6,22 +6,22 @@ export class BasicConstant { static readonly getzcxy = "http://app.igandan.com/expert_zcxy.jsp";// 注册协议正式地址 //测试环境 - // static readonly urlExpertAPI = "https://dev-app.igandan.com/app/expertAPI/"; - // static readonly urlExpertApp = "https://dev-app.igandan.com/app/expertApp/" - // static readonly urlHtml = "http://dev-doc.igandan.com/app/" - // static readonly urlImage = "https://dev-doc.igandan.com/app/" - // static readonly urlExpert = "https://dev-app.igandan.com/app/expert/" - // static readonly wxUrl = "https://dev-wx.igandan.com/"; - // static readonly polvId = "11";//保利威视学员id + static readonly urlExpertAPI = "https://dev-app.igandan.com/app/expertAPI/"; + static readonly urlExpertApp = "https://dev-app.igandan.com/app/expertApp/" + static readonly urlHtml = "http://dev-doc.igandan.com/app/" + static readonly urlImage = "https://dev-doc.igandan.com/app/" + static readonly urlExpert = "https://dev-app.igandan.com/app/expert/" + static readonly wxUrl = "https://dev-wx.igandan.com/"; + static readonly polvId = "11";//保利威视学员id //正式环境 - static readonly urlExpertAPI = "https://app.igandan.com/app/expertAPI/"; - static readonly urlExpertApp = "http://app.igandan.com/app/expertApp/" - static readonly urlHtml = "http://doc.igandan.com/app/" - static readonly urlImage = "http://doc.igandan.com/app/" - static readonly urlExpert = "http://app.igandan.com/app/expert/" - static readonly wxUrl = "https://wx.igandan.com/";// 微信服务器地址 - static readonly polvId = "21";//保利威视学员id + // static readonly urlExpertAPI = "https://app.igandan.com/app/expertAPI/"; + // static readonly urlExpertApp = "http://app.igandan.com/app/expertApp/" + // static readonly urlHtml = "http://doc.igandan.com/app/" + // static readonly urlImage = "http://doc.igandan.com/app/" + // static readonly urlExpert = "http://app.igandan.com/app/expert/" + // static readonly wxUrl = "https://wx.igandan.com/";// 微信服务器地址 + // static readonly polvId = "21";//保利威视学员id static readonly getStartpage=BasicConstant.urlExpertApp + "startpage"; diff --git a/commons/basic/src/main/ets/utils/request.ets b/commons/basic/src/main/ets/utils/request.ets index 20a723f..3bb151f 100644 --- a/commons/basic/src/main/ets/utils/request.ets +++ b/commons/basic/src/main/ets/utils/request.ets @@ -8,6 +8,7 @@ import { CryptoJS } from '@ohos/crypto-js' import { Base64Util } from './Base64Util'; import { ChangeUtil } from './ChangeUtil' import { bundleManager} from '@kit.AbilityKit'; +import { deviceInfo } from '@kit.BasicServicesKit'; interface HdRequestOptions { baseURL?: string } @@ -27,7 +28,7 @@ export interface TimestampBean { class HdHttp { baseURL: string - + osFullName: string = deviceInfo.marketName+'/'+ deviceInfo.osFullName; constructor(options: HdRequestOptions) { this.baseURL = options.baseURL || '' } @@ -44,7 +45,8 @@ class HdHttp { // 开发者根据自身业务需要添加header字段 header: { 'Content-Type': 'application/json', - 'sign':this.getSign(extraDatas) + 'sign':this.getSign(extraDatas), + 'User-Agent':this.osFullName }, extraData:ChangeUtil.map2Json(extraDatas) } @@ -79,7 +81,7 @@ class HdHttp { // 开发者根据自身业务需要添加header字段 // 开发者根据自身业务需要添加header字段 header: { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', } } diff --git a/features/mypage/src/main/ets/view/ChooseEmailComp.ets b/features/mypage/src/main/ets/view/ChooseEmailComp.ets index a5480c0..0a9b2a0 100644 --- a/features/mypage/src/main/ets/view/ChooseEmailComp.ets +++ b/features/mypage/src/main/ets/view/ChooseEmailComp.ets @@ -70,7 +70,7 @@ export struct ChooseEmailComp { Column() { // 手机号输入框 Row() { - TextInput({ placeholder: authStore.getUser().email.length>0?authStore.getUser().email:'请输入您的邮箱' }) + TextInput({ placeholder: authStore.getUser().email?authStore.getUser().email:'请输入您的邮箱' }) .fontSize(16) .contentType(ContentType.EMAIL_ADDRESS) .backgroundColor(Color.White) diff --git a/features/register/src/main/ets/view/LoginComp.ets b/features/register/src/main/ets/view/LoginComp.ets index 7abae4a..79b9376 100644 --- a/features/register/src/main/ets/view/LoginComp.ets +++ b/features/register/src/main/ets/view/LoginComp.ets @@ -47,7 +47,7 @@ export struct LoginComp { autoCancel:false }) - osFullName: string = deviceInfo.osFullName; + osFullName: string = deviceInfo.marketName.replace(/[\s\-\p{P}\p{S}]/gu, ''); login() { if (this.loading) return; if (!this.mobile) { diff --git a/products/expert/src/main/ets/pages/BootPage.ets b/products/expert/src/main/ets/pages/BootPage.ets index c721450..96f2507 100644 --- a/products/expert/src/main/ets/pages/BootPage.ets +++ b/products/expert/src/main/ets/pages/BootPage.ets @@ -17,7 +17,7 @@ struct BootPage { @State isLogin:boolean=preferenceStore.getItemBooleanF('isLogin') @State - photoUrl:ResourceStr=$r('app.media.startIcon') + photoUrl:ResourceStr='' @State newUrl:string=''; aboutToAppear(): void { @@ -29,6 +29,7 @@ struct BootPage { getContext().getApplicationContext().getRunningProcessInformation() if(this.isFirstRun) { + this.photoUrl=$r('app.media.startIcon') } else if(this.isLogin) {