wangliang_wd

feat:移除冲突文件

1 -import bundleManager from '@ohos.bundle.bundleManager'  
2 -  
3 -export class WDRouterPage {  
4 - private moduleName: string  
5 - private pagePath: string  
6 -  
7 - constructor(moduleName: string, pagePath: string) {  
8 - this.moduleName = moduleName  
9 - this.pagePath = pagePath  
10 - }  
11 -  
12 - url() {  
13 - let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)  
14 - return `@bundle:${bundleInfo.name}/${this.moduleName}/${this.pagePath}`  
15 - }  
16 -  
17 - // 主页  
18 - static index = new WDRouterPage("phone", "ets/pages/Index");  
19 - // 关于页面  
20 - // static aboutPage = new WDRouterPage("entry", "ets/pages/about/AboutPage");  
21 - // web默认页面  
22 - static defaultWebPage = new WDRouterPage("phone", "ets/pages/web/DefaultWebPage");  
23 - // 电子报页面  
24 - static eNewspaper = new WDRouterPage("phone", "ets/pages/ENewspaper")  
25 - // 早晚报页面  
26 - static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")  
27 - // 图文详情页  
28 - static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");  
29 - // 短视频详情页  
30 - static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");  
31 - // 点播详情页  
32 - static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");  
33 - // 直播详情页  
34 - static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");  
35 -  
36 - static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");  
37 -  
38 - static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");  
39 - //我的 预约  
40 - static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");  
41 - //我的 关注  
42 - static followListPage = new WDRouterPage("wdComponent", "ets/components/page/FollowListPage");  
43 - //资料编辑  
44 - static editUserInfoPage = new WDRouterPage("wdComponent", "ets/components/page/EditUserInfoPage");  
45 - //修改昵称  
46 - static editUserNikeNamePage = new WDRouterPage("wdComponent", "ets/components/page/EditUserNikeNamePage");  
47 - //修改简介  
48 - static editUserIntroductionPage = new WDRouterPage("wdComponent", "ets/components/page/EditUserIntroductionPage");  
49 -  
50 - static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");  
51 -}  
1 -import bundleManager from '@ohos.bundle.bundleManager'  
2 -  
3 -export class WDRouterPage {  
4 - private moduleName: string  
5 - private pagePath: string  
6 -  
7 - constructor(moduleName: string, pagePath: string) {  
8 - this.moduleName = moduleName  
9 - this.pagePath = pagePath  
10 - }  
11 -  
12 - url() {  
13 - let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)  
14 - return `@bundle:${bundleInfo.name}/${this.moduleName}/${this.pagePath}`  
15 - }  
16 -  
17 - // 主页  
18 - static index = new WDRouterPage("phone", "ets/pages/Index");  
19 - // 关于页面  
20 - // static aboutPage = new WDRouterPage("entry", "ets/pages/about/AboutPage");  
21 - // web默认页面  
22 - static defaultWebPage = new WDRouterPage("phone", "ets/pages/web/DefaultWebPage");  
23 - // 电子报页面  
24 - static eNewspaper = new WDRouterPage("phone", "ets/pages/ENewspaper")  
25 - // 早晚报页面  
26 - static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")  
27 - // 图文详情页  
28 - static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");  
29 - // 短视频详情页  
30 - static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");  
31 - // 点播详情页  
32 - static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");  
33 - // 直播详情页  
34 - static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");  
35 -  
36 - static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");  
37 -  
38 - static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");  
39 - //我的 预约  
40 - static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");  
41 - //我的 关注  
42 - static followListPage = new WDRouterPage("wdComponent", "ets/components/page/FollowListPage");  
43 -}  
1 -import bundleManager from '@ohos.bundle.bundleManager'  
2 -  
3 -export class WDRouterPage {  
4 - private moduleName: string  
5 - private pagePath: string  
6 -  
7 - constructor(moduleName: string, pagePath: string) {  
8 - this.moduleName = moduleName  
9 - this.pagePath = pagePath  
10 - }  
11 -  
12 - url() {  
13 - let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)  
14 - return `@bundle:${bundleInfo.name}/${this.moduleName}/${this.pagePath}`  
15 - }  
16 -  
17 - // 主页  
18 - static index = new WDRouterPage("phone", "ets/pages/Index");  
19 - // 关于页面  
20 - // static aboutPage = new WDRouterPage("entry", "ets/pages/about/AboutPage");  
21 - // web默认页面  
22 - static defaultWebPage = new WDRouterPage("phone", "ets/pages/web/DefaultWebPage");  
23 - // 电子报页面  
24 - static eNewspaper = new WDRouterPage("phone", "ets/pages/ENewspaper")  
25 - // 早晚报页面  
26 - static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")  
27 - // 图文详情页  
28 - static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");  
29 - // 短视频详情页  
30 - static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");  
31 - // 点播详情页  
32 - static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");  
33 - // 直播详情页  
34 - static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");  
35 -  
36 - static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");  
37 -  
38 - static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");  
39 - //我的 预约  
40 - static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");  
41 - //我的 关注  
42 - static followListPage = new WDRouterPage("wdComponent", "ets/components/page/FollowListPage");  
43 - //资料编辑  
44 - static editUserInfoPage = new WDRouterPage("wdComponent", "ets/components/page/EditUserInfoPage");  
45 - //修改昵称  
46 - static editUserNikeNamePage = new WDRouterPage("wdComponent", "ets/components/page/EditUserNikeNamePage");  
47 - //修改简介  
48 - static editUserIntroductionPage = new WDRouterPage("wdComponent", "ets/components/page/EditUserIntroductionPage");  
49 -}  
1 -import bundleManager from '@ohos.bundle.bundleManager'  
2 -  
3 -export class WDRouterPage {  
4 - private moduleName: string  
5 - private pagePath: string  
6 -  
7 - constructor(moduleName: string, pagePath: string) {  
8 - this.moduleName = moduleName  
9 - this.pagePath = pagePath  
10 - }  
11 -  
12 - url() {  
13 - let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)  
14 - return `@bundle:${bundleInfo.name}/${this.moduleName}/${this.pagePath}`  
15 - }  
16 -  
17 - // 主页  
18 - static index = new WDRouterPage("phone", "ets/pages/Index");  
19 - // 关于页面  
20 - // static aboutPage = new WDRouterPage("entry", "ets/pages/about/AboutPage");  
21 - // web默认页面  
22 - static defaultWebPage = new WDRouterPage("phone", "ets/pages/web/DefaultWebPage");  
23 - // 电子报页面  
24 - static eNewspaper = new WDRouterPage("phone", "ets/pages/ENewspaper")  
25 - // 早晚报页面  
26 - static morningEveningPaperPage = new WDRouterPage("phone", "ets/pages/MorningEveningPaperPage")  
27 - // 图文详情页  
28 - static imageTextDetailPage = new WDRouterPage("phone", "ets/pages/ImageAndTextDetailPage");  
29 - // 短视频详情页  
30 - static detailPlayShortVideoPage = new WDRouterPage("wdDetailPlayShortVideo", "ets/pages/DetailPlayShortVideoPage");  
31 - // 点播详情页  
32 - static detailPlayVodPage = new WDRouterPage("wdDetailPlayVod", "ets/pages/DetailPlayVodPage");  
33 - // 直播详情页  
34 - static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");  
35 -  
36 - static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");  
37 -  
38 - static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");  
39 - //我的 预约  
40 - static appointmentListPage = new WDRouterPage("wdComponent", "ets/components/page/AppointmentListPage");  
41 - //我的 关注  
42 - static followListPage = new WDRouterPage("wdComponent", "ets/components/page/FollowListPage");  
43 -  
44 - static loginProtocolPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginProtocolWebview");  
45 -}