陈剑华

Merge remote-tracking branch 'origin/main'

@@ -39,14 +39,14 @@ class AppLoginAuthInfo { @@ -39,14 +39,14 @@ class AppLoginAuthInfo {
39 } 39 }
40 40
41 interface IDataJson { 41 interface IDataJson {
42 - jumpType:number  
43 - jumpUrl:string  
44 - newsId:string  
45 - newsObjectLevel:string  
46 - newsObjectType:number  
47 - newsRelId:string  
48 - newsTitle:string  
49 - pageId:string 42 + jumpType: number
  43 + jumpUrl: string
  44 + newsId: string
  45 + newsObjectLevel: string
  46 + newsObjectType: number
  47 + newsRelId: string
  48 + newsTitle: string
  49 + pageId: string
50 } 50 }
51 51
52 /** 52 /**
@@ -209,6 +209,11 @@ function handleJsCallAppInnerLinkMethod(data: Message) { @@ -209,6 +209,11 @@ function handleJsCallAppInnerLinkMethod(data: Message) {
209 let creatorId = urlParams.get('creatorId') || '' 209 let creatorId = urlParams.get('creatorId') || ''
210 ProcessUtils.gotoPeopleShipHomePage(creatorId) 210 ProcessUtils.gotoPeopleShipHomePage(creatorId)
211 break; 211 break;
  212 + case 'app':
  213 + if (urlParams.get('subType') === 'login') {
  214 + ProcessUtils.gotoLoginPage()
  215 + }
  216 + break;
212 default: 217 default:
213 break; 218 break;
214 } 219 }
@@ -15,11 +15,15 @@ export function handleJsCallAppService(data: Message, callback: (res: string) => @@ -15,11 +15,15 @@ export function handleJsCallAppService(data: Message, callback: (res: string) =>
15 } 15 }
16 16
17 let url: string = HttpUrlUtils.getHost() + data?.data?.url 17 let url: string = HttpUrlUtils.getHost() + data?.data?.url
18 - if(queryString){  
19 - url +`?${queryString}}` 18 + if (queryString) {
  19 + url = url + `?${queryString}`
20 } 20 }
  21 + console.log('yzl', queryString, url)
21 WDHttp.get(url).then((res) => { 22 WDHttp.get(url).then((res) => {
22 - callback(JSON.stringify(res)) 23 + callback(JSON.stringify({
  24 + netError: '0',
  25 + responseMap: res
  26 + }))
23 }) 27 })
24 } 28 }
25 if (data?.data?.method === 'post') { 29 if (data?.data?.method === 'post') {