修复设置密码接口异常

@@ -14,6 +14,16 @@ export class WDRouterPage {
     return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}`
   }
 
+  static getLoginBundleInfo() {
+    let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
+    return `@bundle:${bundleInfo.name}/${"wdLogin"}/${"ets/pages/login/LoginPage"}`
+  }
+
+  static getSettingBundleInfo() {
+    let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
+    return `@bundle:${bundleInfo.name}/${"wdComponent"}/${"ets/components/page/SettingPage"}`
+  }
+
 
   url() {
     let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)

 export interface  CheckVerifyBean{
-  temToken: string
+  tempToken: string
   jwtToken: string
 }
\ No newline at end of file

@@ -200,36 +200,15 @@ export class LoginModel {
     bean['tempToken'] = tempToken;
 
     let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
-    // let JwtToken = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, '') as string;
-    // headers.set('JwtToken',(JwtToken));
-    // headers.set('rmrb-x-token',(JwtToken));
-    // headers.set('cookie', 'RMRB-X-TOKEN=' + JwtToken)
 
-
-//     let obj: Record<string, string> = {};
-//     headers.forEach((value, key) =>{
-//       if(key != undefined && key != null && value != undefined && value != null)      {
-//        obj[key as string] = value;
-// }
-//     })
-//     let headerString = JSON.stringify(obj);
-//     let beanString = JSON.stringify(bean);
-//     AlertDialog.show({
-//       message:headerString + beanString
-//     })
-
-    return new Promise<string>((success, fail) => {
-      HttpRequest.post<ResponseDTO<string>>(HttpUrlUtils.getForgetPasswordUrl(), bean, headers).then((data: ResponseDTO<string>) => {
+    return new Promise<object>((success, fail) => {
+      HttpRequest.post<ResponseDTO<object>>(HttpUrlUtils.getForgetPasswordUrl(), bean, headers).then((data: ResponseDTO<object>) => {
 
         if (data.code != 0) {
           fail(data.message)
           return
         }
-        if (!data || !data.data) {
-          fail("数据为空")
-          return
-        }
-        success(data.data)
+        success(data)
       }, (error: Error) => {
         fail(error.message)
         Logger.debug("LoginViewModel:error ", error.toString())

@@ -331,7 +331,7 @@ struct LoginPage {
         router.back({
           params: { userName: data.userName,
             userId:data.id},
-          url: 'pages/MainPage'
+          url: `${WDRouterPage.getBundleInfo()}`
         })
       }).catch((value: string) => {
         promptAction.showToast({ message: value })

@@ -95,7 +95,7 @@ export class LoginViewModel {
     return new Promise<CheckVerifyBean>((success, reject) => {
       this.loginModel.checkVerifyCode(phone, verifyCode).then((data: CheckVerifyBean) => {
         //todo 保存数据
-        SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.temToken)
+        SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.tempToken)
         SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken)
         success(data)
 
@@ -108,7 +108,7 @@ export class LoginViewModel {
     return new Promise<CheckVerifyBean>((success, reject) => {
       this.loginModel.checkVerifyCodeByToken(verifyCode).then((data: CheckVerifyBean) => {
         //todo 保存数据
-        SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.temToken)
+        SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.tempToken)
         SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken)
         success(data)
 
@@ -134,7 +134,7 @@ export class LoginViewModel {
 
   //忘记密码
   forgotPassword(password: string, tempToken: string)  {
-    return new Promise<string>(async (success, fail) => {
+    return new Promise<object>(async (success, fail) => {
       let passwordNew = await encryptMessage(password)
       this.loginModel.forgotPassword(passwordNew, tempToken).then((data) => {
         success(data)

@@ -3,7 +3,7 @@ import promptAction from '@ohos.promptAction';
 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index';
 import router from '@ohos.router';
 import { LoginViewModel } from './LoginViewModel';
-import { Logger, SPHelper } from 'wdKit';
+import { Logger, SPHelper, ToastUtils } from 'wdKit';
 import {
   SpConstants
 } from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants'
@@ -303,7 +303,7 @@ export struct SettingPasswordLayout {
 
   /***************************** 事件处理 ******************************************/
   // 提交按钮点击事件
-  buttonClick() {
+  async buttonClick() {
     if (this.btnStatus) {
       // 需要+手机号校验
       if (this.password01.length < 6 || this.password01.length > 20) {
@@ -315,18 +315,27 @@ export struct SettingPasswordLayout {
         return
       }
       if(this.pageId == 1){ //设置密码
-        SPHelper.default.get(SpConstants.USER_JWT_TOKEN, '').then((str) => {
+        SPHelper.default.get(SpConstants.USER_TEMP_TOKEN, '').then((str) => {
           this.loginViewModel.forgotPassword(this.password01, str.toString()).then((data =>{
             if (this.pageType == 0) {//登录页
-              WDRouterRule.jumpWithPage(WDRouterPage.loginPage);
+              ToastUtils.shortToast("修改成功")
+              router.back({
+                url: `${WDRouterPage.getLoginBundleInfo()}`
+              })
             }else if(this.pageType == 1){//设置
               let params: Params = {
                 pageID: 'AccountAndSecurityLayout'
               }
-              WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
+              ToastUtils.shortToast("修改成功")
+              router.back({
+                params:params,
+                url: `${WDRouterPage.getSettingBundleInfo()}`
+              })
+              // WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
             }
           }))
-        }).catch((err: Error) => {
+        }).catch((err: string) => {
+          ToastUtils.shortToast(err)
           Logger.error(TAG, 'catch err:' + JSON.stringify(err));
         });
       }