chen
/
huaxia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

冲突

master
chen 2021-09-23 19:19:10 +08:00
parent 10bb30ffba 94dd9be6b3
commit 00629bc7f5
10 changed files with 10645 additions and 3911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
css/grzx/grzx.css
View File

File diff suppressed because it is too large Load Diff

5966
css/huaxia.css
View File

File diff suppressed because it is too large Load Diff

427
css/huaxiaMedia.css
View File

@ -1,16 +1,7 @@
@media screen and (min-width:721px) and (max-width:820px) { @media screen and (min-width:721px) and (max-width:820px) {
.ty_left {
position: absolute;
left: 0px;
top: 0px;
}
/* .ty_riscon {
padding-left: 36px;
} */
@ -20,102 +11,11 @@
@media screen and (min-width:300px) and (max-width:1020px) { @media screen and (min-width:300px) and (max-width:1020px) {
.ty_leftcon {
justify-content: center;
padding-left: 0px;
}
.ty_left {
width: 14%;
}
.ty_ris {
width: 75%;
}
.ty_btn>button {
width: 112px;
height: 37px;
}
.ty_btn {
width: 424px;
}
.ty_password+.ty_btn {
width: 448px;
}
select {
padding: 0px 18px;
background-size: 12px 8px;
width: 106px;
font-size: 12px;
background: url(../img/grzx/xiala_08.jpg) no-repeat scroll right 9px top 14px transparent;
height: 37px;
}
.ty_int> :nth-child(2) {
width: 338px;
height: 36px;
}
.ty_scimg {
width: 100px;
height: 100px;
background-color: rgb(245, 245, 245);
border-radius: 50%;
border: none;
margin-right: 28px;
}
} }
@media screen and (min-width:300px) and (max-width:820px) { @media screen and (min-width:300px) and (max-width:820px) {
.ty_left {
position: absolute;
left: -14%;
top: 0px;
transition: all 2s;
}
.naliu {
display: block;
}
.ty_ris {
width: 95%;
}
.ty_caidan {
display: block;
}
.ty_dnum {
width: 100%;
border-top: 1px solid rgb(233, 233, 233);
margin-top: 10px;
}
.ty_ysnr {
width: 25%;
}
.ty_wdgz {
width: 33%;
}
.ty_wdgz>p {
margin-top: 4px;
}
.ty_ysnr {
margin-bottom: 10px;
}
.ty_ysnr>p {
margin-top: 8px;
font-size: 13px;
}
.ty_yspcon {
width: 25%;
margin-bottom: 14px;
}
.ty_yspcon>p {
margin-top: 10px;
}
} }
@media screen and (min-width:821px) and (max-width:920px) {} @media screen and (min-width:821px) and (max-width:920px) {}
@ -126,283 +26,63 @@
@media screen and (min-width:1121px) and (max-width:1220px) {} @media screen and (min-width:1121px) and (max-width:1220px) {}
@media screen and (min-width:991px) and (max-width:1520px) {
@media screen and (min-width:1021px) and (max-width:1320px) { .tygrzx_riscon {
.ty_leftcon>img { padding-left: 32px;
display: none;
} }
.ty_leftcon { }
justify-content: center; @media screen and (min-width:991px) and (max-width:1440px) {
padding-left: 0px;
} .p-zy320 {
padding-left: 180px;
.ty_left { padding-right: 180px;
width: 14%; }
}
.tygrzx_int> :nth-child(2) {
.ty_ris { width: 345px;
width: 75%; }
} .tygrzx select {
width: 108px;
}
.tygrzx_leftcon {
padding-left: 15px;
}
} }
@media screen and (min-width:1321px) and (max-width:1420px) {
.ty_dindantit{
display: inline-block; @media screen and (min-width:767) and (max-width:1440px){
.tygrzx_leftcon {
padding-left: 15px;
}
.tygrzx_int> :nth-child(2) {
width: 345px;
}
.tygrzx select {
width: 108px;
}
}
@media screen and (min-width:767px) and (max-width:991px) {
.p-zy320 {
padding-left: 60px;
padding-right: 60px;
}
.tygrzx_int> :nth-child(2) {
width: 345px;
}
.tygrzx select {
width: 108px;
}
} .tygrzx_leftcon {
.ty_ddnav { padding-left: 15px;
margin-bottom: 10px;
}
.ty_ris {
width: 75%;
}
.ty_ddxxnoe {
width: 100% !important;
}
.ty_ddxxnoe>div {
width: 100% !important;
flex-wrap: wrap;
}
.ty_ddxq {
display: none;
}
.ty_ddxx>div {
width: 100%;
border-top: 1px solid rgb(233, 233, 233);
}
.ty_ddxxTxt {
padding-top: 2px;
width: 22%;
}
.ty_ddxxTxt1 {
border-right: 1px solid rgb(233, 233, 233);
padding-top: 2px;
width: 34%;
} }
} }
@media screen and (min-width:300px) and (max-width:620px) {
.ty_riscon {
padding-left: 10px;
}
.ty_yhuij {
width: 50% !important ;
}
}
@media screen and (min-width:301px) and (max-width:490px) {
.ty_btn {
width: 334px;
}
.ty_password+.ty_btn {
width: 358px;
}
.ty_int> :nth-child(2) {
width: 248px;
}
select {
padding: 0px 5px;
width: 76px;
}
.ty_left {
width: 67px;
left: -68px;
}
.ty_leftcon {
font-size: 12px;
}
.ty_ddmas>:nth-child(2) {
width: 180px;
}
.ty_dindantop {
display: block;
}
.ty_ddnav>p {
margin-right: 23px;
}
.ty_ddcontit {
height: 46px;
}
}
@media screen and (min-width:300px) and (max-width:1320px) {
.ty_dindantit{
display: inline-block;
}
.ty_ddxxTxt {
padding-top: 2px;
width: 20%;
}
.ty_ddxxTxt1 {
border-right: 1px solid rgb(233, 233, 233);
padding-top: 2px;
width: 40%;
}
.ty_herader>nav>img {
margin-right: 11%;
width: 35%;
}
.ty_ddxq {
display: none;
}
.ty_listnav {
width: 45%;
text-align: left;
}
.ty_leftcon>img {
display: none;
}
.ty_listnav {
padding-top: 3%;
}
.ty_topcon {
height: 47%;
}
.ty_ddxx>div {
width: 100%;
border-top: 1px solid rgb(233, 233, 233);
}
.ty_ddxxnoe {
width: 100% !important;
}
.ty_ddxxnoe>div {
width: 100% !important;
flex-wrap: wrap;
padding-left: 0px;
}
.ty_dindantetx {
border-top: 1px solid rgb(233, 233, 233);
width: 100%;
}
.ty_ddnav {
margin-bottom: 10px;
}
}
@media screen and (min-width:300px) and (max-width:411px) {
.ty_password {
display: block;
padding-left: 40px;
}
.ty_password>p {
text-align: left !important;
margin-bottom: 10px;
}
.ty_password+.ty_btn {
width: 288px;
}
.ty_didanpd {
padding-left: 9px !important;
padding-right: 9px !important;
}
.ty_wdgz {
width: 50%;
}
.ty_ysnr {
width: 33%;
margin-bottom: 10px;
font-size: 13px;
}
.ty_wdgz>p {
margin-top: 4px;
}
.ty_yishusc>:nth-child(2) {
font-size: 13px;
color: #191919;
margin-top: 2px;
margin-bottom: 6px;
}
.ty_yspcon {
width: 33%;
margin-bottom: 14px;
}
.ty_yspcon>p {
margin-top: 10px;
}
.ty_jfn>:nth-child(2)>:nth-child(2) {
margin-left: 52px;
margin-right: 73px;
}
.ty_jfcon>div>:nth-child(2) {
margin-right: 38px;
}
.ty_jfn>:nth-child(2)>:nth-child(2) {
margin-right: 22px;
}
.ty_textyh {
font-size: 13px;
margin-top: 2px;
margin-bottom: 5px;
color: #fff;
}
}
@media screen and (min-width:300px) and (max-width:1200px) {
.ty_jfcon>div>:nth-child(1) {
margin-right: 50px;
}
.ty_jfn>:nth-child(2)>:nth-child(2) {
margin-left: 100px;
margin-right: 31px;
}
.ty_jfcon>div>:nth-child(2) {
margin-right: 16px;
}
.ty_yhuij {
width: 33%;
}
}
@media screen and (min-width:1421px) and (max-width:1520px) {}
@media screen and (min-width:1521px) and (max-width:1620px) {} @media screen and (min-width:1521px) and (max-width:1620px) {}
@ -590,8 +270,7 @@
.logo{width: 30%;} .logo{width: 30%;}
.p-zy180,.head-box{padding: 20px 180px;} .p-zy180,.head-box{padding: 20px 180px;}
} }
@media screen and (min-width:751px) and (max-width:1820px) {
.cq-item-title-box {padding: 20px 0 15px 0;}
.font-32 {font-size: 26px;}
}

2642
css/institutions/institutions.css
View File

File diff suppressed because it is too large Load Diff

1436
css/style.css Normal file
View File

File diff suppressed because it is too large Load Diff

4
htmls/artistCenter/artistCenter.html
View File

@ -7,8 +7,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>艺术家个人中心</title> <title>艺术家个人中心</title>
<link rel="stylesheet" href="../../css/institutions/institutions.css"> <link rel="stylesheet" href="../../css/institutions/institutions.css">
<link rel="stylesheet" type="text/css" href="../../css/huaxia.css"/> <link rel="stylesheet" href="../../css/huaxia.css">
<link rel="stylesheet" href="../css/centerHead.css"> <link rel="stylesheet" href="../../css/centerHead.css">
<script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script> <script src="../../js/jquery-1.9.1.js" type="text/javascript" charset="utf-8"></script>
<script src="../../js/artistCenter/artistCenter.js" type="text/javascript" charset="utf-8"></script> <script src="../../js/artistCenter/artistCenter.js" type="text/javascript" charset="utf-8"></script>
<script src="https://unpkg.com/wangeditor/dist/wangEditor.min.js"></script> <script src="https://unpkg.com/wangeditor/dist/wangEditor.min.js"></script>

1057
htmls/grzx/personalData.html
View File

File diff suppressed because it is too large Load Diff

1120
htmls/institutions/institutions.html
View File

File diff suppressed because it is too large Load Diff

4
index.html
View File

@ -45,10 +45,10 @@
<span class="sy-dian"></span> <span class="sy-dian"></span>
<div onclick="goToPage(2)" class="cq-cp dac"> <div onclick="goToPage(2)" class="cq-cp dac">
<img src="img/sy-scart.png" width="14" height="15" style="margin-right: 4px;"> <img src="img/sy-scart.png" width="14" height="15" style="margin-right: 4px;">
<span class="cq-cp">我的购物车</span> <span class="cq-cp ">我的购物车</span>
</div> </div>
<span class="sy-dian"></span> <span class="sy-dian"></span>
<a href="htmls/artNetwork/pointsMall.html" style="text-decoration: none;"><span class="cq-cp">积分商城</span></a> <a href="htmls/artNetwork/pointsMall.html" style="text-decoration: none;"><span class="cq-cp ">积分商城</span></a>
<span class="sy-dian"></span> <span class="sy-dian"></span>
<span onclick="goToPage(3)" class="cq-cp">联系我们</span> <span onclick="goToPage(3)" class="cq-cp">联系我们</span>
<span class="sy-dian"></span> <span class="sy-dian"></span>

1437
js/huaxia.js
View File

File diff suppressed because it is too large Load Diff