diff --git a/css/huaxiaMedia.css b/css/huaxiaMedia.css index 55170a0..014475a 100644 --- a/css/huaxiaMedia.css +++ b/css/huaxiaMedia.css @@ -596,7 +596,6 @@ align-items: center; width: 33%; } .tyhder_listnav { - padding-bottom: 26px; } #ys-cate{overflow-x: scroll;overflow-y: hidden;} @@ -605,25 +604,26 @@ align-items: center; .zx-nav li, .szx-nav li, .px-nav li{flex-shrink: 0;margin-right: 20px;} .jg-xian{display: none;} .jg-guanz {width: 80px;height: 30px;line-height: 30px;} -} -} -@media screen and (min-width:1621px) and (max-width:1820px) { - .logo{width: 30%;} - .p-zy180,.head-box{padding: 20px 180px;} - .tyhder_di { - display: none; - } - .tyhder_listnav a{ - padding-left: 8px; - } - #ys-cate{overflow-x: scroll;overflow-y: hidden;} - #ys-cate li{padding: 10px 0 8px 0;font-size: 14px;flex-shrink: 0;} - .zx-nav li, .szx-nav li, .px-nav li{flex-shrink: 0;margin-right: 20px;} - .jg-xian{display: none;} + + /* 购物车 */ + .cart-head{padding: 22px 0px 16px 0px;} + .cart-content>div:nth-child(1),.cart-head div:first-child{width: 16%;padding-left: 20px;} + .cart-head div:nth-of-type(6){width: 8%;} + + .cart-content{margin-top: 20px;} + .cart-content>div:nth-child(6){width: 8%;padding-top: 10px;} + .num-box{width: 12%;padding-top: 10px;} } @media screen and (min-width:1621px) and (max-width:1820px) { .logo {width: 30%;} + .p-zy180,.head-box{padding: 20px 180px;} + .tyhder_di {display: none;} + .tyhder_listnav a{padding-left: 8px;} + #ys-cate{overflow-x: scroll;overflow-y: hidden;} + #ys-cate li{padding: 10px 0 8px 0;font-size: 14px;flex-shrink: 0;} + .zx-nav li, .szx-nav li, .px-nav li{flex-shrink: 0;margin-right: 20px;} + .jg-xian{display: none;} } @media (max-width:766px){ #zx-list img {width: 120px;max-height: 74px;} @@ -868,6 +868,32 @@ align-items: center; #previewImg div:first-child{width: 60%;height: auto;} #previewImg div:first-child img{height: 100%;float: left;} + + .zhanw{height: 20px;} + /* 购物车 */ + section .whoil .whoil-1{padding: 20px;margin: 0 -20px;} + section .whoil .whoil-1 .all {font-size: 16px;border-bottom: #cb1919 1px solid;} + section .whoil{padding: 0 20px;} + .cart-content{display: flex;position: relative;justify-content: space-between;padding: 10px 10px 60px 10px;} + .cart-head{display: none;} + .cart-content > div:nth-child(1), .cart-head div:first-child{width: 20%;display: flex;justify-content: space-between;align-items: center;} + .cart-content>div:nth-child(1),.cart-head div:first-child{width: 100px;padding-left: 0px;} + .m-z37 {margin-left: 0px;} + .cart-content{margin-top: 10px;} + .cart-content>div:nth-child(2){width: 100%;padding-top: 0px;} + .cart-content>div:nth-child(2) a{font-size: 14px;height: 50px;line-height: 24px;} + .cart-content>div:nth-child(3){font-size: 14px;position: absolute;bottom: 70px;right: 10px;width: auto;} + .cart-content>div:nth-child(3)::before{content: '单价：';font-weight: 400;color: #525252;} + .cart-content>div:nth-child(5){font-size: 14px;position: absolute;bottom: 10px;right: 15%;width: auto;} + .cart-content>div:nth-child(5)::before{content: '总价：';} + .cart-content>div:nth-child(6){position: absolute;bottom: 10px;right: 10px;width: auto;} + .num-box{padding-top: 10px;position: absolute;bottom: 36px;right: 10px;width: auto;} + .jies-box{margin-top: 10px;height: 40px;line-height: 40px;} + .jies-box .settlement {height: 40px;width: 80px;font-size: 16px;} + .jies-box > div:first-child span {margin-left: 10px;} + section .whoil .whoil-1 .swiper-container .swiper-text {padding: 20px 0px 10px 0;margin-bottom: 20px;font-size: 16px;} + section .whoil .whoil-1 .swiper-container img {height: 190px;object-fit: cover;} + section .whoil .whoil-1 .swiper-container { padding-bottom: 30px;} } @media (min-width:767px) and (max-width:991px){ #zx-list img {width: 250px;max-height: 155px;} @@ -923,6 +949,24 @@ align-items: center; #pm-list .font-20{font-size: 15px;} #pm-list .font-15{font-size: 13px;} #pm-list .m-x20{margin-bottom: 10px;} + /* 购物车 */ + section .whoil{padding: 0 20px;} + .cart-content > div:nth-child(1), .cart-head div:first-child{width: 10%;} + .cart-head{padding: 22px 0px 16px 0px;} + .cart-content>div:nth-child(1),.cart-head div:first-child{width: 16%;padding-left: 20px;} + .cart-head div:nth-of-type(2){width: 38%;padding-left: 20px;} + .cart-head div:nth-of-type(3){width: 12%;} + .cart-head div:nth-of-type(4){width: 12%;} + .cart-head div:nth-of-type(5){width: 11%;} + .cart-head div:nth-of-type(6){width: 8%;} + .m-z37 {margin-left: 20px;} + .cart-content{margin-top: 20px;} + .cart-content>div:nth-child(2){width: 38%;padding-left: 20px;padding-top: 10px;} + .cart-content>div:nth-child(2) a{font-size: 15px;height: 50px;line-height: 24px;} + .cart-content>div:nth-child(3){width: 12%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(5){width: 11%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(6){width: 8%;padding-top: 10px;} + .num-box{width: 12%;padding-top: 10px;} } @media (min-width:992px) and (max-width:1199px){ #zx-list img {width: 250px;max-height: 155px;} @@ -957,7 +1001,24 @@ align-items: center; #pm-list .font-15{font-size: 13px;} #pm-list .m-x20{margin-bottom: 10px;} - + /* 购物车 */ + section .whoil{padding: 0 120px;} + .cart-content > div:nth-child(1), .cart-head div:first-child{width: 10%;} + .cart-head{padding: 22px 0px 16px 0px;} + .cart-content>div:nth-child(1),.cart-head div:first-child{width: 16%;padding-left: 20px;} + .cart-head div:nth-of-type(2){width: 38%;padding-left: 20px;} + .cart-head div:nth-of-type(3){width: 12%;} + .cart-head div:nth-of-type(4){width: 12%;} + .cart-head div:nth-of-type(5){width: 11%;} + .cart-head div:nth-of-type(6){width: 8%;} + .m-z37 {margin-left: 20px;} + .cart-content{margin-top: 20px;} + .cart-content>div:nth-child(2){width: 38%;padding-left: 20px;padding-top: 10px;} + .cart-content>div:nth-child(2) a{font-size: 15px;height: 50px;line-height: 24px;} + .cart-content>div:nth-child(3){width: 12%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(5){width: 11%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(6){width: 8%;padding-top: 10px;} + .num-box{width: 12%;padding-top: 10px;} } @media (min-width:1200px) and (max-width:1440px){ #ys-cate{overflow-x: scroll;overflow-y: hidden;} @@ -967,4 +1028,23 @@ align-items: center; .jg-xian{display: none;} .jg-guanz {width: 80px;height: 30px;line-height: 30px;} .p-zy180,.head-box {padding: 20px 100px;} + + /* 购物车 */ + section .whoil{padding: 0 120px;} + .cart-content > div:nth-child(1), .cart-head div:first-child{width: 10%;} + .cart-head{padding: 22px 0px 16px 0px;} + .cart-content>div:nth-child(1),.cart-head div:first-child{width: 12%;padding-left: 20px;} + .cart-head div:nth-of-type(2){width: 42%;padding-left: 20px;} + .cart-head div:nth-of-type(3){width: 12%;} + .cart-head div:nth-of-type(4){width: 12%;} + .cart-head div:nth-of-type(5){width: 11%;} + .cart-head div:nth-of-type(6){width: 11%;} + + .cart-content{margin-top: 20px;} + .cart-content>div:nth-child(2){width: 42%;padding-left: 20px;padding-top: 10px;} + .cart-content>div:nth-child(2) a{font-size: 15px;height: 50px;line-height: 24px;} + .cart-content>div:nth-child(3){width: 12%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(5){width: 11%;padding-top: 10px;font-size: 14px;} + .cart-content>div:nth-child(6){width: 11%;padding-top: 10px;} + .num-box{width: 12%;padding-top: 10px;} } \ No newline at end of file diff --git a/htmls/artNetwork/exhibitionComingDetail.html b/htmls/artNetwork/exhibitionComingDetail.html index 8da7bd8..0f0e299 100644 --- a/htmls/artNetwork/exhibitionComingDetail.html +++ b/htmls/artNetwork/exhibitionComingDetail.html @@ -154,7 +154,7 @@ 上海市樱花路869号喜玛拉雅中心A区3-4 层
- 去这里 + 去这里
diff --git a/htmls/artNetwork/goMap.html b/htmls/artNetwork/goMap.html index e8688c8..89fce07 100644 --- a/htmls/artNetwork/goMap.html +++ b/htmls/artNetwork/goMap.html @@ -5,70 +5,49 @@ - - + 目的地 + - - -
+ - @@ -69,7 +70,7 @@
-
+
全部商品(20)
@@ -85,11 +86,11 @@
操作
-
+
- 图片丢失 + 图片丢失
竹迪 客厅装饰画现代简约晶瓷画沙发背景墙挂画现代简约晶瓷画沙发背景墙挂画三联画餐厅墙画靠山书房壁画抽象三联画餐厅墙画靠山书房壁画抽象艺术画 11时来运转8190x3
￥188.00
@@ -104,7 +105,7 @@
- 图片丢失 + 图片丢失
竹迪 客厅装饰画现代简约晶瓷画沙发背景墙挂画现代简约晶瓷画沙发背景墙挂画三联画餐厅墙画靠山书房壁画抽象三联画餐厅墙画靠山书房壁画抽象艺术画 11时来运转8190x3
￥188.00
diff --git a/js/artistCenter/artistCenter.js b/js/artistCenter/artistCenter.js index 8cc6124..62244d9 100644 --- a/js/artistCenter/artistCenter.js +++ b/js/artistCenter/artistCenter.js @@ -1,64 +1,11 @@ $(function(){ $('.ty_left li').on('click',function(){//左侧导航的点击事件 - $('.ty_tit').text($(this).find('span').text()) + $('.ty_left li').removeClass('ty_lititnoe') + $('.ty_left li').addClass('ty_litittwo') $('.ty_left li span').removeClass('left-title') + $(this).removeClass('ty_litittwo') + $(this).addClass('ty_lititnoe') $(this).find('span').addClass('left-title') - $('.ty_left li .left-imgone').css('display','none') - $('.ty_left li .left-imgtwo').css('display','flex') - $(this).find('.left-imgtwo').css('display','none') - $(this).find('.left-imgone').css('display','flex') - let leftIndex = $(this).index() - clearAll() - switch (leftIndex){ - case 2://个人资料 - console.log($(this).find('span').text()); - $('#personal').css('display','') - break; - case 3://密码修改 - console.log($(this).find('span').text()); - $('#updatePass').css('display','') - break; - case 4://我的订单 - console.log($(this).find('span').text()); - $('#myOrder').css('display','') - break; - case 5://我的关注 - console.log($(this).find('span').text()); - $('#myAttention').css('display','') - break; - case 6://我的收藏 - console.log($(this).find('span').text()); - $('#myCollection').css('display','') - break; - case 7://我的积分 - console.log($(this).find('span').text()); - $('#myIntegral').css('display','') - break; - case 8://我的优惠券 - console.log($(this).find('span').text()); - $('#myCoupon').css('display','') - break; - case 9://我的征稿作品管理 - console.log($(this).find('span').text()); - $('#myZG').css('display','') - break; - case 10://收货地址 - console.log($(this).find('span').text()); - $('#mySH').css('display','') - break; - case 11://推荐商品 - console.log($(this).find('span').text()); - $('#myTJ').css('display','') - break; - case 12://艺术访谈 - console.log($(this).find('span').text()); - $('#myFW').css('display','') - break; - case 13://书刊杂志 - console.log($(this).find('span').text()); - $('#mySK').css('display','') - break; - } }) yisList() zhazList() diff --git a/js/huaxia.js b/js/huaxia.js index 152fa64..f3a62f1 100644 --- a/js/huaxia.js +++ b/js/huaxia.js @@ -748,12 +748,8 @@ function getScrollTop() { } return scroll_top; } - document.addEventListener("scroll", myFunction); - function myFunction() { - - if (getScrollTop() > $(".tyhder_herader>img").css("height").split("px")[0]) { $(".pod").css("position", "fixed") $(".pod").addClass("dtip") @@ -766,8 +762,6 @@ function myFunction() { $(".tyhder_moban").css("top", `0px`) $(".tyhder_listnavpad").css("top",`${$(".tyhder_herader>nav").css("height")}`) } - - } $(function navdao(params) { // ---