Browse Source

fix: 全局样式调整

周玉环 3 days ago
parent
commit
b7a71783bc

+ 2 - 1
xinkeaboard-admin/src/pages/decorate/pc/diy_page.less

@@ -13,7 +13,8 @@
 .allow_show_sld_mask {
   div[class=ant-carousel]{
     div[class=slick-list]{
-      max-height: 457px;
+      // max-height: 457px;
+      height: 100%;
     }
   }
   .sld_web_item_hover {

+ 1 - 4
xinkeaboard-admin/src/pages/decorate/pc/home/adv_04.js

@@ -210,12 +210,9 @@ export default class Adv_04 extends Component {
                 <span>{sldComLanguage('编辑')}</span>
               </div>
               <h2>
-                <font
-                  style={data.title_info.title_color != '' ? { background: data.title_info.title_color } : null}>&nbsp;</font>
+               
                 <span
                   style={data.title_info.title_color != '' ? { color: data.title_info.title_color } : null}>{data.title_info.title_name != '' ? data.title_info.title_name : `${sldComLanguage('请填写标题')}`}</span>
-                <font
-                  style={data.title_info.title_color != '' ? { background: data.title_info.title_color } : null}>&nbsp;</font>
               </h2>
             </div>
             <div className={styles.floor_goods}>

+ 2 - 4
xinkeaboard-admin/src/pages/decorate/pc/home/adv_27.js

@@ -210,12 +210,10 @@ export default class Adv_27 extends Component {
                 <span>{sldComLanguage('编辑')}</span>
               </div>
               <h2>
-                <font
-                  style={data.title_info.title_color != '' ? { background: data.title_info.title_color } : null}>&nbsp;</font>
+               
                 <span
                   style={data.title_info.title_color != '' ? { color: data.title_info.title_color } : null}>{data.title_info.title_name != '' ? data.title_info.title_name : `${sldComLanguage('请填写标题')}`}</span>
-                <font
-                  style={data.title_info.title_color != '' ? { background: data.title_info.title_color } : null}>&nbsp;</font>
+               
               </h2>
             </div>
             <div className={styles.floor_goods}>

+ 2 - 2
xinkeaboard-admin/src/pages/decorate/pc/home/adv_29.js

@@ -333,7 +333,7 @@ export default class Adv_29 extends Component {
                 </div>
               </div>
 
-              <div className={`${styles.sourcing_desc}`}>
+              <div className={`${styles.sourcing_desc}`} style={{ position: 'absolute', bottom: '80px' }}>
                 <div className={`${styles.pr}`}>
                   <div className={styles.sld_mask}
                        onClick={() => this.editTpl('center', `左侧子标题设置`, [`${sldComLanguage('子标题不能为空,最多输入40个字')}`])}>
@@ -353,7 +353,7 @@ export default class Adv_29 extends Component {
               {/*    Learn More <i class="ob-icon icon-right">></i>*/}
               {/*  </a>*/}
               {/*</div>*/}
-              <div className={`${styles.pr}`}>
+              <div className={`${styles.pr}`} style={{ position: 'absolute', bottom: '30px' }}>
                 <div className={styles.sld_mask}
                      onClick={() => this.editTpl('btn', `${sldComLanguage('左侧按钮设置')}`)}>
                   <span>{sldComLanguage('编辑')}</span>

+ 1 - 1
xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page.js

@@ -680,7 +680,7 @@ export default class Edit_diy_page extends Component {
         {/*  </div>*/}
         {/*</div>*/}
 
-        <div style={{ position: 'relative', width: '100%', height: 306, background: '#fff' }}
+        <div style={{ position: 'relative', width: '100%', height: 520, background: '#fff' }}
              className={`${styles.allow_show_edit}`}>
           <div style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, zIndex: 4 }}>
             <MainBannerPC tpl_info={main_swiper_data.data} save_tpl_data={this.save_main_banner_data}/>

+ 2 - 2
xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page_head.js

@@ -147,14 +147,14 @@ export default class EditDdiyPageHead extends Component {
                        placeholder={sldComLanguage('请输入关键词')}/>
                 <input type="submit" value={sldComLanguage('搜索')} className={styles.button}/>
               </div>
-              <div className={styles.hot_search_wrap}>
+              {/* <div className={styles.hot_search_wrap}>
                 <div>
                   {hot_search_words.length && hot_search_words.map((item, index) => {
                     return <a key={index} onClick={(e) => e.preventDefault()}>{item}</a>;
                   })
                   }
                 </div>
-              </div>
+              </div> */}
             </div>
           </div>
           <div className={styles.sld_cart_wrap}>

+ 3 - 3
xinkeaboard-admin/src/pages/decorate/pc/home/main_banner_pc.js

@@ -328,7 +328,7 @@ export default class MainBannerPc extends Component {
                 <div className={`${styles.s2}`}>
                   <div className={`${styles.scroller}`}>
                     {banner_data.info.carousel_info.data.length > 0 &&
-                    <Carousel autoplay>
+                    <Carousel>
                       {banner_data.info.carousel_info.data.map((item, index) => (
                         <div key={index} className={`${styles.adv_01_wrap} ${styles.main_banner_item_wrap}`}
                              style={{ width: 1210 }}>
@@ -358,7 +358,7 @@ export default class MainBannerPc extends Component {
                   </div>
                 </div>
 
-                <div className={`${styles.s3}`}>
+                {/* <div className={`${styles.s3}`}>
                   <div className={`${styles.cr_user_card}`} style={{ marginTop: '0' }}>
                     <div className={styles.sld_mask}
                          onClick={() => this.editTpl2('left', `右侧标题设置`, [`${sldComLanguage('标题不能为空,最多输入20个字')}`])}>
@@ -390,7 +390,7 @@ export default class MainBannerPc extends Component {
                     })
                     }
                   </div>
-                </div>
+                </div> */}
 
 
               </div>

+ 73 - 33
xinkeaboard-admin/src/pages/decorate/pc/pcdecorate.less

@@ -50,7 +50,7 @@ a {
 }
 
 .main_banner_item_wrap{
-  height: 306px;
+  height: 520px;
 }
 
 .flash_wrap {
@@ -132,9 +132,10 @@ a {
 }
 
 .adv_01_img {
-  max-width: 100%;
-  max-height: 100%;
-  height: 306px;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  // height: 306px;
 }
 
 .modal_tip_color {
@@ -443,7 +444,7 @@ a {
 .adv_04_wrap .floor_title h2 {
   width: 100%;
   line-height: 35px;
-  text-align: center;
+  // text-align: center;
   margin: 0 auto;
   font-size: 28px;
   color: #333;
@@ -483,14 +484,22 @@ a {
 .adv_04_wrap .floor_goods .item {
   float: left;
   width: 234px;
-  height: 310px;
-  margin: 0 10px 10px 0;
+  // height: 310px;
+  // margin: 0 10px 10px 0;
   padding: 24px 31px 26px 31px;
   background-color: #FFF;
 }
 
-.adv_04_wrap .floor_goods .item:nth-child(5n+5) {
-  margin-right: 0 !important;
+.adv_04_wrap .floor_goods .item:nth-child(n + 6) {
+  border-bottom: 1px solid #f2f2f2;
+}
+.adv_04_wrap .floor_goods .item:nth-child(-n + 6) {
+  border-top: 1px solid #f2f2f2;
+  border-bottom: 1px solid #f2f2f2;
+}
+
+.adv_04_wrap .floor_goods .item {
+  border-right: 1px solid #f2f2f2;
 }
 
 .adv_04_wrap .floor_goods .item .wrap {
@@ -2315,7 +2324,7 @@ a {
 .adv_27_wrap .floor_title h2 {
   width: 100%;
   line-height: 35px;
-  text-align: center;
+  // text-align: center;
   margin: 0 auto;
   font-size: 28px;
   color: #333;
@@ -2355,14 +2364,29 @@ a {
 .adv_27_wrap .floor_goods .item {
   float: left;
   width: 234px;
-  height: 310px;
-  margin: 0 10px 10px 0;
+  // height: 310px;
+  // margin: 0 10px 10px 0;
   padding: 24px 31px 26px 31px;
   background-color: #FFF;
 }
 
-.adv_27_wrap .floor_goods .item:nth-child(5n+5) {
-  margin-right: 0 !important;
+.adv_27_wrap .floor_goods .item:nth-child(n + 6) {
+  border-bottom: 1px solid #f2f2f2;
+}
+
+.adv_27_wrap .floor_goods .item:nth-child(-n + 6) {
+  border-top: 1px solid #f2f2f2;
+  border-bottom: 1px solid #f2f2f2;
+}
+
+.adv_27_wrap .floor_goods .item:nth-child(5n + 1) {
+  // border-left: 1px solid #f2f2f2;
+}
+
+
+
+.adv_27_wrap .floor_goods .item {
+  border-right: 1px solid #f2f2f2;
 }
 
 .adv_27_wrap .floor_goods .item .wrap {
@@ -2613,21 +2637,26 @@ a {
 }
 
 .adv_28 .adv_28_wrap .industry_booth .industry_theme_info {
-  position: relative;
+  position: absolute;
+  bottom: 30px;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .industry_title {
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 38px;
+  color: #FFFFFF;
+  line-height: 44px;
   margin-bottom: 20px;
-  font-size: 22px;
-  line-height: 30px;
-  color: #222;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .soure_now .btn {
-  height: 30px;
-  line-height: 28px;
+  line-height: 42px;
   padding: 0 10px;
+  width: 157px;
+  height: 42px;
+  font-weight: bold;
+  font-size: 16px;
+  color: #FFFFFF;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .btn {
@@ -2731,23 +2760,28 @@ a {
 
 
 .adv_29 .sourcing_text {
-  padding-top: 20px;
+  width: 250px;
+  height: 370px;
+  // padding-top: 20px;
   padding-left: 30px;
   overflow: hidden;
-  //position: relative;
+  position: relative;
 }
 
 .adv_29 .sourcing_title {
+  font-size: 40px;
+  color: #FFFFFF;
   font-size: 32px;
   font-weight: bold;
-  margin-bottom: 20px;
+  margin-bottom: 80px;
   transform: scaleX(1.2);
   transform-origin: left;
 }
 
 .adv_29 .sourcing_desc {
-  font-size: 16px;
-  color: #555;
+  font-weight: 400;
+  color: #FFFFFF;
+  font-size: 14px;
   position: relative;
 }
 
@@ -2757,19 +2791,24 @@ a {
 
 .adv_29 .sourcing_more {
   margin-top: 45px;
-  font-weight: 500;
-  font-size: 14px;
+  font-weight: bold;
+  font-size: 16px;
+  color: #FFFFFF;
   position: relative;
 }
 
 .adv_29 .sourcing_more a {
-  color: #222;
-  font-weight: 500;
+  font-weight: bold;
+  font-size: 16px;
+  color: #FFFFFF;
 }
 
 /* adv_29-end */
 
 /* adv_30-start */
+.adv_30 {
+  width: 100% !important;
+}
 .adv_30 .adv_30_wrap {
   height: auto;
   min-height: 306px;
@@ -2818,7 +2857,7 @@ a {
 }
 
 .adv_30 .adv_30_wrap .home-slider {
-  width: 1210px;
+  width: 100% !important;
   margin: 0 auto;
   position: relative;
   height: 306px;
@@ -2828,13 +2867,14 @@ a {
 }
 
 .adv_30 .adv_30_wrap .s1 {
+  display: none;
   width: 187px;
   float: left;
 }
 
 .adv_30 .adv_30_wrap .s2 {
-  width: calc(100% - 437px);
-  float: left;
+  width: 100%;
+  // float: left;
 }
 
 .adv_30 .adv_30_wrap .s3 {