diff --git a/.idea/hxyshtml.iml b/.idea/hxyshtml.iml new file mode 100644 index 0000000..bf4c9d3 --- /dev/null +++ b/.idea/hxyshtml.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ef004d1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..2df6bfa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..9661ac7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..c6cb546 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 1632468881477 + + + + + + + + + + + + \ No newline at end of file diff --git a/css/foot.min.css b/css/foot.min.css index 74026ca..5a5c9f5 100644 --- a/css/foot.min.css +++ b/css/foot.min.css @@ -26,7 +26,7 @@ body{padding: 0;margin: 0;} .foot-end-titlez,.foot-end-title{font-size: 14px;line-height: 26px;font-weight: bold;} .foot-end-content{font-size: 13px;color: #616161;} .shu-logo{max-height: 70px; margin-bottom: 14px;} -.foot-count{margin: 30px 15px 0 15px;line-height: 30px;} +.foot-count{margin: 30px 15px 0 15px;line-height: 30px;width: 100%;} .foot-qrcode{margin-top: 30px;display: flex;justify-content: space-between;} .foot-qrcode>div{display: flex;flex-direction: column;align-items: center;cursor: pointer;} .foot-qrcode>div>img{width: 99px;height: 99px;} @@ -39,14 +39,14 @@ body{padding: 0;margin: 0;} .fixed_foot>a{padding: 15px 0 10px 0;border-left: 1px solid rgba(255,255,255,.2);text-decoration: none;} .fixed_foot>a:nth-child(1){border-left: 1px solid rgba(255,255,255,0);} @media (max-width:766px){ - .foot-end-box{margin-bottom: 70px;} + /* .foot-end-box{margin-bottom: 70px;} */ .foot-nav-box{padding: 10px 15px;} .foot-end-right .linh30{line-height: 25px;} .foot-end-box>div:first-child{padding: 20px 20px 0 15px;} .foot-count {margin: 10px 15px 0 15px;line-height: 26px;} .foot-end-box > div:first-child{display: none;} .foot-end-bottom,.foot-nav-box,.shu-logo{display: none;} - .foot-count {margin: 0px;line-height: 25px;width: 60%;} + .foot-count {margin: 0px;line-height: 25px;width: 74%;} .foot-end-titlez, .foot-end-title{font-size: 17px;font-weight: bold;color: #CB1919;margin-bottom: 0px;} .foot-end-content {font-size: 14px;} /* .foot-count .foot-end-content:nth-child(3) {float: left;margin-right: 64px;} */ @@ -56,6 +56,7 @@ body{padding: 0;margin: 0;} .fixed_foot{display: flex;} .foot-end-right {padding: 0 20px 15px 20px;display: block;} .foot-end-right>div:first-child{width: 74%;} + .foot-bottom{padding-bottom: 70px;} } @media (min-width:767px) and (max-width:991px){ @@ -75,6 +76,7 @@ body{padding: 0;margin: 0;} .foot-qrcode {margin-top: -245px;display: flex;flex-direction: column;float: right;} .foot-qrcode>div>div{font-size: 16px;} .foot-end-title{margin-top: 30px;} + .foot-bottom{padding-bottom: 70px;} } @media (min-width:992px) and (max-width:1199px){ .foot-nav-box{padding: 20px 60px;} diff --git a/css/huaxia.css b/css/huaxia.css index 88a934f..0fd9efb 100644 --- a/css/huaxia.css +++ b/css/huaxia.css @@ -1796,7 +1796,8 @@ input { border-top: 1px solid #CCCCCC; } -#cq-list a,#sh-list a{width: 41%;} +#sh-list a{width: 41%;} +#cq-list a{width: 100%;} #sh-list a .pa{bottom: 0px;background: linear-gradient(to top,rgba(0,0,0,.5),rgba(255,255,255,0));margin: 0;} #sh-list .dis .m-y20:last-child { margin-right: 0; @@ -6037,3 +6038,4 @@ ul { .jies-box>div:first-child span{margin-left: 20px;cursor: pointer;color: #222222;font-size: 14px;} .jies-box>div:last-child span span{font-size: 20px;font-weight: bold;color: #CB1919;} .jies-box .settlement{height: 50px;background: #CB1919;color: #FFFFFF;display: inline-block;width: 130px;text-align: center;font-size: 18px;margin-left: 10px;cursor: pointer;} + diff --git a/css/huaxiaMedia.css b/css/huaxiaMedia.css index 038f6fd..f2e0d19 100644 --- a/css/huaxiaMedia.css +++ b/css/huaxiaMedia.css @@ -507,7 +507,6 @@ align-items: center; width: 33%; } .tyhder_listnav { - padding-bottom: 26px; } #ys-cate{overflow-x: scroll;overflow-y: hidden;} @@ -516,25 +515,31 @@ 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;} + + /* 结算页面 */ + section .whole .whole-1 .Buyers #container #wrap .address .name {width: 120px;padding: 10px 0;text-align: center;} } @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;} + /* 结算页面 */ + section .whole .whole-1 .Buyers #container #wrap .address .name {width: 120px;padding: 10px 0;text-align: center;} } @media (min-width:767px) and (max-width:991px){ .tygrzx_ysnr { @@ -644,6 +649,7 @@ align-items: center; .zx-nav li, .szx-nav li, .px-nav li {margin-right: 20px;padding: 10px 0 8px 0;font-size: 14px;} .zx-xx,.zx-gg {padding: 3px 10px;font-size: 14px;} #zled,#zlwill,#zling{width: 100%;} + #zl-list{padding-bottom: 20px;} #zl-list .m-s30{margin-top: 20px;} #zl-list .w90{width: 100%;max-height: 200px;object-fit: cover;} #ys-list {justify-content: space-between;width: 100%;margin-top: -20px;} @@ -749,7 +755,6 @@ align-items: center; #ysj-ft-list .pd20{padding: 0;} #ysjzz-list img{margin-bottom: 10px;} .m-s50{margin-top: 20px;} - #jgjj-box{margin-top: 0px;} .jg-tou{margin-top: 10px;} .jg-tou .p-sx20{padding: 0 20px;} @@ -760,7 +765,7 @@ align-items: center; #jgjj-box .linh42 .dac{align-items: baseline;} .jg-guanz{width: 80px;height: 30px;line-height: 30px;flex-shrink: 0;margin-left: 10px;} .borr{font-size: 14px;} - + .zzDetail{display: inline-block;} .jg-tou .p-zy20{padding-left: 0px;padding-right: 0px;} #jgs-list,#jgz-list,#jgm-list{justify-content: space-between;} #jgs-list .w25,#jgz-list .w25,#jgm-list .w25{width: 48%;} @@ -770,6 +775,7 @@ align-items: center; #jgz-list .m-s10{margin-top: 0;} #jgcy-box{padding-bottom: 20px;} #zx-list .m-y30{margin-right: 10px;} + .px-nav {margin-bottom: 20px;} .artist_box .pd6,.trainDetail .pd6{margin-left: -20px;margin-right: -20px;} .trainDetail .m-s30{margin-top: 6px;} .trainDetail .m-x10{display: none;} @@ -874,6 +880,83 @@ align-items: center; .tyhder_di{ display: none; } + + .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;} + + /* 订单结算 */ + section .whole{padding: 0 20px;} + section .whole .whole-1 .all h2{font-size: 18px;} + section .whole .whole-1 .Buyers #container span:nth-child(2) a{font-size: 14px;} + section .whole .whole-1 .Buyers #container #wrap .address .name {padding: 8px 0;width: 100px;text-align: center;} + section .whole .whole-1 .Buyers #container #wrap .address{flex-wrap: wrap;} + section .whole .whole-1 .Buyers #container #wrap .address p{margin: 10px 0;width: 100%;} + section .whole .whole-1 .Buyers{padding: 20px 0;} + section .whole .whole-1 .coupon{display: flex;flex-wrap: wrap;justify-content: space-between;} + section .whole .whole-1 .Buyers #container #read-more{margin-top: 0px;} + section .whole .whole-1 .coupon{padding-left: 0px;padding-bottom: 20px;} + section .whole .whole-1 .coupon .yh{width: 48%;margin-right: 0px;margin-top: 20px;height: 100px;} + .msg-bei {margin-top: 20px;} + .setall > div:first-child { padding: 10px 20px;} + .price-box {line-height: 25px;font-size: 14px;} + .setall > div:nth-child(2) {padding: 10px 20px;} + .sumbtn-box { padding: 10px 20px 10px 0;} + .sumbtn-box div {font-size: 14px;width: 100px;height: 30px;line-height: 30px;} + .commodity .jies-head {display: none;} + .jies-list{display: flex;justify-content: space-between;position: relative;} + .jies-list>div:first-child{width: 100%;text-align: left;display: flex;} + .jies-list>div:first-child div div{font-size: 14px;line-height: 24px;color: #000000;margin-left: 10px;width: 100%;height: auto;} + .jies-list>div:nth-child(2)::before{content: '单价:';font-size: 14px;} + .jies-list>div:nth-child(2){position: absolute;bottom: 32px;right: 0;width: auto;} + .jies-list div:nth-child(3){position: absolute;bottom: 32px;width: auto;left: 95px;} + .jies-list div:nth-child(4)::before{content: '合计:';font-size: 14px;} + .jies-list div:nth-child(4){position: absolute;bottom: 10px;right: 0;width: auto;} + section .whole .whole-1 .Buyers #container #wrap .address .na-2{margin-top: 0px;} + .yhmoney > div:first-child {font-size: 30px;} + .yhyuan {font-size: 12px;} + .yhman {font-size: 12px;} + .yhdate {margin-top: 22px;font-size: 12px;} + .yhguoqi {margin-top: 22px;font-size: 12px;} + + section .whole .whole-1 .Wxcollec {line-height: 0px;padding-top: 40px;} + section .whole .whole-1 .Wxcollec .wxprice span {font-size: 20px;} + section .whole .whole-1 .Wxcollec .wxprice {padding-bottom: 40px;} + section .whole .whole-1 .Wxcollec .wxzf {padding-bottom: 30px;} + + section .whole .whole-1 .payment {line-height: 40px;padding-top: 50px; padding-bottom: 50px;} + section .whole .whole-1 .payment img {width: 50px;} + section .whole .whole-1 .payment h2{font-size: 16px;} + section .whole .whole-1 .payment .order{display: flex;flex-direction: column;} + section .whole .whole-1 .payment .order .odernum{padding-right: 0px;} + section .whole .whole-1 .payment .order .oderhome{padding-left: 0px;} + header .bac{height: auto;padding-bottom: 20px;} + .pubpopu{border-radius: 0px;} + .tankt {font-size: 14px;} + + .zzFoot{display: inline-block;width: 100%;} } @media (max-width:520px){ .tygrzx_mr { @@ -1118,6 +1201,50 @@ white-space: nowrap; + #jgsk-box,#jgzh-box,#jgcy-box{padding-bottom: 20px;} + #zx-list .m-y30{margin-right: 10px;} + .trainDetail .p-zy40{padding-left: 20px;padding-right: 20px;} + .trainDetail .clips4{-webkit-line-clamp: 3;} + .trainDetail .linh30{line-height: 25px;} + #pm-list img{height: 200px;} + #pm-list .w56{width: 100%;padding-left: 10px;padding-right: 10px;} + #pm-list .clips3{-webkit-line-clamp: 2;} + #pm-list .m-s20{margin-top: 10px;} + #pm-list .m-x10{margin-bottom: 0px;} + #pm-list .p-sx20{padding-top: 10px;padding-bottom: 10px;} + #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;} + + /* 订单结算 */ + section .whole .whole-1 .Buyers #container #wrap .address .name {padding: 8px 0;width: 100px;text-align: center;} + section .whole .whole-1 .Buyers{padding: 20px 0;} + section .whole{padding: 0 20px;} + section .whole .whole-1 .coupon{display: flex;flex-wrap: wrap;} + section .whole .whole-1 .coupon .yh{width: 30.5%;margin-right: 20px;} + section .whole .whole-1 .Buyers #container #read-more{margin-top: 0px;} + section .whole .whole-1 .Buyers #container #wrap .address{margin-bottom: 10px;} + section .whole .whole-1 .Buyers #container #wrap .address .na-2{margin-top: 0px;} + + header .bac{padding-bottom: 20px;} } @media screen and (width:320px) { .exhibition .item-box { @@ -1163,7 +1290,31 @@ white-space: nowrap; #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;} + + /* 订单结算 */ + section .whole .whole-1 .Buyers #container #wrap .address .name {width: 120px;padding: 10px 0;text-align: center;} + section .whole{padding: 0 120px;} + section .whole .whole-1 .coupon{display: flex;flex-wrap: wrap;} + section .whole .whole-1 .coupon .yh{width: 30.5%;margin-right: 20px;} + section .whole .whole-1 .Buyers #container #read-more{margin-top: 0px;} } @media (min-width:1200px) and (max-width:1440px){ #ys-cate{overflow-x: scroll;overflow-y: hidden;} @@ -1173,4 +1324,29 @@ white-space: nowrap; .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;} + + /* 订单结算 */ + section .whole .whole-1 .Buyers #container #wrap .address .name {width: 160px;padding: 10px 0;text-align: center;} + section .whole{padding: 0 120px;} + section .whole .whole-1 .coupon{display: flex;flex-wrap: wrap;} + section .whole .whole-1 .coupon .yh{width: 30.5%;} } \ No newline at end of file diff --git a/css/logshoppingcar/tobepaid.css b/css/logshoppingcar/tobepaid.css index a1e722d..5968474 100644 --- a/css/logshoppingcar/tobepaid.css +++ b/css/logshoppingcar/tobepaid.css @@ -81,10 +81,9 @@ section .whole .whole-1 .Buyers #container #wrap .address { display: flex; align-items: center; } - section .whole .whole-1 .Buyers #container #wrap .address .name { display: inline-block; - padding: 10px 50px; + width: 160px;padding: 10px 0;text-align: center; position: relative; } section .whole .whole-1 .Buyers #container #wrap .address .name img { @@ -140,14 +139,17 @@ section .whole .whole-1 .coupon .yh { /* 优惠卷的背景 */ section .whole .whole-1 .coupon .coupon-1 { background: url("../../img/images/coupon-1.png"); + background-size: 100% 100%; } section .whole .whole-1 .coupon .coupon-2 { background: url("../../img/images/coupon-2.png"); + background-size: 100% 100%; } section .whole .whole-1 .coupon .coupon-3 { background: url("../../img/images/coupon-3.png"); + background-size: 100% 100%; } /* 提交订单 */ section .whole .setall { @@ -167,17 +169,6 @@ section .whole .setall { top: -50px; } .zhanw{height: 30px;width: 100%;background: #f5f5f5;} -.table-box{text-align: center;width: 100%;} -.table-box tr:first-child{background-color: #f3f3f3;} -.table-box tr:first-child>th:first-child{text-align: left;padding: 22px 0 16px 20px;width: 480px;} -.table-box tr:first-child>th:nth-child(2){width: 150px;} -.table-box tr:first-child>th:nth-child(3){width: 80px;} -.table-box tr:first-child>th:nth-child(4){width: 180px;} -.table-box .item-box td:nth-child(1){width: 480px;text-align: left;padding: 20px;border-bottom: 1px solid #f2f2f2;} -.table-box .item-box td:nth-child(1) div{width: 480px;display: flex;} -.table-box .item-box td:nth-child(1) div div{font-size: 14px;line-height: 24px;color: #525252;margin-left: 10px;} -.table-box .item-box td:nth-child(2),.table-box .item-box td:nth-child(3),.table-box .item-box td:nth-child(4){padding: 20px;font-weight: bold;border-bottom: 1px solid #f2f2f2;} -.table-box .item-box td:nth-child(4){color: #CB1919;} .yhquan{font-size: 15px;color: #333333;font-weight: bold;} .yhmoney{display: flex;align-items: center;margin-top: 20px;} @@ -196,4 +187,17 @@ section .whole .setall { .allPrice{color: #CB1919;font-weight: bold;font-size: 24px;} .cartAddress{font-size: 14px;color: #333333;opacity: .5;} .sumbtn-box{display: flex;justify-content: flex-end;padding: 30px 20px 30px 0;} -.sumbtn-box div{font-size: 18px;color: #FFFFFF;width: 142px;height: 45px;line-height: 45px;text-align: center;background: #CB1919;} \ No newline at end of file +.sumbtn-box div{font-size: 18px;color: #FFFFFF;width: 142px;height: 45px;line-height: 45px;text-align: center;background: #CB1919;} + + +.commodity .jies-head{display: flex;text-align: center;padding: 22px 0 16px 20px;background-color: #f3f3f3;font-size: 16px;font-weight: bold;} +.jies-head div:nth-child(1){width: 69%;text-align: left;} +.jies-head div:nth-child(2){width: 10%;} +.jies-head div:nth-child(3){width: 8%;} +.jies-head div:nth-child(4){width: 13%;} +.commodity .jies-list{margin-top: 20px;display: flex;text-align: center;border-bottom: 1px solid #F2F2F2;padding-bottom: 20px;} +.jies-list>div:first-child{width: 69%;text-align: left;display: flex;} +.jies-list>div:first-child div div{font-size: 14px;line-height: 24px;color: #525252;margin-left: 10px;width: 72%;height: auto;} +.jies-list>div:nth-child(2){width: 10%;font-weight: bold;} +.jies-list div:nth-child(3){width: 8%;font-weight: bold;} +.jies-list div:nth-child(4){width: 13%;color: #CB1919;font-weight: bold;} diff --git a/htmls/artNetwork/artist.html b/htmls/artNetwork/artist.html index 514e89f..c633bb1 100644 --- a/htmls/artNetwork/artist.html +++ b/htmls/artNetwork/artist.html @@ -248,7 +248,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/artistDetail.html b/htmls/artNetwork/artistDetail.html index 5f643c6..6d5685d 100644 --- a/htmls/artNetwork/artistDetail.html +++ b/htmls/artNetwork/artistDetail.html @@ -317,7 +317,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/artistSKDetail.html b/htmls/artNetwork/artistSKDetail.html index 6e2a174..ea47d04 100644 --- a/htmls/artNetwork/artistSKDetail.html +++ b/htmls/artNetwork/artistSKDetail.html @@ -212,7 +212,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/artist_worksDetail.html b/htmls/artNetwork/artist_worksDetail.html index 9cd5aa6..69b2d7d 100644 --- a/htmls/artNetwork/artist_worksDetail.html +++ b/htmls/artNetwork/artist_worksDetail.html @@ -234,7 +234,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/auction.html b/htmls/artNetwork/auction.html index 4127362..a9d378a 100644 --- a/htmls/artNetwork/auction.html +++ b/htmls/artNetwork/auction.html @@ -227,7 +227,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/auctionDetail.html b/htmls/artNetwork/auctionDetail.html index 60ff71e..2458bdb 100644 --- a/htmls/artNetwork/auctionDetail.html +++ b/htmls/artNetwork/auctionDetail.html @@ -233,7 +233,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/auctionShopDetail.html b/htmls/artNetwork/auctionShopDetail.html index baace36..9495ce6 100644 --- a/htmls/artNetwork/auctionShopDetail.html +++ b/htmls/artNetwork/auctionShopDetail.html @@ -227,7 +227,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/exhibition.html b/htmls/artNetwork/exhibition.html index 6f2c543..1efd90a 100644 --- a/htmls/artNetwork/exhibition.html +++ b/htmls/artNetwork/exhibition.html @@ -396,7 +396,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/artNetwork/exhibitionComingDetail.html b/htmls/artNetwork/exhibitionComingDetail.html index 8da7bd8..cba9663 100644 --- a/htmls/artNetwork/exhibitionComingDetail.html +++ b/htmls/artNetwork/exhibitionComingDetail.html @@ -154,7 +154,7 @@ 上海市樱花路869号喜玛拉雅中心A区3-4 层
@@ -593,7 +593,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
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 @@ - - + 目的地 + - - -
@@ -46,68 +46,79 @@
diff --git a/htmls/institutions/institutions.html b/htmls/institutions/institutions.html index 0835739..7756057 100644 --- a/htmls/institutions/institutions.html +++ b/htmls/institutions/institutions.html @@ -1227,7 +1227,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/logshoppingcar/login.html b/htmls/logshoppingcar/login.html index 5288a90..dc26fdc 100644 --- a/htmls/logshoppingcar/login.html +++ b/htmls/logshoppingcar/login.html @@ -8,17 +8,13 @@ 登录 + -
图片已缺失 @@ -55,8 +50,7 @@
应付金额:2234.50
-
图片丢失 -
+
图片丢失
图片丢失
@@ -105,7 +99,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/logshoppingcar/shopcar.html b/htmls/logshoppingcar/shopcar.html index ad7fec2..da81732 100644 --- a/htmls/logshoppingcar/shopcar.html +++ b/htmls/logshoppingcar/shopcar.html @@ -4,12 +4,13 @@ 购物车 + + - @@ -69,7 +70,7 @@
-
+
全部商品(20)
@@ -85,11 +86,11 @@
操作
-
+
-
+
图片丢失
@@ -255,7 +256,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/htmls/logshoppingcar/tobepaid.html b/htmls/logshoppingcar/tobepaid.html index 74c5de8..3d2a1e0 100644 --- a/htmls/logshoppingcar/tobepaid.html +++ b/htmls/logshoppingcar/tobepaid.html @@ -3,10 +3,11 @@ - + 购物车 + @@ -50,19 +51,19 @@ 新增收货地址
-
程鹏龙
+
程鹏龙

程鹏龙 四川 成都市 武侯区 城区 人民南路四段成科西路3号 138****1234

-
程鹏龙2
+
程鹏龙2

程鹏龙 四川 成都市 武侯区 城区 人民南路四段成科西路3号 138****1234

- 设置为默认地址 +
-
程鹏龙2
+
程鹏龙2

程鹏龙 四川 成都市 武侯区 城区 人民南路四段成科西路3号 138****1234

- 设置为默认地址 +
@@ -73,36 +74,36 @@
送货清单
- - - - - - - - - - - - - - - - - - - -
商品单价数量小计
-
- 图片丢失 -
创意牛气冲天牛摆件现代简约家居装饰品牛摆设电视柜玄关办公室博古架抽象艺术工艺品 牛气冲天+运势如虹
-
-
¥188x3¥564.6
-
- 图片丢失 -
创意牛气冲天牛摆件现代简约家居装饰品牛摆设电视柜玄关办公室博古架抽象艺术工艺品 牛气冲天+运势如虹
-
-
¥188x3¥564.6
+ +
+
商品
+
单价
+
数量
+
小计
+
+ +
+
+ 图片丢失 +
+
创意牛气冲天牛摆件现代简约家居装饰品牛摆设电视柜玄关办公室博古架抽象艺术工艺品 牛气冲天+运势如虹
+
+
+
¥188
+
x3
+
¥564.6
+
+
+
+ 图片丢失 +
+
创意牛气冲天牛摆件现代简约家居装饰品牛摆设电视柜玄关办公室博古架抽象艺术工艺品 牛气冲天+运势如虹
+
+
+
¥188
+
x3
+
¥564.6
+
@@ -229,7 +230,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
@@ -255,32 +256,35 @@ \ No newline at end of file diff --git a/htmls/logshoppingcar/tuxingCode.html b/htmls/logshoppingcar/tuxingCode.html deleted file mode 100644 index b8854fb..0000000 --- a/htmls/logshoppingcar/tuxingCode.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 图形验证码 - - - -
- - - - - diff --git a/htmls/logshoppingcar/zf.html b/htmls/logshoppingcar/zf.html index 6c28e45..98be68b 100644 --- a/htmls/logshoppingcar/zf.html +++ b/htmls/logshoppingcar/zf.html @@ -3,13 +3,12 @@ - + 支付成功 - + - @@ -100,7 +99,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
diff --git a/index.html b/index.html index bc9d390..a2fe4ef 100644 --- a/index.html +++ b/index.html @@ -216,14 +216,13 @@ }) function sixSwiper(){ let showNum = 6 - let beforeNum = 0 let centeredSlides = true//是否显示半截 let spaceBetween = 25//图片间距 let windowWidth = $(window).width() - if(windowWidth*1<=750){ + if(windowWidth*1<=766){ showNum = 2 centeredSlides = false - spaceBetween = 35 + spaceBetween = 10 } else if(windowWidth*1<=900){ showNum = 3 centeredSlides = false @@ -245,8 +244,6 @@ slidesPerView: showNum,//显示数量 centeredSlides: centeredSlides,//显示半截 spaceBetween: spaceBetween,//图片间距 - slidesOffsetBefore : beforeNum, - slidesOffsetAffter:50, autoplay: { delay: 4000, stopOnLastSlide: true, @@ -628,7 +625,7 @@ 图片缺失
-
+
图片丢失
@@ -648,7 +645,7 @@
电话:028-81712589
-
+
联系我们
地址:四川省成都市武侯区天益街38号理想中心3栋601
手机:13880548658
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 57255cc..a52ff67 100644 --- a/js/huaxia.js +++ b/js/huaxia.js @@ -770,6 +770,7 @@ function getScrollTop() { } return scroll_top; } +<<<<<<< HEAD $(function () { if ($(".tyhder_herader").length==1) { @@ -781,6 +782,10 @@ $(function () { function myFunction() { +======= +document.addEventListener("scroll", myFunction); +function myFunction() { +>>>>>>> c9ed6addc5114c34477351d5ef453ff6f6feb9cc if (getScrollTop() > $(".tyhder_herader>img").css("height").split("px")[0]) { $(".pod").css("position", "fixed") $(".pod").addClass("dtip") @@ -792,8 +797,6 @@ function myFunction() { $(".mian").css("marginTop", "0px") $(".tyhder_moban").css("top", `0px`) } - - } $(function navdao(params) { // ---