Commit e8c6a820960444aa08d6bf243a77b61a20d0328c
1 parent
a831986a
快速报价样式
Showing
4 changed files
with
20 additions
and
21 deletions
src/components/Common/Typesetting/typesetting.js
| @@ -74,7 +74,7 @@ const Typesetting = props => { | @@ -74,7 +74,7 @@ const Typesetting = props => { | ||
| 74 | const svgBox = useRef(null); | 74 | const svgBox = useRef(null); |
| 75 | const svgBoxs = useRef(null); | 75 | const svgBoxs = useRef(null); |
| 76 | // 获取外层盒子尺寸 | 76 | // 获取外层盒子尺寸 |
| 77 | - const clientWidth = boxWidth || 400; | 77 | + const clientWidth = boxWidth || 370; |
| 78 | const clientHeight = boxHeight || 300; | 78 | const clientHeight = boxHeight || 300; |
| 79 | // 动态计算边距的总和 | 79 | // 动态计算边距的总和 |
| 80 | const totalLeftMargin = dZBLB + dYBLB; | 80 | const totalLeftMargin = dZBLB + dYBLB; |
src/components/QuickQuote/index.css
| @@ -165,15 +165,11 @@ | @@ -165,15 +165,11 @@ | ||
| 165 | width: 100%; | 165 | width: 100%; |
| 166 | height: auto; | 166 | height: auto; |
| 167 | display: flex; | 167 | display: flex; |
| 168 | - align-items: center; | ||
| 169 | } | 168 | } |
| 170 | .quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-carousel .slick-dots li button { | 169 | .quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-carousel .slick-dots li button { |
| 171 | background-color: #000; | 170 | background-color: #000; |
| 172 | /* 未激活时的指示器颜色 */ | 171 | /* 未激活时的指示器颜色 */ |
| 173 | } | 172 | } |
| 174 | -.quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview :global .ant-image { | ||
| 175 | - padding: 15px; | ||
| 176 | -} | ||
| 177 | .quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview .noImg { | 173 | .quickQuote .content .rightContent .boxPart1 .boxPart1Right .boxRreview .noImg { |
| 178 | width: 300px; | 174 | width: 300px; |
| 179 | height: 300px; | 175 | height: 300px; |
| @@ -288,6 +284,14 @@ | @@ -288,6 +284,14 @@ | ||
| 288 | align-items: center; | 284 | align-items: center; |
| 289 | justify-content: space-around; | 285 | justify-content: space-around; |
| 290 | } | 286 | } |
| 287 | +.quickQuote .content .rightContent .materialsLine .materialsBtns :global button { | ||
| 288 | + padding: 0; | ||
| 289 | + width: 16px; | ||
| 290 | + height: 16px; | ||
| 291 | +} | ||
| 292 | +.quickQuote .content .rightContent .materialsLine .materialsBtns :global button > span { | ||
| 293 | + font-size: 10px; | ||
| 294 | +} | ||
| 291 | .quickQuote .content .rightContent .materialsLine .materialsBtns :global .ant-btn:nth-child(2) { | 295 | .quickQuote .content .rightContent .materialsLine .materialsBtns :global .ant-btn:nth-child(2) { |
| 292 | background-color: #53b637; | 296 | background-color: #53b637; |
| 293 | border-color: #53b637; | 297 | border-color: #53b637; |
src/components/QuickQuote/index.jsx
| @@ -2053,7 +2053,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | @@ -2053,7 +2053,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | ||
| 2053 | ...props, | 2053 | ...props, |
| 2054 | boxList, | 2054 | boxList, |
| 2055 | dSvgBoxWidth: 300, | 2055 | dSvgBoxWidth: 300, |
| 2056 | - dSvgBoxHeight: 300, | 2056 | + dSvgBoxHeight: 290, |
| 2057 | showNew: 1, | 2057 | showNew: 1, |
| 2058 | }; | 2058 | }; |
| 2059 | // upViewProps.viewRow = | 2059 | // upViewProps.viewRow = |
| @@ -2145,32 +2145,26 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | @@ -2145,32 +2145,26 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | ||
| 2145 | <div className={styles.boxRreview}> | 2145 | <div className={styles.boxRreview}> |
| 2146 | <Image.PreviewGroup> | 2146 | <Image.PreviewGroup> |
| 2147 | {svgProps.boxList.length ? ( | 2147 | {svgProps.boxList.length ? ( |
| 2148 | - <div style={{ width: " 300px", height: "300px" }}> | 2148 | + <div style={{ width: " 300px", height: "290px",backgroundColor: "#fff",borderRight: "1px solid #ccc" }}> |
| 2149 | <DynamicSVG {...svgProps} /> | 2149 | <DynamicSVG {...svgProps} /> |
| 2150 | </div> | 2150 | </div> |
| 2151 | ) : ( | 2151 | ) : ( |
| 2152 | <div className={styles.noImg}>{noImage}</div> | 2152 | <div className={styles.noImg}>{noImage}</div> |
| 2153 | )} | 2153 | )} |
| 2154 | - {/* {svgProps.boxList.length ? ( | ||
| 2155 | - slaveRowData.sPackDetailPathUpLoad ? | ||
| 2156 | - <Image width={300} src={slaveRowData.sPackDetailPathUpLoad} />: | ||
| 2157 | - <div style={{ width: " 300px", height: "300px" }}> | ||
| 2158 | - <DynamicSVG {...svgProps} /> | ||
| 2159 | - </div> | ||
| 2160 | - ) : ( | ||
| 2161 | - <div className={styles.noImg}>暂无图片</div> | ||
| 2162 | - )} */} | 2154 | + |
| 2163 | {/* <div className={styles.boxRreviewTitile}>展开图</div> */} | 2155 | {/* <div className={styles.boxRreviewTitile}>展开图</div> */} |
| 2164 | {slaveRowData.sPackPath ? ( | 2156 | {slaveRowData.sPackPath ? ( |
| 2165 | // <Image width={300} src={slaveRowData.sPackPath} /> | 2157 | // <Image width={300} src={slaveRowData.sPackPath} /> |
| 2166 | 2158 | ||
| 2167 | - <Carousel style={{ width: "300px", height: "300px" }} className={styles.carousel} dots> | 2159 | + <div style={{ width: "300px", height: "300px" }}> |
| 2160 | + <Carousel dots> | ||
| 2168 | {imagesData.map((image, index) => ( | 2161 | {imagesData.map((image, index) => ( |
| 2169 | <div key={index} className="carousel-item"> | 2162 | <div key={index} className="carousel-item"> |
| 2170 | - <Image width={300} src={image.src} alt={image.alt} /> | 2163 | + <Image src={image.src} alt={image.alt} /> |
| 2171 | </div> | 2164 | </div> |
| 2172 | ))} | 2165 | ))} |
| 2173 | </Carousel> | 2166 | </Carousel> |
| 2167 | + </div> | ||
| 2174 | ) : ( | 2168 | ) : ( |
| 2175 | <div className={styles.noImg}>{noImage}</div> | 2169 | <div className={styles.noImg}>{noImage}</div> |
| 2176 | )} | 2170 | )} |
| @@ -2197,7 +2191,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | @@ -2197,7 +2191,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1 | ||
| 2197 | {cailiaoyinshuaDiv} | 2191 | {cailiaoyinshuaDiv} |
| 2198 | </div> | 2192 | </div> |
| 2199 | <div> | 2193 | <div> |
| 2200 | - <div> | 2194 | + <div style={{width:'600px',height:'300px'}}> |
| 2201 | <div className={styles.boxComponent}> | 2195 | <div className={styles.boxComponent}> |
| 2202 | <Typesetting {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength} /> | 2196 | <Typesetting {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength} /> |
| 2203 | </div> | 2197 | </div> |
src/components/QuickQuote/index.less
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | width: 100%; | 206 | width: 100%; |
| 207 | height: auto; | 207 | height: auto; |
| 208 | display: flex; | 208 | display: flex; |
| 209 | - align-items: center; | 209 | + // align-items: center; |
| 210 | 210 | ||
| 211 | :global .ant-carousel .slick-dots li button { | 211 | :global .ant-carousel .slick-dots li button { |
| 212 | background-color: #000; | 212 | background-color: #000; |
| @@ -215,7 +215,8 @@ | @@ -215,7 +215,8 @@ | ||
| 215 | 215 | ||
| 216 | :global { | 216 | :global { |
| 217 | .ant-image { | 217 | .ant-image { |
| 218 | - padding: 15px; | 218 | + // padding: 15px; |
| 219 | + | ||
| 219 | } | 220 | } |
| 220 | } | 221 | } |
| 221 | 222 |