yangsunyue_wd

冲突调整

@@ -4,6 +4,9 @@ import { BannerComponent } from './view/BannerComponent'; @@ -4,6 +4,9 @@ import { BannerComponent } from './view/BannerComponent';
4 import { LabelComponent } from './view/LabelComponent'; 4 import { LabelComponent } from './view/LabelComponent';
5 import { TitleAbbrComponent } from './view/TitleAbbrComponent'; 5 import { TitleAbbrComponent } from './view/TitleAbbrComponent';
6 import { TitleAllComponent } from './view/TitleAllComponent'; 6 import { TitleAllComponent } from './view/TitleAllComponent';
  7 +import { HorizontalStrokeCardThreeTwoRadioForOneComponent } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent';
  8 +import { HorizontalStrokeCardThreeTwoRadioForTwoComponent } from './view/HorizontalStrokeCardThreeTwoRadioForTwoComponent';
  9 +import { HorizontalStrokeCardThreeTwoRadioForMoreComponent } from './view/HorizontalStrokeCardThreeTwoRadioForMoreComponent';
7 10
8 /** 11 /**
9 * comp适配器. 12 * comp适配器.
@@ -21,6 +24,12 @@ export struct CompParser { @@ -21,6 +24,12 @@ export struct CompParser {
21 componentBuilder(compDTO: CompDTO, compIndex: number) { 24 componentBuilder(compDTO: CompDTO, compIndex: number) {
22 if (compDTO.compStyle === CompStyle.Label_03) { 25 if (compDTO.compStyle === CompStyle.Label_03) {
23 LabelComponent({ compDTO: compDTO }) 26 LabelComponent({ compDTO: compDTO })
  27 + } else if (compIndex == 0) {
  28 + HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO })
  29 + } else if (compIndex == 1) {
  30 + HorizontalStrokeCardThreeTwoRadioForTwoComponent({ compDTO: compDTO })
  31 + } else if (compIndex == 2) {
  32 + HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: compDTO })
24 } else if (compDTO.compStyle === CompStyle.Title_Abbr_01) { 33 } else if (compDTO.compStyle === CompStyle.Title_Abbr_01) {
25 TitleAbbrComponent({ compDTO: compDTO }) 34 TitleAbbrComponent({ compDTO: compDTO })
26 } else if (compDTO.compStyle === CompStyle.Title_All_01) { 35 } else if (compDTO.compStyle === CompStyle.Title_All_01) {
1 import { CommonConstants } from 'wdConstant' 1 import { CommonConstants } from 'wdConstant'
2 -import { CompDTO } from '../repository/bean/CompDTO' 2 +import { CompDTO } from '../../repository/bean/CompDTO'
3 3
4 @Component 4 @Component
5 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { 5 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
1 import { CommonConstants } from 'wdConstant' 1 import { CommonConstants } from 'wdConstant'
2 -import { CompDTO } from '../repository/bean/CompDTO' 2 +import { CompDTO } from '../../repository/bean/CompDTO'
3 3
4 @Component 4 @Component
5 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { 5 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
1 import { CommonConstants } from 'wdConstant' 1 import { CommonConstants } from 'wdConstant'
2 -import { CompDTO } from '../repository/bean/CompDTO' 2 +import { CompDTO } from '../../repository/bean/CompDTO'
3 3
4 @Component 4 @Component
5 export struct HorizontalStrokeCardThreeTwoRadioForTwoComponent { 5 export struct HorizontalStrokeCardThreeTwoRadioForTwoComponent {
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
36 "name": "color_212228", 36 "name": "color_212228",
37 "value": "#212228" 37 "value": "#212228"
38 }, 38 },
  39 + {
39 "name": "color_fff", 40 "name": "color_fff",
40 "value": "#ffffff" 41 "value": "#ffffff"
41 }, 42 },