yangchenggong1_wd

fix:bug[17207] 功能缺陷-【uat】点击热点banner,进入沉浸式频道-未登录点击点赞,跳转到登录页,登录后未返回到沉浸式频道

@@ -407,14 +407,9 @@ struct LoginPage { @@ -407,14 +407,9 @@ struct LoginPage {
407 407
408 queryUserDetail(){ 408 queryUserDetail(){
409 this.loginViewModel.queryUserDetail().then(()=>{ 409 this.loginViewModel.queryUserDetail().then(()=>{
410 - router.back({  
411 - url: `${WDRouterPage.getBundleInfo()}`  
412 - }  
413 - ) 410 + router.back()
414 }).catch(()=>{ 411 }).catch(()=>{
415 - router.back({  
416 - url: `${WDRouterPage.getBundleInfo()}`  
417 - }) 412 + router.back()
418 }) 413 })
419 } 414 }
420 415
@@ -219,18 +219,29 @@ export class LoginViewModel { @@ -219,18 +219,29 @@ export class LoginViewModel {
219 this.loginModel.queryUserDetail().then((data: UserDetail) => { 219 this.loginModel.queryUserDetail().then((data: UserDetail) => {
220 //保存sp 220 //保存sp
221 if(data){ 221 if(data){
222 - SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)  
223 - SPHelper.default.saveSync(SpConstants.USER_PHONE, data.phone) 222 + if(data.userName!=undefined){
  223 + SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
  224 + }
  225 + if(data.phone!=undefined){
  226 + SPHelper.default.saveSync(SpConstants.USER_PHONE, data.phone)
  227 + }
224 } 228 }
225 if(data.userExtend){ 229 if(data.userExtend){
226 - SPHelper.default.saveSync(SpConstants.USER_SEX, data.userExtend.sex)  
227 - SPHelper.default.saveSync(SpConstants.USER_CREATOR_ID, data.userExtend.creatorId+"")  
228 - SPHelper.default.saveSync(SpConstants.USER_HEAD_PHOTO_URL, data.userExtend.headPhotoUrl)  
229 - SPHelper.default.saveSync(SpConstants.USER_BIRTHDAY, data.userExtend.birthday) 230 + if(data.userExtend.sex!=undefined){
  231 + SPHelper.default.saveSync(SpConstants.USER_SEX, data.userExtend.sex)
  232 + }
  233 + if(data.userExtend.creatorId!=undefined){
  234 + SPHelper.default.saveSync(SpConstants.USER_CREATOR_ID, data.userExtend.creatorId+"")
  235 + }
  236 + if(data.userExtend.headPhotoUrl!=undefined){
  237 + SPHelper.default.saveSync(SpConstants.USER_HEAD_PHOTO_URL, data.userExtend.headPhotoUrl)
  238 + }
  239 + if(data.userExtend.birthday!=undefined){
  240 + SPHelper.default.saveSync(SpConstants.USER_BIRTHDAY, data.userExtend.birthday)
  241 + }
230 } 242 }
231 -  
232 success(data) 243 success(data)
233 - }).catch(() => { 244 + }).catch((error:Error) => {
234 fail() 245 fail()
235 }) 246 })
236 }) 247 })