Merge remote-tracking branch 'origin/master'

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

@@ -243,18 +243,16 @@ export default class Adv_04 extends Component {
               data.data.goods_data.map((item) => {
                 return <div key={item.id} className={styles.item}>
                   <div className={styles.wrap}>
-                    <a href="javascript:;" className={styles.example_text}>
-                      <img src={item.mainImage}/>
-                    </a>
+                    <img src={item.mainImage}/>
                     <p className={styles.title}>
                       <a href="javascript:;" title={item.goodsName}>{item.goodsName}</a>
                     </p>
-                    <p className={styles.price}>
+                    {/* <p className={styles.price}> */}
                       {/*<span className={styles.second_color}>{sldComLanguage('￥')}<span*/}
                       {/*  className={styles.money_number}>{item.goodsPrice}</span>*/}
                       {/*</span>*/}
                       {/*<span className={styles.second_color}><span className={styles.money_number}>{item.goodsMoney}</span></span>*/}
-                    </p>
+                    {/* </p> */}
                   </div>
                 </div>;
               })

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

@@ -298,7 +298,7 @@ export default class Edit_diy_page extends Component {
               data: [],
               type: 'main_banner',
               width: 1920,
-              height: 457,//高度为0的话表示不限制
+              height: 520,//高度为0的话表示不限制
               admin_show_width: 320,
               admin_show_height: 76,
             },

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

@@ -47,8 +47,8 @@ export default class MainBannerPc extends Component {
         type: 'main_banner_pc',
         info: {
           carousel_info: {
-            width: 780,
-            height: 306,//高度为0的话表示不限制
+            width: 1920,
+            height: 520,//高度为0的话表示不限制
             admin_show_width: 320,
             admin_show_height: 76,
             data: [{

xinkeaboard-admin/src/pages/decorate/pc/pcdecorate.less

@@ -40,7 +40,7 @@ a {
 }
 
 .adv_01_wrap {
-  width: 1210px;
+  width: 1440px;
   background: #EFEFEF;
   display: flex;
   flex-direction: row;
@@ -155,7 +155,7 @@ a {
 }
 
 .adv_02_part {
-  width: 1210px;
+  width: 1440px;
   height: 344px;
   background: #fff;
   display: flex;
@@ -424,12 +424,13 @@ a {
 
 /* adv_04-start */
 .w_sld_react_1210 {
-  width: 1210px;
+  width: 1440px;
   margin: 0 auto;
 }
 
 .adv_04_wrap {
   height: auto;
+  width: 1430px;
   min-height: 374px;
 }
 
@@ -483,10 +484,10 @@ a {
 
 .adv_04_wrap .floor_goods .item {
   float: left;
-  width: 234px;
-  // height: 310px;
+  width: 286px;
+  height: 326px;
   // margin: 0 10px 10px 0;
-  padding: 24px 31px 26px 31px;
+  // padding: 24px 31px 26px 31px;
   background-color: #FFF;
 }
 
@@ -503,22 +504,27 @@ a {
 }
 
 .adv_04_wrap .floor_goods .item .wrap {
-  width: 172px;
-  text-align: center;
-  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  // text-align: center;
+  // margin: 0 auto;
   font-size: 14px;
   position: relative;
 }
 
 .adv_04_wrap .floor_goods .item .wrap img {
-  width: 170px;
-  height: 170px;
+  width: 232px;
+  height: 232px;
   display: block;
 }
 
 .adv_04_wrap .floor_goods .item .wrap .example_text {
-  width: 170px;
-  height: 170px;
+  width: 232px;
+  height: 232px;
   display: block;
   color: #777;
   text-align: center;
@@ -538,10 +544,13 @@ a {
 }
 
 .adv_04_wrap .floor_goods .item .wrap .title {
-  margin: 26px 0 18px 0;
-  max-height: 38px;
-  height: 38px;
+  margin-top: 10px;
+  font-weight: bold;
+  font-size: 16px;
+  color: #282E30;
+  line-height: 22px;
   overflow: hidden;
+  text-align: center;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-line-clamp: 2;
@@ -1819,7 +1828,7 @@ a {
   overflow: hidden;
 }
 .adv_15 .adv_15_wrap .top_title {
-  width: 1210px;
+  width: 1440px;
   height: 40px;
   line-height: 40px;
   border-style: solid;
@@ -2285,7 +2294,7 @@ a {
 }
 
 .com_1210_center{
-  width: 1210px;
+  width: 1440px;
   margin: 0 auto;
 }
 
@@ -2363,7 +2372,8 @@ a {
 
 .adv_27_wrap .floor_goods .item {
   float: left;
-  width: 234px;
+  width: 286px;
+  height: 326px;
   // height: 310px;
   // margin: 0 10px 10px 0;
   padding: 24px 31px 26px 31px;
@@ -2390,22 +2400,25 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap {
-  width: 172px;
-  text-align: center;
-  margin: 0 auto;
+  display: flex;
+  flex-direction:column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
   font-size: 14px;
   position: relative;
 }
 
 .adv_27_wrap .floor_goods .item .wrap img {
-  width: 170px;
-  height: 170px;
+  width: 100%;
+  height: 100%;
   display: block;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .example_text {
-  width: 170px;
-  height: 170px;
+  width: 232px;
+  height: 232px;
   display: block;
   color: #777;
   text-align: center;
@@ -2425,9 +2438,10 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title {
-  margin: 26px 0 18px 0;
-  max-height: 38px;
-  height: 38px;
+  font-weight: bold;
+  font-size: 14px;
+  color: #282E30;
+  height: 44px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -2437,6 +2451,8 @@ a {
   word-wrap: break-word;
   word-break: normal;
   display: inline-block;
+  text-align: center;
+  margin-top: 20px;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title a {
@@ -2483,7 +2499,8 @@ a {
 .adv_28 .adv_28_wrap .industry_banner {
   position: relative;
   box-sizing: border-box;
-  width: 300px;
+  width: 348px;
+  height: 654px;
   overflow: hidden;
 }
 
@@ -2502,32 +2519,41 @@ a {
 }
 
 .adv_28 .adv_28_wrap .industry_products .prod_item {
+  width: 272px;
+  height: 326px;
   position: relative;
   box-sizing: border-box;
   border: 1px solid #e6ecf2;
   border-left: 0;
   border-top: 0;
-  width: 25%;
+  // width: 25%;
 }
 
 .adv_28 .adv_28_wrap .industry_products .prod_item:hover .pic-inr{
+  
   opacity: .5;
   color: #00985e;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .prod_inr {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
   position: relative;
   display: block;
   padding: 15px;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .prod_txt {
-  font-size: 13px;
-  line-height: 24px;
-  height: 48px;
-  color: #555;
+  font-weight: bold;
+  font-size: 14px;
+  color: #282E30;
   display: -webkit-box;
   overflow: hidden;
+  margin-top: 20px;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
   word-wrap: break-word;
@@ -2538,14 +2564,15 @@ a {
 }
 
 .adv_28 .adv_28_wrap .industry_booth .prod_pic {
+  width: 232px;
+  height: 232px;
   text-align: center;
   margin-bottom: 10px;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .prod_pic .pic_inr {
-  width: 100px;
-  height: 100px;
-  display: inline-block;
+  width: 100%;
+  height: 100%;
   font-size: 0;
   overflow: hidden;
   opacity: 1;
@@ -2554,6 +2581,7 @@ a {
 
 .adv_28 .adv_28_wrap .industry_booth .img_wp {
   width: 100%;
+  height: 100%;
   //padding-top: 100%;
   position: relative;
   font-size: 0;
@@ -2578,14 +2606,14 @@ a {
 }
 
 .adv_28 .adv_28_wrap .industry_booth .img_wp img {
-  max-width: 100%;
-  max-height: 100%;
-  vertical-align: middle;
-  top: 0;
-  left: 0;
-  margin: auto;
-  bottom: 0;
-  right: 0;
+  width: 100%;
+  height: 100%;
+  // vertical-align: middle;
+  // top: 0;
+  // left: 0;
+  // margin: auto;
+  // bottom: 0;
+  // right: 0;
 }
 
 .adv_28 .adv_28_wrap .industry_booth .industry_link {
@@ -2642,6 +2670,8 @@ a {
 }
 
 .adv_28 .adv_28_wrap .industry_booth .industry_title {
+  width: 270px;
+  height: 88px;
   font-weight: bold;
   font-size: 38px;
   color: #FFFFFF;

xinkeaboard-web/assets/style/decorate.scss

@@ -12,7 +12,7 @@
 }
 
 .adv_01_wrap {
-  width: 1210px;
+  width: 1440px;
   //   height: 340px;
   background: #efefef;
   position: relative;
@@ -79,7 +79,7 @@
 }
 
 .adv_02_part {
-  width: 1210px;
+  width: 1440px;
   height: 344px;
   background: #fff;
   margin: 0 auto;
@@ -930,7 +930,7 @@
 }
 
 .w_sld_react_1210 {
-  width: 1210px;
+  width: 1440px;
   margin: 0 auto;
 }
 
@@ -938,11 +938,12 @@
 
 /* adv_04-start */
 .w_sld_react_1210 {
-  width: 1210px;
+  width: 1440px;
 }
 
 .adv_04_wrap {
   height: auto;
+  min-height: 374px;
 }
 
 .adv_04_wrap .floor_title {
@@ -988,18 +989,15 @@
 }
 
 .adv_04_wrap .floor_goods {
-  display: flex;
-  flex-wrap: wrap;
   position: relative;
   width: 100%;
   overflow: hidden;
 }
 
 .adv_04_wrap .floor_goods .item {
-  // float: left;
-  width: 20%;
-  // height: 287px;
-  // margin: 0 10px 10px 0;
+  float: left;
+  width: 286px;
+  height: 326px;
   padding: 10px;
   background-color: #fff;
   box-sizing: border-box;
@@ -1021,20 +1019,35 @@
 
 
 .adv_04_wrap .floor_goods .item .wrap {
-  width: 172px;
-  text-align: center;
-  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  // text-align: center;
+  // margin: 0 auto;
   font-size: $fontE;
   position: relative;
+
+  a {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
 }
 
 .adv_04_wrap .floor_goods .item .wrap:hover .title a{
   color: $colorMain;
+  text-align: center;
 }
 
 .adv_04_wrap .floor_goods .item .wrap img {
-  width: 170px;
-  height: 170px;
+  width: 232px;
+  height: 232px;
   display: block;
 }
 
@@ -1065,9 +1078,8 @@
 }
 
 .adv_04_wrap .floor_goods .item .wrap .title {
-  margin: 20px 0 8px 0;
-  max-height: 38px;
-  height: 38px;
+  // margin: 20px 0 8px 0;
+  height: 44px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -1078,6 +1090,8 @@
   display: inline-block;
   background: #fff;
   letter-spacing: 0;
+  text-align: center;
+  margin-top: 20px;
 }
 
 .adv_04_wrap .floor_goods .item .wrap .title a {
@@ -2003,7 +2017,7 @@
 }
 
 .adv_15 .adv_15_wrap .top_title {
-  width: 1210px;
+  width: 1440px;
   height: 40px;
   line-height: 40px;
   border-style: solid;
@@ -2531,7 +2545,7 @@ a {
 }
 
 .com_1210_center {
-  width: 1210px;
+  width: 1440px;
   margin: 0 auto;
 }
 
@@ -2883,7 +2897,7 @@ a {
 }
 
 .adv_22 .adv_22_wrap .goods_empty {
-  width: 1210px;
+  width: 1440px;
   height: 300px;
   background: #fff;
 }
@@ -3050,7 +3064,7 @@ a {
 }
 
 .adv_25 .adv_25_wrap .store_empty {
-  width: 1210px;
+  width: 1440px;
   height: 280px;
   background: #fff;
 }
@@ -3159,7 +3173,7 @@ a {
 }
 
 .adv_23 .adv_23_wrap .store_empty {
-  width: 1210px;
+  width: 1440px;
   height: 280px;
   background: #fff;
 }
@@ -3214,7 +3228,7 @@ a {
 .adv_23 .adv_23_wrap .main_con {
   background: #fff;
   border-top: 1px solid #69b7f9;
-  width: 1210px;
+  width: 1440px;
 }
 
 .adv_23 .adv_23_wrap .main_con .empty {
@@ -3355,7 +3369,7 @@ a {
 }
 
 .adv_24 .adv_24_wrap .goods_empty {
-  width: 1210px;
+  width: 1440px;
   height: 300px;
   background: #fff;
 }
@@ -3683,19 +3697,16 @@ a {
 }
 
 .adv_27_wrap .floor_goods {
-  display: flex;
-  flex-wrap: wrap;
   position: relative;
   width: 100%;
   overflow: hidden;
 }
 
 .adv_27_wrap .floor_goods .item {
-  // float: left;
-  width: 20%;
-  min-height: 200px;
-  // margin: 0 10px 10px 0;
-  padding: 10px;
+  float: left;
+  float: left;
+  width: 286px;
+  height: 326px;
   background-color: #fff;
   box-sizing: border-box;
 }
@@ -3720,9 +3731,12 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap {
-  width: 172px;
-  text-align: center;
-  margin: 0 auto;
+  display: flex;
+  flex-direction:column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
   font-size: 14px;
   position: relative;
 }
@@ -3731,15 +3745,15 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap img {
-  width: 120px;
-  height: 120px;
+  width: 100%;
+  height: 100%;
   object-fit: contain;
   display: block;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .example_text {
-  width: 120px;
-  height: 120px;
+  width: 232px;
+  height: 232px;
   display: block;
   color: #777;
   text-align: center;
@@ -3747,7 +3761,6 @@ a {
   // background: #eee !important;
   font-weight: 300;
   transition: opacity ease 0.5s;
-  margin: 0 auto;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .example_text:hover {
@@ -3765,9 +3778,10 @@ a {
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title {
-  margin: 20px 0 8px 0;
-  max-height: 38px;
-  height: 38px;
+  font-weight: bold;
+  font-size: 14px;
+  color: #282E30;
+  height: 44px;
   overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
@@ -3778,6 +3792,8 @@ a {
   display: inline-block;
   background: #fff;
   letter-spacing: 0;
+  text-align: center;
+  margin-top: 20px;
 }
 
 .adv_27_wrap .floor_goods .item .wrap .title a {
@@ -3823,7 +3839,8 @@ a {
 .adv_28_wrap .industry-booth .industry-banner {
   position: relative;
   box-sizing: border-box;
-  width: 300px;
+  width: 348px;
+  height: 654px;
   overflow: hidden;
 }
 
@@ -3860,9 +3877,20 @@ a {
 }
 
 .adv_28_wrap .industry-booth .prod-inr {
+  width: 100%;
+  height: 100%;
   position: relative;
   display: block;
-  padding: 15px;
+  // padding: 15px;
+
+  a {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
 
 }
 
@@ -3871,7 +3899,8 @@ a {
   font-size: $fontE;
   color: #282E30;
   line-height: 24px;
-  height: 48px;
+  height: 44px;
+  text-align: center;
   display: -webkit-box;
   overflow: hidden;
   -webkit-line-clamp: 2;
@@ -3879,17 +3908,19 @@ a {
   word-wrap: break-word;
   position: relative;
   z-index: 2;
-  text-align: center;
+  margin-top: 20px;
 }
 
 .adv_28_wrap .industry-booth .prod-pic {
+  width: 232px;
+  height: 232px;
   text-align: center;
   margin-bottom: 10px;
 }
 
 .adv_28_wrap .industry-booth .prod-pic .pic-inr {
-  width: 100px;
-  height: 100px;
+  width: 100%;
+  height: 100%;
   display: inline-block;
   font-size: 0;
   overflow: hidden;
@@ -3922,22 +3953,24 @@ a {
   display: block;
   width: 100%;
   height: 100%;
-  padding: 30px 30px 30px 31px;
+  // padding: 30px 30px 30px 31px;
   box-sizing: border-box;
 }
 
 .adv_28_wrap .industry-booth .industry-theme-image {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  top: 0;
+  width: 100%;
+  height: 100%;
+  // position: absolute;
+  // right: 0;
+  // bottom: 0;
+  // top: 0;
 
 }
 
 .adv_28_wrap .industry-booth .theme-img-big {
   display: block !important;
   width: 100%;
-    height: 100%;
+  height: 100%;
 }
 
 .adv_28_wrap .industry-booth .theme-img-small {
@@ -3945,8 +3978,11 @@ a {
 }
 
 .adv_28_wrap .industry-booth .industry-theme-info {
+  width: 270px;
+  height: 88px;
   position: absolute;
-  bottom: 30px;
+  bottom: 114px;
+  left: 30px;
 }
 
 .adv_28_wrap .industry-booth .industry-title {

xinkeaboard-web/components/NavCatHeader.vue

@@ -169,7 +169,7 @@ onMounted(() => {
   background-color: #F6F8FA;
 }
 .header {
-  width: 1210px;
+  width: 1440px;
   height: 45px;
   margin: 0 auto;
   display: flex;

xinkeaboard-web/components/NavTopBar.vue

@@ -196,7 +196,7 @@ $colorMain: #e2231a !default; //主色、文字选中、搜索
   // border-bottom: 1px solid #dbdbdb;
 
   .header {
-    width: 1210px;
+    width: 1440px;
     height: 33px;
     display: flex;
     align-items: center;

xinkeaboard-web/components/SldDiy.vue

@@ -157,9 +157,7 @@
                   target="_blank"
                   :to="'/goods/detail/'+ calcProductName(item_main.goodsName) +'_'+ item_main.productId"
               >
-                <div href="javascript:void(0)" class="example_text">
-                  <img v-bind:src="item_main.mainImage" />
-                </div>
+                <img v-bind:src="item_main.mainImage" />
                 <p class="title">
                   <a href="javascript:void(0)" title>{{ item_main.goodsName }}</a>
                 </p>

xinkeaboard-web/components/SldHomeTopSearch.vue

@@ -197,7 +197,7 @@ a:visited {
     height: 80px;
     position: relative;
     z-index: 12;
-    width: 1210px;
+    width: 1440px;
     margin: 0 auto;
     display: flex;
     align-items: center;