diff --git a/CN/css/media.css b/CN/css/media.css deleted file mode 100644 index d5f79f9..0000000 --- a/CN/css/media.css +++ /dev/null @@ -1,29 +0,0 @@ - -/* 小于等于多少高度的样式 */ -@media screen and (max-height:880px){ -} -@media screen and (max-height:600px){ -} -/* 小于等于多少宽度的样式 */ -@media screen and (max-width:1660px){ -} -@media screen and (max-width:1440px){ -} -@media screen and (max-width:1366px){ - -} -@media screen and (max-width:1200px){ -} -@media screen and (max-width:1100px){ - -} -@media screen and (max-width:1024px){ -} -@media screen and (min-width: 1024px) { -} -@media screen and (max-width:768px){ -} -@media screen and (max-width:480px){ -} -@media screen and (max-width:360px){ -} \ No newline at end of file diff --git a/CN/css/style.css b/CN/css/style.css index 3c4c412..9e8d74c 100644 --- a/CN/css/style.css +++ b/CN/css/style.css @@ -1273,6 +1273,7 @@ input, textarea, select { } .fun-list .list .img{ padding: 20px; + text-align: center; } .fun-list .list .name{ font-size: 18px; @@ -1819,6 +1820,60 @@ input, textarea, select { -moz-transform: translate(100%,-110%); } } +.box-content .box-txt img{ + max-width: 100%; + height: auto !important; +} +.fun-list .list .img img{ + height: auto !important; +} + +.contentDiv{ + width: 100%; + height: auto; + padding: 0 25px; + background: rgba(255,255,255,.6); + box-sizing: border-box; + margin-top: 20px; + border-radius: 5px; + display: inline-block; +} +.contentDiv .list{ + width: 100%; + height: auto; + overflow: hidden; + border-bottom: 1px solid #ddd; +} +.contentDiv .list > div{ + display: inline-block; + height: auto; + padding: 20px 0; + box-sizing: border-box; +} +.contentDiv .list .img{ + float: right; + width: 425px; +} + +.contentDiv .list .text{ + float: left ; +} +.contentDiv .list:nth-child(2n) .img{ + float: left; + width: 425px; +} +.contentDiv .list:nth-child(2n) .text{ + float: right ; +} +.contentDiv .list .text{ + width: calc(100% - 500px); +} +.mune-other.mune .list{ + width: 20%; +} +.mune-other.mune .list a span{ + padding-left: 0px; +} /*兼容*/ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { /* IE10-specific styles go here */ @@ -1981,7 +2036,7 @@ input, textarea, select { .box-content{ width: 100%; min-height: auto;} .box::after{ display: none;} - .fun-list .list{ width: 48%; margin: 15px 0 0; padding: 15px;} + .fun-list .list{ width: 48%; margin: 15px 0 0; padding: 15px;float: left;} .fun-list .list:nth-child(2n){ float: right;} .fun-list .list .name{ font-size: 16px;} .fun-list .list .img{ padding: 10px;} @@ -2052,17 +2107,29 @@ input, textarea, select { .index-tianfu .center-block ul li a{ height: 250px; -} -.head_box .pull-right .top-box .link-box .between-center{ - margin-right: 10px; -} -.index-fly::after{ - background-size: 100% auto; -} -.mune .list i{ - background-size: auto 100% !important; - background-position: center !important; -} + } + .head_box .pull-right .top-box .link-box .between-center{ + margin-right: 10px; + } + .index-fly::after{ + background-size: 100% auto; + } + .mune .list i{ + background-size: auto 100% !important; + background-position: center !important; + } + #queryForm{ + padding: 20px !important; + } + .searcBox_l2{ + padding-left: 40px; + background:#ffffff; + border-top: 1px solid #C8C8C8; + } + .searcBox_l2 .searchBoxTEXT2{ + width: calc(85vw - 40px); + text-indent: 20px; + } } @media screen and (min-width: 1024px) { @@ -2115,6 +2182,20 @@ input, textarea, select { .box-content .box-txt p{ text-indent: 0 !important; } + .mune-other.mune .list a span{ + padding-top: 20px; + font-size: 16px; + } + .mune-other.mune .list{ + font-size: 18px; + } + .contentDiv .list .img,.contentDiv .list .text,.contentDiv .list:nth-child(2n) .img,.contentDiv .list:nth-child(2n) .text{ + float: none; + width: 100%; + } + .contentDiv .list .img img{ + height: auto !important; + } } @media screen and (max-width:480px){ .index-tianfu .center-block{ margin-top: 35px;} @@ -2124,4 +2205,12 @@ input, textarea, select { .head_box .pull-right .top-box .link-box .between-center{ font-size: 0;} .head_box .pull-right .top-box .link-box .between-center div a{ font-size: 14px;} .head_box .pull-right .top-box .link-box .between-center img{ margin-right: 0;} + + .mune-other.mune .list a span{ + padding-top: 20px; + font-size: 14px; + } + .mune .list a span{ + font-size: 14px; + } } \ No newline at end of file diff --git a/CN/flight/flight.html b/CN/flight/flight.html index c40950e..8f4b8d9 100644 --- a/CN/flight/flight.html +++ b/CN/flight/flight.html @@ -281,6 +281,7 @@ }, type: "POST", dataType: "JSON", + crossDomain:true, success: function (data) { if (data.length == 0){ str += "
  • 无搜索结果
  • " @@ -310,6 +311,7 @@ }, type: "POST", dataType: "JSON", + crossDomain:true, success: function (data) { for (var i = 0; i < data.length; i++) { str += "
  • "+data[i].categoryTitle+"
  • " diff --git a/CN/play/catering/catering.html b/CN/play/catering/catering.html index 2f3a253..fe5e375 100644 --- a/CN/play/catering/catering.html +++ b/CN/play/catering/catering.html @@ -61,7 +61,6 @@ } .flight-search .list{ - width: 25% !important; padding: 0 10px !important; box-sizing: border-box; margin-right: 0 !important; @@ -75,9 +74,6 @@ .flight-search .list:nth-child(5) > button{ margin-left: 20px; } - .mune .list { - z-index: 0; - }