diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/homepage/one.vue index 15b88d5..4af6df3 100644 --- a/src/pages/modules/homepage/one.vue +++ b/src/pages/modules/homepage/one.vue @@ -12,7 +12,7 @@
-
混料
+
混料
@@ -37,7 +37,7 @@
-
成型
+
成型
@@ -933,6 +933,7 @@ export default { padding 40px 0 20px 54px .n_body_container_wraper _wh(100%, 100%) + padding-right 8px // .box1 // // _wh(100%, 20%) // width 100% @@ -947,24 +948,19 @@ export default { .box1 // _wh(100%, 20%) width 100% - height 23% + height 212px _fj() flex-direction row margin-bottom 1% .box2 clear both - _wh(100%, 37%) + _wh(100%, calc(48% - 106px)) _fj() flex-direction row - margin-bottom 1% + +.box2 + margin-top 1% .item_title - _font(46px, 100%, #fff,,,) - display inline-block - height 100% - line-height 30% - padding-right .8rem - padding-top .6rem - padding-left .3rem + _font(46px, 1, #fff,,,) .bg _wh(100%, 100%) overflow hidden @@ -989,22 +985,22 @@ export default { float right _wh(4.0273rem, 100%) .item_wrap - _wh(100%, 100%) + _wh(calc(50% - 8px), 100%) .item_tip clear both - _wh(100%, .4rem) - line-height .4rem - background center center / 100% 100% url(../../..//images/screen1/title_bg_1.png) no-repeat + _wh(100%, 32px) + line-height 32px + background center center / 100% 100% url(../../..//images/screen1/title_bg_2.png) no-repeat .item_tip_2 background center center / 100% 100% url(../../..//images/screen1/title_bg_2.png) no-repeat .item_tip_left float left _wh(60%, 100%) font-family "SourceHanSansCN" - _font(.22rem, inherit, #fff, 700, left) - letter-spacing .02rem - text-shadow 0 0 .09rem #159AFF - padding-left .8rem + _font(18px, inherit, #fff, 700, left) + letter-spacing 2px + text-shadow 0 0 9px #159AFF + padding-left 40px .item_tip_right float right _wh(39%, 100%) @@ -1127,44 +1123,41 @@ export default { // flex-direction column .item_content_3 _wh(100%, 100%) - height calc(100% - .4rem) - padding-top .1rem - _fj(flex-start) - flex-direction column + height calc(100% - 32px) + padding 20px 30px + _fj(center) .right_1_up clear both _wh(100%, 100%) - padding 0 .3rem .2rem - background center bottom / 100% .03rem url(../../..//images/screen1/line_2.png) no-repeat + _fj(row) + // background center bottom / 100% .03rem url(../../..//images/screen1/line_2.png) no-repeat .right_1_up_left - float left - _wh(1.5rem, 1.5rem) + _wh(140px, 140px) background center bottom / 100% 100% url(../../..//images/screen1/item_3.png) no-repeat - _fj(center) + _fj(row,center) .echart_d3_wrap _wh(82%, 82%) margin 0 auto .right_1_up_right - float right _wh(48%, 100%) .right_1_up_right_item - _wh(100%, .6rem) + _wh(100%, 60px) background center bottom / 100% 100% url(../../..//images/screen1/item_4.png) no-repeat _fj(space-evenly) // flex-direction column &:nth-child(2) - margin-top .2rem + margin-top 20px .right_1_up_p1 font-family "SourceHanSansCN" - _font(.22rem, .22rem, #78B1DE, 700, center) - margin-left .24rem + _font(22px, 60px, #78B1DE, 700, center) + margin-left 24px .right_1_up_p2 font-family "SourceHanSansCN" - _font(.24rem, .24rem, $yellow, 700, center) - margin-right .2rem + _font(24px, 60px, $yellow, 700, center) + margin-right 20px span - _font(.18rem, .2rem, #fff, 700, center) - padding-left .6rem + _font(18px, 60px, #fff, 700, center) + padding-left 6px .right_1_down _wh(100%, calc(100% - 1.6rem)) padding .05rem .3rem 0 diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/homepage/two.vue index d177571..2636e95 100644 --- a/src/pages/modules/homepage/two.vue +++ b/src/pages/modules/homepage/two.vue @@ -12,7 +12,7 @@
-
包装
+
包装
@@ -37,7 +37,7 @@
-
成品
+
成品
@@ -1139,27 +1139,23 @@ export default { padding 40px 40px 20px 14px .n_body_container_wraper _wh(100%, 100%) + padding-left 8px .box1 // _wh(100%, 20%) width 100% - height 23% + height 212px _fj() flex-direction row margin-bottom 1% .box2 clear both - _wh(100%, 37%) + _wh(100%, calc(48% - 106px)) _fj() flex-direction row - margin-bottom 1% + +.box2 + margin-top 1% .item_title - _font(46px, 100%, #fff,,,) - display inline-block - height 100% - line-height 30% - padding-right .8rem - padding-top .6rem - padding-left .3rem + _font(46px, 1, #fff,,,) .bg _wh(100%, 100%) overflow hidden @@ -1184,22 +1180,22 @@ export default { float right _wh(4.0273rem, 100%) .item_wrap - _wh(100%, 100%) + _wh(calc(50% - 8px), 100%) .item_tip clear both - _wh(100%, .4rem) - line-height .4rem - background center center / 100% 100% url(../../..//images/screen1/title_bg_1.png) no-repeat + _wh(100%, 32px) + line-height 32px + background center center / 100% 100% url(../../..//images/screen1/title_bg_2.png) no-repeat .item_tip_2 background center center / 100% 100% url(../../..//images/screen1/title_bg_2.png) no-repeat .item_tip_left float left _wh(60%, 100%) font-family "SourceHanSansCN" - _font(.22rem, inherit, #fff, 700, left) - letter-spacing .02rem - text-shadow 0 0 .09rem #159AFF - padding-left .8rem + _font(18px, inherit, #fff, 700, left) + letter-spacing 2px + text-shadow 0 0 9px #159AFF + padding-left 40px .item_tip_right float right _wh(39%, 100%) @@ -1317,44 +1313,41 @@ export default { background center center / 100% 100% url(../../..//images/screen1/dot_1.png) no-repeat .item_content_3 _wh(100%, 100%) - height calc(100% - .4rem) - padding-top .1rem - _fj(flex-start) - flex-direction column + height calc(100% - 32px) + padding 20px 30px + _fj(center) .right_1_up clear both _wh(100%, 100%) - padding 0 .3rem .2rem - background center bottom / 100% .03rem url(../../..//images/screen1/line_2.png) no-repeat + _fj(row) + // background center bottom / 100% .03rem url(../../..//images/screen1/line_2.png) no-repeat .right_1_up_left - float left - _wh(1.5rem, 1.5rem) + _wh(140px, 140px) background center bottom / 100% 100% url(../../..//images/screen1/item_3.png) no-repeat - _fj(center) + _fj(row, center) .echart_d3_wrap _wh(82%, 82%) margin 0 auto .right_1_up_right - float right _wh(48%, 100%) .right_1_up_right_item - _wh(100%, .6rem) + _wh(100%, 60px) background center bottom / 100% 100% url(../../..//images/screen1/item_4.png) no-repeat _fj(space-evenly) // flex-direction column &:nth-child(2) - margin-top .2rem + margin-top 20px .right_1_up_p1 font-family "SourceHanSansCN" - _font(.22rem, .22rem, #78B1DE, 700, center) - margin-left .24rem + _font(22px, 60px, #78B1DE, 700, center) + margin-left 24px .right_1_up_p2 font-family "SourceHanSansCN" - _font(.24rem, .24rem, $yellow, 700, center) - margin-right .2rem + _font(24px, 60px, $yellow, 700, center) + margin-right 20px span - _font(.18rem, .2rem, #fff, 700, center) - padding-left .6rem + _font(18px, 60px, #fff, 700, center) + padding-left 6px .right_1_down _wh(100%, calc(100% - 1.6rem)) padding .05rem .3rem 0