diff --git a/css/foot.min.css b/css/foot.min.css index 2f6d882..74026ca 100644 --- a/css/foot.min.css +++ b/css/foot.min.css @@ -35,7 +35,7 @@ body{padding: 0;margin: 0;} .foot-iframe{width: 100%;height: 400px;} /* 固定底部导航 */ -.fixed_foot{position: fixed;bottom: 0;left: 0;right: 0;z-index: 6px;display: none;background: #CB1919;} +.fixed_foot{position: fixed;bottom: 0;left: 0;right: 0;z-index: 6;display: none;background: #CB1919;} .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){ diff --git a/css/huaxia.css b/css/huaxia.css index 78080be..38ae38c 100644 --- a/css/huaxia.css +++ b/css/huaxia.css @@ -1096,25 +1096,11 @@ input { width: 100%; justify-content: flex-end; } - +.guan-box a{color: #161616;} .guan-box span { opacity: .8; } -.redD { - width: 6px; - height: 6px; - border-radius: 100%; - background: #cd2628; - top: 10px; - right: 12px; -} - -.xiahx { - width: 100%; - bottom: 0; - border-bottom: 3px solid #cd2628; -} .dao-box>li { padding: 5px 25px; @@ -1142,10 +1128,28 @@ input { } .cq-dao-active { + position: relative; font-weight: bold; color: #cd2628; } - +.cq-dao-active::before{ + position: absolute; + content: ''; + width: 100%; + height: 3px; + bottom: 0; + background: #cd2628; +} +.cq-dao-active::after{ + position: absolute; + content: ''; + width: 6px; + height: 6px; + border-radius: 100%; + right: -10px; + top: 4px; + background: #cd2628; +} .cq-dao-active>a { font-weight: bold; color: #cd2628 !important; @@ -1212,13 +1216,6 @@ input { margin-bottom: 0; } -.exhibition .swiper-slide .item-box { - width: 293px; -} - -.exhibition .swiper-slide img { - object-fit: cover; -} /* .xx-img{ width:242px; height:151px;} */ .xx-content { @@ -1228,95 +1225,9 @@ input { .xx-img { width: 100%; } - -.ysc .ya-item-box>div:first-child { - transition: transform .5s; - cursor: pointer; -} - -.ysc .ya-item-box>div:first-child:hover { - transform: scale(.9); - transition: transform .5s; -} - -.ya-item-box .pr { - padding-right: 1.25em; -} - -.ys-price { - font-size: 18px; - color: #cb1919; - background: rgba(0, 0, 0, .2); - border-radius: 3px; - left: 14px; - bottom: 14px; - padding: 6px 10px; -} - -.ys-title { - font-size: 20px; - font-weight: bold; - padding-right: 20px; -} - -.ys-cate { - font-size: 14px; - color: #a6a6a4; - padding-right: 20px; -} - -.ysj-name { - line-height: 26px; -} - -.ysj .ya-item-box { - margin-right: 1.36em; - width: 94%; - padding-bottom: 10px; -} - -.ysj .ya-item-box img { - transition: transform .5s; - cursor: pointer; -} - -.ysj .ya-item-box:hover img { - transform: scale(.9); - transition: transform .5s; -} - -.ysj .ya-item-box:last-child { - margin-right: 0px; -} - -.ysj .pr { - padding-right: 0px; -} - #homeArtist { width: 101.2%; } - -.wc-box>div>img { - width: 96%; - transition: transform .5s; -} - -.wc-box .ya-item-box:hover img { - transform: scale(.9); - transition: transform .5s; -} - -.wc-box .ya-item-box:hover a { - color: #cb1919; - text-decoration: underline; -} - -.wc-box>div>div>a:hover { - color: #cb1919; - text-decoration: underline; -} - .checksyzp { background: #cb1919; color: rgba(255, 255, 255, .8); @@ -1333,14 +1244,6 @@ input { color: rgba(25, 25, 25, .7); } -.gongn { - display: none; - width: 50px; - height: 50px; - position: absolute; - right: 50px; - cursor: pointer; -} .xinxy-box { background: #f6f5f3; @@ -1394,22 +1297,6 @@ input { z-index: 1; } -.hz-input-box input { - margin-right: 10px; - border-radius: 3px; - border: 1px solid #e9e9e9; - height: 48px; -} - -.hz-input-box div { - color: #FFFFFF; - background: #cb1919; - padding: 0px 82px; - border-radius: 3px; - height: 48px; - line-height: 48px; - border: 1px solid #CB1919; -} .hz-imgItem img { cursor: pointer; @@ -2303,10 +2190,6 @@ ul { background-color: #fff; } -input { - padding-left: 14px; - box-sizing: border-box; -} .tygrzx_dindantit { @@ -5616,33 +5499,34 @@ select { display: inline-block; } -.exhibition .swiper-slide .item-box{width: 293px;} -.exhibition .swiper-slide img{object-fit: cover;} +.exhibition .swiper-slide img{object-fit: cover;width: 100%;} /* .xx-img{ width:242px; height:151px;} */ .xx-content{line-height: 28px;} .xx-img{ max-width:252px;} .ysc .ya-item-box>div:first-child{transition: transform .5s;cursor: pointer;} -.ysc .ya-item-box>div:first-child:hover{transform: scale(.9);transition: transform .5s;} +/* .ysc .ya-item-box>div:first-child:hover{transform: scale(.9);} */ .ya-item-box .pr{padding-right: 1.25em;} +.ysc .ya-item-box:hover .ys-title{color: #CB1919;text-decoration: underline;} .ys-price{font-size: 18px;color: #cb1919;background: rgba(0,0,0,.2);border-radius: 3px;left: 14px;bottom: 14px;padding: 6px 10px;} .ys-title{font-size: 20px;font-weight: bold;padding-right: 20px;} .ys-cate{font-size: 14px;color: #a6a6a4;padding-right: 20px;} .ysj-name{line-height: 26px;} .ysj .ya-item-box{margin-right: 1.36em;width:94%;padding-bottom:10px;} .ysj .ya-item-box img{transition: transform .5s;cursor: pointer;} -.ysj .ya-item-box:hover img{transform: scale(.9);transition: transform .5s;} +.ysj .ya-item-box:hover img{transform: scale(.9);} .ysj .ya-item-box:last-child{margin-right: 0px;} .ysj .pr{padding-right: 0px;} #homeArtist{width: 101.2%;} .wc-box{width: 101%;} -.wc-box>div>img{width: 96%;transition: transform .5s;} -.wc-box .ya-item-box:hover img{transform: scale(.9);transition: transform .5s;} -.wc-box .ya-item-box:hover a{color: #cb1919;text-decoration:underline;} -.wc-box>div>div>a:hover{color: #cb1919;text-decoration:underline;} +.wc-box div a img{width: 96%;transition: transform .5s;} +/* .wc-box .ya-item-box:hover img{transform: scale(.9);transition: transform .5s;} */ +.wc-box .ya-item-box:hover a div{color: #cb1919;text-decoration:underline;} .checksyzp{background: #cb1919;color: rgba(255,255,255,.8);padding: 6px 10px;} .ysj-itemcheck{border: 1px solid #cecccc;padding: 6px 10px;color: rgba(25,25,25,.7);} .ysj-itemcon{color: rgba(25,25,25,.7);} -.gongn{display: none;width: 50px;height: 50px;position: absolute;right: 50px;cursor: pointer;} +.gn-box{display: none;position: absolute;right: 50px;} +.gongn{width: 39px;height: 27px;cursor: pointer;transition: all .5s;} +.trans90{transform: rotate(90deg);} .xinxy-box{background: #f6f5f3;padding-bottom: 65px;} .xinxy-box .dac{width: 101.4%;overflow: hidden;} .xinxy-box .msg .w48{width: 49%;} @@ -5654,15 +5538,24 @@ select { .hz-jies{font-size: 14px;color: rgba(25,25,25,.5);margin-left: 10px;} .hzly-box{padding: 30px;z-index: 1;} .hz-input-box input{margin-right: 10px;border-radius: 3px;border:1px solid #e9e9e9;height: 48px;} -.hz-input-box textarea{border: 1px solid #e9e9e9;resize: none;border-radius: 3px;margin-right: 10px;height: 48px;line-height: 48px;outline: none;} +.hz-input-box textarea{border: 1px solid #e9e9e9;resize: none;border-radius: 3px;margin-right: 10px;height: 48px;line-height: 48px;outline: none;box-sizing: border-box;} .hz-input-box div{color: #FFFFFF;background: #cb1919;padding: 0px 82px;border-radius: 3px;height: 48px;line-height: 48px;border: 1px solid #CB1919;} .hz-imgItem img{cursor: pointer;width: 90%;} .yssc-img{height: 500px;vertical-align: bottom;} .yssc-item{height: 500px;vertical-align: bottom;max-width: 364px;} +.cell-input,.cell-nav{position: absolute;right: 0px;top: 63px;background: rgba(0,0,0,.5);width: 100%;z-index: 5;height: 2000px;transition: all 1s;} +.cell-nav div{float: right;background: rgba(255,255,255,1);} +.cell-nav li{padding: 15px 60px;text-align: center;border-top: 1px solid #E6E6E6;} +.cell-nav li a{color: #191919;} +.cell-nav li .cell-active{color: #CB1919;} +.shous{width: 28px;height: 26px;margin-right: 20px;cursor: pointer;} +.cell-input div {width: 100%;background: rgba(255,255,255,1);display: flex;justify-content: center;padding: 10px 0;} +.cell-input input{width: 94%;border-radius: 3px;height: 40px;border: 1px solid #e5e5e5;position: relative;z-index: 6;} /* 资讯 */ #zx-list>div div:hover{cursor: pointer;} #zx-list>div:hover .zx-title{color: #CB1919;} #zx-list>div:hover .zx-dian{color: #CB1919;} +#zx-list img{width: 362px; object-fit: contain;max-height: 225px;} .zx-nav,.szx-nav,.px-nav{padding: 0;} .zx-nav li span {cursor: pointer;} @@ -5674,7 +5567,10 @@ select { #zx-xg>div:first-child{margin-right: 10px;} .zx-xx{color: #cd2628;border: 1px solid #cd2628;padding: 6px 20px;border-radius: 3px;font-size: 16px;} .zx-gg{padding: 6px 20px;border: 1px solid #222222;border-radius: 3px;font-size: 16px;} - +#ys-list,#zled,#zlwill,#zling{width: 102.6%;} +#ys-list .font-13{padding: 8px 15px;} +#ys-list .m-x30{margin-bottom: 10px;} +.cell-js{display: none;} .tyjgzx_riscon>form { display: inline-block; } diff --git a/css/huaxiaMedia.css b/css/huaxiaMedia.css index a69c18b..dc9d581 100644 --- a/css/huaxiaMedia.css +++ b/css/huaxiaMedia.css @@ -95,7 +95,7 @@ @media screen and (max-width:750px) { .logo{width: 50%;} .head-box {top: 0px;} - .gongn{display: inline;right: 20px;width: 40px;height: 40px;} + .gn-box{display: inline;right: 20px;} .dmedia{display: none;} .head-box{padding: 10px 20px;} .p-zy180{padding: 10px 20px 0 20px;} @@ -134,7 +134,6 @@ .syys-name{font-size: 18px;margin-top: 10px;margin-bottom: 10px;} .ysj-name{line-height: 20px;} .w20{width: 100%;padding-bottom: 10px;} - .wc-box > div > img {width: 100%;} .sypx-box {padding-bottom: 20px;} .sypx-box .djb .backf {padding-bottom: 10px;} .sypx-box .djb .backf div{margin-top: 10px;margin-right: 10px;} @@ -162,6 +161,7 @@ .ys-title{font-size: 15px;padding-right: 0;} .sypx-box img{max-height: 230px;object-fit: cover;} .wc-box .w25,.djb .w50>div{width: 48%;} + .wc-box div a img{width: 100%;transition: transform .5s;} .sypx-box .djb .w50 .ys-title{width: 90%;} .wc-box{justify-content: space-between;} #homeArtist{width: 102%;} @@ -180,10 +180,12 @@ .exhibition .tl div{display: none;} .exhibition .tl div:nth-child(1){display: inherit;} .exhibition .tl div:nth-child(2){display: -webkit-box;} + .parent-page,.parent-page img {height: 130px;} + .shous{display: inline;} } @media screen and (min-width:751px) and (max-width:850px) { .logo{width: 26%;} - .gongn{display: inline;} + .gn-box{display: inline;} .dmedia{display: none;} .p-zy180,.head-box{padding: 10px 20px;} .hz-input-box div{padding: 0px 50px;} @@ -197,10 +199,12 @@ .sypx-box .ys-title{height: 40px;line-height: 40px;} .ys-title{font-size: 15px;} .m-zy30 {margin-left: 15px;margin-right: 15px;} + .parent-page,.parent-page img {height: 130px;} + .shous{display: inline;} } @media screen and (min-width:851px) and (max-width:1000px) { .logo{width: 26%;} - .gongn{display: inline;} + .gn-box{display: inline;} .dmedia{display: none;} .input-box{display: none;} .head-box{padding: 10px 20px 5px 20px;} @@ -242,7 +246,7 @@ .dao-box>li{padding: 5px 16px;flex-shrink: 0;text-align: center;font-size: 16px;} .dao-box>li:last-child{padding-right: 0;} .dao-box>li>div{padding: 6px 0;} - .head-nav-box > div:last-child {margin-top: 10px;} + .head-nav-box > div:last-child {margin-top: 0px;} .redD {right: 6px;} .sypx-box img{height: 240px;object-fit: cover;} } @@ -270,7 +274,70 @@ .logo{width: 30%;} .p-zy180,.head-box{padding: 20px 180px;} } - +@media (max-width:766px){ + #zx-list img {width: 120px;max-height: 74px;} + #zx-list .clips2 {-webkit-line-clamp: 2;} + #zx-list .clips3 {display: none;} + #zx-list .font-20{font-size: 14px;} + #zx-list .p-sx30 {padding-top: 10px;padding-bottom: 10px;} + .p-zy320{padding: 0 20px;} + #zl-item,.zx-dian{margin: 0px;} + .allitem-title{padding: 20px 0;} + .font-40{font-size: 20px;} + .p-zy320 #zx-xg{margin-top: 0;} + .p-zy320>div:first-child .m-s20{margin-top: 0;} + .zx-nav{overflow-x: scroll;overflow: hidden;} + .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 .m-s30{margin-top: 20px;} + #zl-list .w90{width: 100%;max-height: 200px;object-fit: cover;} + #ys-list {justify-content: space-between;width: 100%;} + #ys-list .w25{width: 48%;} + #ys-list .w90{width: 100%;margin-top: 10px;} + #ys-list .font-26{font-size: 18px;} + #ys-list .font-13{padding: 6px 8px;} + #zl-list .m-s20{margin-top: 10px;} + #ys-cate{overflow-x: scroll;overflow-y: hidden;} + #ys-cate li{padding: 10px 0 8px 0;font-size: 14px;flex-shrink: 0;} + #jg-list{width: 100%;justify-content: space-between;} + #jg-list .m-s30{margin-top: 20px;} + #jg-list .m-s20{margin-top: 10px;} + #jg-list .font-18{font-size: 15px;} + #jg-list .w33{width: 48%;} + + #px-list {padding-top: 20px;} + #px-list .djbac{flex-direction: column;} + #px-list .w50:first-child{width: 100%;} + #px-list .w50:last-child{width: 94%;} + #px-list .p-zy40{margin-top: 10px;} + .pc-js{display: none;} + .cell-js{display: inline;} + + #pxsp-list .w50{width: 49%;} + #px-list .px-item-bo,#pxsp-list .px-item-bo{width: 40px;height: 40px;} + #pxsp-list .m-s20{margin-top: 10px;} + #pxsp-list .m-x30{margin-bottom: 20px;} + #pxsp-list .font-18{font-size: 15px;} +} +@media (min-width:767px) and (max-width:991px){ + #zx-list img {width: 250px;max-height: 155px;} + #zx-list .clips2 {-webkit-line-clamp: 1;} + #zx-list .p-sx30 {padding-top: 10px;padding-bottom: 10px;} + .p-zy320{padding: 0 60px;} + .zx-dian{margin: 10px 0 0 0;} + .zx-nav li, .szx-nav li, .px-nav li {margin-right: 20px;padding: 10px 0 8px 0;font-size: 14px;} +} +@media (min-width:992px) and (max-width:1199px){ + #zx-list img {width: 250px;max-height: 155px;} + #zx-list .clips2 {-webkit-line-clamp: 1;} + #zx-list .p-sx30 {padding-top: 10px;padding-bottom: 10px;} + .p-zy320{padding: 0 120px;} + .zx-dian{margin: 10px 0 0 0;} +} +@media (min-width:1200px) and (max-width:1440px){ + +} diff --git a/htmls/artNetwork/artist.html b/htmls/artNetwork/artist.html index 0c0f948..2e2042a 100644 --- a/htmls/artNetwork/artist.html +++ b/htmls/artNetwork/artist.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】 -
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -115,12 +136,12 @@ -
+
图标丢失
张龙森
-
查看作品
+
查看作品
毕卡 塞尔艺术学院现工作生活于北京
@@ -128,7 +149,7 @@ 图标丢失
张龙森
-
查看作品
+
查看作品
毕业于中央美术学院，硕士；曾留学在德国卡 塞尔艺术学院现工作生活于北京...
@@ -136,7 +157,7 @@ 图标丢失
张龙森
-
查看作品
+
查看作品
毕业于中央美术学院，硕士；曾留学在德国卡 塞尔艺术学院现工作生活于北京...
@@ -144,7 +165,7 @@ 图标丢失
张龙森
-
查看作品
+
查看作品
毕业于中央美术学院，硕士；曾留学在德国卡 塞尔艺术学院现工作生活于北京...
@@ -152,7 +173,7 @@ 图标丢失
张龙森
-
查看作品
+
查看作品
毕业于中央美术学院，硕士；曾留学在德国卡 塞尔艺术学院现工作生活于北京...
@@ -160,7 +181,7 @@ 图标丢失
张龙森
-
查看作品
+
查看作品
毕业于中央美术学院，硕士；曾留学在德国卡 塞尔艺术学院现工作生活于北京...
diff --git a/htmls/artNetwork/artistDetail.html b/htmls/artNetwork/artistDetail.html index 4f158e1..b20d8cc 100644 --- a/htmls/artNetwork/artistDetail.html +++ b/htmls/artNetwork/artistDetail.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】 -
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/artistSKDetail.html b/htmls/artNetwork/artistSKDetail.html index 36ecaf0..64af6a9 100644 --- a/htmls/artNetwork/artistSKDetail.html +++ b/htmls/artNetwork/artistSKDetail.html @@ -6,6 +6,7 @@ + @@ -61,38 +62,29 @@
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/auction.html b/htmls/artNetwork/auction.html index fe6350b..3083430 100644 --- a/htmls/artNetwork/auction.html +++ b/htmls/artNetwork/auction.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/auctionDetail.html b/htmls/artNetwork/auctionDetail.html index 7293047..e212285 100644 --- a/htmls/artNetwork/auctionDetail.html +++ b/htmls/artNetwork/auctionDetail.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/auctionShopDetail.html b/htmls/artNetwork/auctionShopDetail.html index 2a0373c..1c0e129 100644 --- a/htmls/artNetwork/auctionShopDetail.html +++ b/htmls/artNetwork/auctionShopDetail.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/exhibition.html b/htmls/artNetwork/exhibition.html index b9ef384..b659221 100644 --- a/htmls/artNetwork/exhibition.html +++ b/htmls/artNetwork/exhibition.html @@ -6,6 +6,7 @@ + @@ -57,41 +58,32 @@ 【退出】
-
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -115,7 +136,7 @@
-
+ -
diff --git a/htmls/artNetwork/mechanism.html b/htmls/artNetwork/mechanism.html index ee33263..a7e5c34 100644 --- a/htmls/artNetwork/mechanism.html +++ b/htmls/artNetwork/mechanism.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+ +
diff --git a/htmls/artNetwork/mechanismArtworkDetail.html b/htmls/artNetwork/mechanismArtworkDetail.html index 0379852..c10101b 100644 --- a/htmls/artNetwork/mechanismArtworkDetail.html +++ b/htmls/artNetwork/mechanismArtworkDetail.html @@ -6,6 +6,7 @@ + @@ -61,38 +62,29 @@
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/mechanismBooksDetail.html b/htmls/artNetwork/mechanismBooksDetail.html index db9960e..85c8887 100644 --- a/htmls/artNetwork/mechanismBooksDetail.html +++ b/htmls/artNetwork/mechanismBooksDetail.html @@ -6,11 +6,19 @@ + + + @@ -58,41 +66,32 @@ 【退出】
-
+
@@ -102,6 +101,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -214,14 +242,8 @@
-
- +
- - - -
@@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/pointsMall.html b/htmls/artNetwork/pointsMall.html index e5a3817..bf6e75e 100644 --- a/htmls/artNetwork/pointsMall.html +++ b/htmls/artNetwork/pointsMall.html @@ -6,6 +6,7 @@ + @@ -47,7 +48,7 @@ 我的购物车
- 积分商城 + 积分商城 联系我们 @@ -57,41 +58,32 @@ 【退出】 -
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/pointsMallDetail.html b/htmls/artNetwork/pointsMallDetail.html index cc924da..92c9942 100644 --- a/htmls/artNetwork/pointsMallDetail.html +++ b/htmls/artNetwork/pointsMallDetail.html @@ -6,6 +6,7 @@ + @@ -47,7 +48,7 @@ 我的购物车
- 积分商城 + 积分商城 联系我们 @@ -57,41 +58,32 @@ 【退出】
-
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/realTimeInfo.html b/htmls/artNetwork/realTimeInfo.html index b8ee4cc..fff6663 100644 --- a/htmls/artNetwork/realTimeInfo.html +++ b/htmls/artNetwork/realTimeInfo.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -127,53 +148,61 @@
- 图片丢失 + 图片丢失
-
2021.06.30
-
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
-
◆ ◆ ◆ ◆
-
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+ +
2021.06.30
+
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
+
◆ ◆ ◆ ◆
+
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+
- 图片丢失 + 图片丢失
-
2021.06.30
-
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
-
◆ ◆ ◆ ◆
-
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+ +
2021.06.30
+
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
+
◆ ◆ ◆ ◆
+
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+
- 图片丢失 + 图片丢失
-
2021.06.30
-
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
-
◆ ◆ ◆ ◆
-
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+ +
2021.06.30
+
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
+
◆ ◆ ◆ ◆
+
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+
- 图片丢失 + 图片丢失
-
2021.06.30
-
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
-
◆ ◆ ◆ ◆
-
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+ +
2021.06.30
+
【华夏艺术网·展讯】花事匆匆，美人依旧丨苏茂隆个展成都永陵博物馆即将呈现
+
◆ ◆ ◆ ◆
+
人称“苏美人”的画家苏茂隆，近两年几乎没有公开的规模展览。这批新作乃近两年仕女画的探索性力作。一部分作品沿袭过往仕女画经典技法，而由于近两年苏茂隆的住家环境的变化，自身也在做颇为冒险的技法探索。地创作了一批彩墨作品。
+
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/shopDetail.html b/htmls/artNetwork/shopDetail.html index c6e6e90..d051c28 100644 --- a/htmls/artNetwork/shopDetail.html +++ b/htmls/artNetwork/shopDetail.html @@ -6,6 +6,7 @@ + @@ -57,41 +58,32 @@ 【退出】
-
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/shopMore.html b/htmls/artNetwork/shopMore.html index da615f6..d4069d8 100644 --- a/htmls/artNetwork/shopMore.html +++ b/htmls/artNetwork/shopMore.html @@ -6,6 +6,7 @@ + @@ -57,41 +58,32 @@ 【退出】
-
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/htmls/artNetwork/shoppingMall.html b/htmls/artNetwork/shoppingMall.html index 8756683..2d600f0 100644 --- a/htmls/artNetwork/shoppingMall.html +++ b/htmls/artNetwork/shoppingMall.html @@ -6,6 +6,7 @@ + @@ -57,41 +58,32 @@ 【退出】
-
+
@@ -101,6 +93,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -367,6 +388,25 @@
+ +
+ +
+ 首页 + + +
+ 商城 + + +
+ 购物车 + + +
+ 个人中心 + +
图片丢失 diff --git a/htmls/artNetwork/train.html b/htmls/artNetwork/train.html index 711d8ac..4be445a 100644 --- a/htmls/artNetwork/train.html +++ b/htmls/artNetwork/train.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
-
+
@@ -102,6 +94,35 @@
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
@@ -121,8 +142,8 @@
  • 书法
  • 其他
    • - -
    + +
    图片丢失 @@ -179,6 +200,64 @@
    + +
    +
    +
    + 图片丢失 + 图片丢失 +
    +
    +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    本场精选了一些器型优美，做工精细，栩栩如生水投茶颇佳的原矿紫砂水投茶颇佳的原矿紫砂壶壶水投茶颇佳的原矿紫砂壶水投茶颇佳的原矿紫砂壶，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推本场精选了一些器型优美，做工精细，栩栩如生，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推
    +
    查看详情+
    +
    +
    +
    +
    + 图片丢失 + 图片丢失 +
    +
    +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    本场精选了一些器型优美，做工精细，栩栩如生水投茶颇佳的原矿紫砂水投茶颇佳的原矿紫砂壶壶水投茶颇佳的原矿紫砂壶水投茶颇佳的原矿紫砂壶，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推本场精选了一些器型优美，做工精细，栩栩如生，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推
    +
    查看详情+
    +
    +
    +
    +
    + 图片丢失 + 图片丢失 +
    +
    +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    本场精选了一些器型优美，做工精细，栩栩如生水投茶颇佳的原矿紫砂水投茶颇佳的原矿紫砂壶壶水投茶颇佳的原矿紫砂壶水投茶颇佳的原矿紫砂壶，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推本场精选了一些器型优美，做工精细，栩栩如生，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推
    +
    查看详情+
    +
    +
    +
    +
    + 图片丢失 + 图片丢失 +
    +
    +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    本场精选了一些器型优美，做工精细，栩栩如生水投茶颇佳的原矿紫砂水投茶颇佳的原矿紫砂壶壶水投茶颇佳的原矿紫砂壶水投茶颇佳的原矿紫砂壶，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推本场精选了一些器型优美，做工精细，栩栩如生，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推
    +
    查看详情+
    +
    +
    +
    +
    + 图片丢失 + 图片丢失 +
    +
    +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    本场精选了一些器型优美，做工精细，栩栩如生水投茶颇佳的原矿紫砂水投茶颇佳的原矿紫砂壶壶水投茶颇佳的原矿紫砂壶水投茶颇佳的原矿紫砂壶，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推本场精选了一些器型优美，做工精细，栩栩如生，同时出水投茶颇佳的原矿紫砂壶。将造型艺术与观念艺术相糅和，旨在一扫某种靡丽之风，推
    +
    查看详情+
    +
    +
    +
    diff --git a/htmls/artNetwork/trainDetail.html b/htmls/artNetwork/trainDetail.html index 00f811f..57a7249 100644 --- a/htmls/artNetwork/trainDetail.html +++ b/htmls/artNetwork/trainDetail.html @@ -6,6 +6,7 @@ + @@ -58,41 +59,32 @@ 【退出】
    -
    +
    @@ -102,6 +94,35 @@
    + +
    + + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    diff --git a/htmls/grzx/personalData.html b/htmls/grzx/personalData.html index 330468a..a67c0c5 100644 --- a/htmls/grzx/personalData.html +++ b/htmls/grzx/personalData.html @@ -7,6 +7,8 @@ 个人中心 + + @@ -1152,7 +1154,25 @@
    - + +
    + +
    + 首页 +     + +
    + 商城 +     + +
    + 购物车 +     + +
    + 个人中心 +     +
    diff --git a/htmls/logshoppingcar/shopcar.html b/htmls/logshoppingcar/shopcar.html index 35829ee..1db9f7d 100644 --- a/htmls/logshoppingcar/shopcar.html +++ b/htmls/logshoppingcar/shopcar.html @@ -7,6 +7,8 @@ + + @@ -317,6 +319,25 @@ + +
    + +
    + 首页 +     + +
    + 商城 +     + +
    + 购物车 +     + +
    + 个人中心 +     +
    图片丢失 \ No newline at end of file diff --git a/img/cell-search.png b/img/cell-search.png new file mode 100644 index 0000000..1e09db9 Binary files /dev/null and b/img/cell-search.png differ diff --git a/img/public/gn.png b/img/public/gn.png index 2e3b12b..e2ad62a 100644 Binary files a/img/public/gn.png and b/img/public/gn.png differ diff --git a/index.html b/index.html index 45bd9ed..14ec9cc 100644 --- a/index.html +++ b/index.html @@ -48,7 +48,7 @@ 我的购物车 - 积分商城 + 积分商城 联系我们 @@ -58,41 +58,32 @@ 【退出】 -
    +
    @@ -103,7 +94,34 @@
    - +
    + + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    @@ -198,26 +216,27 @@ }) function sixSwiper(){ let showNum = 6 - let beforeNum = 16 + let beforeNum = 0 let centeredSlides = true//是否显示半截 let spaceBetween = 25//图片间距 let windowWidth = $(window).width() - if(windowWidth*1<=900){ + if(windowWidth*1<=750){ showNum = 2 - beforeNum = 0 centeredSlides = false - spaceBetween = 15 - } else if(windowWidth*1 <=1100){ + spaceBetween = 35 + } else if(windowWidth*1<=900){ showNum = 3 - beforeNum = 0 + centeredSlides = false + spaceBetween = 35 + } else if(windowWidth*1 <=1100){ + showNum = 4 centeredSlides = false } else if(windowWidth*1 <=1450){ showNum = 5 - beforeNum = 0 centeredSlides = false + spaceBetween = 25 } else { showNum = 6 - beforeNum = 16 centeredSlides = true } let myswiper = new Swiper('.exhibition', { @@ -227,6 +246,7 @@ centeredSlides: centeredSlides,//显示半截 spaceBetween: spaceBetween,//图片间距 slidesOffsetBefore : beforeNum, + slidesOffsetAffter:50, autoplay: { delay: 4000, stopOnLastSlide: true, @@ -457,52 +477,76 @@
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    - -
    艺术清酒--得寓(酒标作品)Delight Sake
    + + +
    艺术清酒--得寓(酒标作品)Delight Sake
    +
    diff --git a/js/huaxia.js b/js/huaxia.js index 55aa192..95258c5 100644 --- a/js/huaxia.js +++ b/js/huaxia.js @@ -214,7 +214,6 @@ $(function () { checkPXSPList() //培训视频事件 checkJFList() //查询积分商城列表 checkAllSList() //查询所有商品 - homeArtist() //查询艺术家列表 let zhTop = 0 $(window).scroll(function () { if (($(window).height() + $(window).scrollTop() + 0) >= $(document).height()) { @@ -381,11 +380,45 @@ $(function () { $('#previewImg .closeImg').on('click', function () { $('#previewImg').css('display', 'none') }) - $('.zpsearch-box img').on('click', function () { //展览详情作品搜索点击事件 + //展览详情作品搜索点击事件 + $('.zpsearch-box img').on('click', function () { console.log('作品搜索'); }) + //功能按钮事件 + $('.gongn').on('click',function(){ + $(this).toggleClass('trans90') + $('.cell-nav').toggleClass('dn') + $('.cell-input').addClass('dn') + }) + //关闭功能弹框 + $('.cell-nav').on('click',function(){ + $('.gongn').toggleClass('trans90') + $('.cell-nav').toggleClass('dn') + $('.cell-input').addClass('dn') + }) + //功能按钮事件 + $('.shous').on('click',function(){ + $("input[name='keyWord']").val('') + $('.cell-input').toggleClass('dn') + $('.gongn').removeClass('trans90') + $('.cell-nav').addClass('dn') + }) + //功能按钮事件 + $('.cell-input').on('click',function(){ + $("input[name='keyWord']").val('') + $(this).addClass('dn') + }) + // 阻止事件冒泡 + $('input[name="keyWord"]').on("click",function(event){ + event.stopPropagation() + }) }) - +function searchKey(e) { //导航关键词搜索 + if(e.key=='Enter'){ + console.log('导航关键词搜索'); + $('.cell-input').toggleClass('dn') + } +} function searchZP() { //展览详情作品搜索事件 console.log('作品搜索'); } @@ -413,61 +446,6 @@ function closeTK() { //关闭弹框 $('#name').val('') } -function homeArtist() { //首页艺术家 - var ysjhtml = ''; - var ysjdata = [{ - imgSrc: 'img/public/ys-one.png', - name: '张龙森', - work: '职业画家', - content: '毕业于中央美术学院，硕士；曾留学在德国卡塞尔艺术学院现工作生活于北京...' - }, - { - imgSrc: 'img/public/ys-two.png', - name: '张龙森', - work: '职业画家', - content: '毕业于中央美术学院，硕士；曾留学在德国卡塞尔艺术学院现工作生活于北京...' - }, - { - imgSrc: 'img/public/ys-three.png', - name: '张龙森', - work: '职业画家', - content: '毕业于中央美术学院，硕士；曾留学在德国卡塞尔艺术学院现工作生活于北京...' - }, - { - imgSrc: 'img/public/ys-four.png', - name: '张龙森', - work: '职业画家', - content: '毕业于中央美术学院，硕士；曾留学在德国卡塞尔艺术学院现工作生活于北京...' - }, - { - imgSrc: 'img/public/ys-five.png', - name: '张龙森', - work: '职业画家', - content: '毕业于中央美术学院，硕士；曾留学在德国卡塞尔艺术学院现工作生活于北京...' - }, - ] - $.each(ysjdata, function (commentIndex, comment) { - ysjhtml += `
    -
    - -
    -
    -
    ${comment.name}
    -
    查看作品
    -
    -
    ${comment.work}
    -
    ${comment.content}
    -
    -
    -
    ` - }); - $('#homeArtist').prepend(ysjhtml); -} - -function goJGDetail(e) { //查看机构详情 - location.href = `mechanismDetail.html?id=${e}` -} - function checkPeo() { //查询机构成员列表 let jgmHtml = ''; let jgmData = [{ diff --git a/js/jquery.media.js b/js/jquery.media.js new file mode 100644 index 0000000..23c9c76 --- /dev/null +++ b/js/jquery.media.js @@ -0,0 +1,511 @@ +/* + * jQuery Media Plugin for converting elements into rich media content. + * + * Examples and documentation at: http://malsup.com/jquery/media/ + * Copyright (c) 2007-2010 M. Alsup + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * @author: M. Alsup + * @version: 0.99 (05-JUN-2013) + * @requires jQuery v1.1.2 or later + * $Id: jquery.media.js 2460 2007-07-23 02:53:15Z malsup $ + * + * Supported Media Players: + * - Flash + * - Quicktime + * - Real Player + * - Silverlight + * - Windows Media Player + * - iframe + * + * Supported Media Formats: + * Any types supported by the above players, such as: + * Video: asf, avi, flv, mov, mpg, mpeg, mp4, qt, smil, swf, wmv, 3g2, 3gp + * Audio: aif, aac, au, gsm, mid, midi, mov, mp3, m4a, snd, rm, wav, wma + * Other: bmp, html, pdf, psd, qif, qtif, qti, tif, tiff, xaml + * + * Thanks to Mark Hicken and Brent Pedersen for helping me debug this on the Mac! + * Thanks to Dan Rossi for numerous bug reports and code bits! + * Thanks to Skye Giordano for several great suggestions! + * Thanks to Richard Connamacher for excellent improvements to the non-IE behavior! + */ +/*global SWFObject alert Sys */ +/*jshint forin:false */ +;(function($) { +"use strict"; + +var mode = document.documentMode || 0; +var msie = /MSIE/.test(navigator.userAgent); +var lameIE = msie && (/MSIE (6|7|8)\.0/.test(navigator.userAgent) || mode < 9); + +/** + * Chainable method for converting elements into rich media. + * + * @param options + * @param callback fn invoked for each matched element before conversion + * @param callback fn invoked for each matched element after conversion + */ +$.fn.media = function(options, f1, f2) { + if (options == 'undo') { + return this.each(function() { + var $this = $(this); + var html = $this.data('media.origHTML'); + if (html) + $this.replaceWith(html); + }); + } + + return this.each(function() { + if (typeof options == 'function') { + f2 = f1; + f1 = options; + options = {}; + } + var o = getSettings(this, options); + // pre-conversion callback, passes original element and fully populated options + if (typeof f1 == 'function') f1(this, o); + + var r = getTypesRegExp(); + var m = r.exec(o.src.toLowerCase()) || ['']; + var fn; + + if (o.type) + m[0] = o.type; + else + m.shift(); + + for (var i=0; i < m.length; i++) { + fn = m[i].toLowerCase(); + if (isDigit(fn[0])) fn = 'fn' + fn; // fns can't begin with numbers + if (!$.fn.media[fn]) + continue; // unrecognized media type + // normalize autoplay settings + var player = $.fn.media[fn+'_player']; + if (!o.params) o.params = {}; + if (player) { + var num = player.autoplayAttr == 'autostart'; + o.params[player.autoplayAttr || 'autoplay'] = num ? (o.autoplay ? 1 : 0) : o.autoplay ? true : false; + } + var $div = $.fn.media[fn](this, o); + + $div.css('backgroundColor', o.bgColor).width(o.width); + + if (o.canUndo) { + var $temp = $('
    ').append(this); + $div.data('media.origHTML', $temp.html()); // store original markup + } + + // post-conversion callback, passes original element, new div element and fully populated options + if (typeof f2 == 'function') f2(this, $div[0], o, player.name); + break; + } + }); +}; + +/** + * Non-chainable method for adding or changing file format / player mapping + * @name mapFormat + * @param String format File format extension (ie: mov, wav, mp3) + * @param String player Player name to use for the format (one of: flash, quicktime, realplayer, winmedia, silverlight or iframe + */ +$.fn.media.mapFormat = function(format, player) { + if (!format || !player || !$.fn.media.defaults.players[player]) return; // invalid + format = format.toLowerCase(); + if (isDigit(format[0])) format = 'fn' + format; + $.fn.media[format] = $.fn.media[player]; + $.fn.media[format+'_player'] = $.fn.media.defaults.players[player]; +}; + +// global defautls; override as needed +$.fn.media.defaults = { + standards: true, // use object tags only (no embeds for non-IE browsers) + canUndo: true, // tells plugin to store the original markup so it can be reverted via: $(sel).mediaUndo() + width: 400, + height: 400, + autoplay: 0, // normalized cross-player setting + bgColor: '#ffffff', // background color + params: { wmode: 'transparent'}, // added to object element as param elements; added to embed element as attrs + attrs: {}, // added to object and embed elements as attrs + flvKeyName: 'file', // key used for object src param (thanks to Andrea Ercolino) + flashvars: {}, // added to flash content as flashvars param/attr + flashVersion: '7', // required flash version + expressInstaller: null, // src for express installer + + // default flash video and mp3 player (@see: http://jeroenwijering.com/?item=Flash_Media_Player) + flvPlayer: 'mediaplayer.swf', + mp3Player: 'mediaplayer.swf', + + // @see http://msdn2.microsoft.com/en-us/library/bb412401.aspx + silverlight: { + inplaceInstallPrompt: 'true', // display in-place install prompt? + isWindowless: 'true', // windowless mode (false for wrapping markup) + framerate: '24', // maximum framerate + version: '0.9', // Silverlight version + onError: null, // onError callback + onLoad: null, // onLoad callback + initParams: null, // object init params + userContext: null // callback arg passed to the load callback + } +}; + +// Media Players; think twice before overriding +$.fn.media.defaults.players = { + flash: { + name: 'flash', + title: 'Flash', + types: 'flv,mp3,swf', + mimetype: 'application/x-shockwave-flash', + pluginspage: 'http://www.adobe.com/go/getflashplayer', + ieAttrs: { + classid: 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000', + type: 'application/x-oleobject', + codebase: 'http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=' + $.fn.media.defaults.flashVersion + } + }, + quicktime: { + name: 'quicktime', + title: 'QuickTime', + mimetype: 'video/quicktime', + pluginspage: 'http://www.apple.com/quicktime/download/', + types: 'aif,aiff,aac,au,bmp,gsm,mov,mid,midi,mpg,mpeg,mp4,m4a,psd,qt,qtif,qif,qti,snd,tif,tiff,wav,3g2,3gp', + ieAttrs: { + classid: 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B', + codebase: 'http://www.apple.com/qtactivex/qtplugin.cab' + } + }, + realplayer: { + name: 'real', + title: 'RealPlayer', + types: 'ra,ram,rm,rpm,rv,smi,smil', + mimetype: 'audio/x-pn-realaudio-plugin', + pluginspage: 'http://www.real.com/player/', + autoplayAttr: 'autostart', + ieAttrs: { + classid: 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA' + } + }, + winmedia: { + name: 'winmedia', + title: 'Windows Media', + types: 'asx,asf,avi,wma,wmv', + mimetype: isFirefoxWMPPluginInstalled() ? 'application/x-ms-wmp' : 'application/x-mplayer2', + pluginspage: 'http://www.microsoft.com/Windows/MediaPlayer/', + autoplayAttr: 'autostart', + oUrl: 'url', + ieAttrs: { + classid: 'clsid:6BF52A52-394A-11d3-B153-00C04F79FAA6', + type: 'application/x-oleobject' + } + }, + // special cases + img: { + name: 'img', + title: 'Image', + types: 'gif,png,jpg' + }, + iframe: { + name: 'iframe', + types: 'html,pdf' + }, + silverlight: { + name: 'silverlight', + types: 'xaml' + } +}; + +// +// everything below here is private +// + + +// detection script for FF WMP plugin (http://www.therossman.org/experiments/wmp_play.html) +// (hat tip to Mark Ross for this script) +function isFirefoxWMPPluginInstalled() { + var plugs = navigator.plugins || []; + for (var i = 0; i < plugs.length; i++) { + var plugin = plugs[i]; + if (plugin['filename'] == 'np-mswmp.dll') + return true; + } + return false; +} + +var counter = 1; + +for (var player in $.fn.media.defaults.players) { + var types = $.fn.media.defaults.players[player].types; + $.each(types.split(','), function(i,o) { + if (isDigit(o[0])) o = 'fn' + o; + $.fn.media[o] = $.fn.media[player] = getGenerator(player); + $.fn.media[o+'_player'] = $.fn.media.defaults.players[player]; + }); +} + +function getTypesRegExp() { + var types = ''; + for (var player in $.fn.media.defaults.players) { + if (types.length) types += ','; + types += $.fn.media.defaults.players[player].types; + } + return new RegExp('\\.(' + types.replace(/,/ig,'|') + ')\\b'); +} + +function getGenerator(player) { + return function(el, options) { + return generate(el, options, player); + }; +} + +function isDigit(c) { + return '0123456789'.indexOf(c) > -1; +} + +// flatten all possible options: global defaults, meta, option obj +function getSettings(el, options) { + options = options || {}; + var a, n; + var $el = $(el); + var cls = el.className || ''; + // support metadata plugin (v1.0 and v2.0) + var meta = $.metadata ? $el.metadata() : $.meta ? $el.data() : {}; + meta = meta || {}; + var w = meta.width || parseInt(((cls.match(/\bw:(\d+)/)||[])[1]||0),10) || parseInt(((cls.match(/\bwidth:(\d+)/)||[])[1]||0),10); + var h = meta.height || parseInt(((cls.match(/\bh:(\d+)/)||[])[1]||0),10) || parseInt(((cls.match(/\bheight:(\d+)/)||[])[1]||0),10); + + if (w) meta.width = w; + if (h) meta.height = h; + if (cls) meta.cls = cls; + + // crank html5 style data attributes + var dataName = 'data-'; + for (var i=0; i < el.attributes.length; i++) { + a = el.attributes[i], n = $.trim(a.name); + var index = n.indexOf(dataName); + if (index === 0) { + n = n.substring(dataName.length); + meta[n] = a.value; + } + } + + a = $.fn.media.defaults; + var b = options; + var c = meta; + + var p = { params: { bgColor: options.bgColor || $.fn.media.defaults.bgColor } }; + var opts = $.extend({}, a, b, c); + $.each(['attrs','params','flashvars','silverlight'], function(i,o) { + opts[o] = $.extend({}, p[o] || {}, a[o] || {}, b[o] || {}, c[o] || {}); + }); + + if (typeof opts.caption == 'undefined') opts.caption = $el.text(); + + // make sure we have a source! + opts.src = opts.src || $el.attr('href') || $el.attr('src') || 'unknown'; + return opts; +} + +// +// Flash Player +// + +// generate flash using SWFObject library if possible +$.fn.media.swf = function(el, opts) { + var f, p; + if (!window.SWFObject && !window.swfobject) { + // roll our own + if (opts.flashvars) { + var a = []; + for (f in opts.flashvars) + a.push(f + '=' + opts.flashvars[f]); + if (!opts.params) opts.params = {}; + opts.params.flashvars = a.join('&'); + } + return generate(el, opts, 'flash'); + } + + var id = el.id ? (' id="'+el.id+'"') : ''; + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + + // swfobject v2+ + if (window.swfobject) { + $(el).after($div).appendTo($div); + if (!el.id) el.id = 'movie_player_' + counter++; + + // replace el with swfobject content + window.swfobject.embedSWF(opts.src, el.id, opts.width, opts.height, opts.flashVersion, + opts.expressInstaller, opts.flashvars, opts.params, opts.attrs); + } + // swfobject < v2 + else { + $(el).after($div).remove(); + var so = new SWFObject(opts.src, 'movie_player_' + counter++, opts.width, opts.height, opts.flashVersion, opts.bgColor); + if (opts.expressInstaller) so.useExpressInstall(opts.expressInstaller); + + for (p in opts.params) + if (p != 'bgColor') so.addParam(p, opts.params[p]); + for (f in opts.flashvars) + so.addVariable(f, opts.flashvars[f]); + so.write($div[0]); + } + + if (opts.caption) $('
    ').appendTo($div).html(opts.caption); + return $div; +}; + +// map flv and mp3 files to the swf player by default +$.fn.media.flv = $.fn.media.mp3 = function(el, opts) { + var src = opts.src; + var player = /\.mp3\b/i.test(src) ? opts.mp3Player : opts.flvPlayer; + var key = opts.flvKeyName; + src = encodeURIComponent(src); + opts.src = player; + opts.src = opts.src + '?'+key+'=' + (src); + var srcObj = {}; + srcObj[key] = src; + opts.flashvars = $.extend({}, srcObj, opts.flashvars ); + return $.fn.media.swf(el, opts); +}; + +// +// Silverlight +// +$.fn.media.xaml = function(el, opts) { + if (!window.Sys || !window.Sys.Silverlight) { + if ($.fn.media.xaml.warning) return; + $.fn.media.xaml.warning = 1; + alert('You must include the Silverlight.js script.'); + return; + } + + var props = { + width: opts.width, + height: opts.height, + background: opts.bgColor, + inplaceInstallPrompt: opts.silverlight.inplaceInstallPrompt, + isWindowless: opts.silverlight.isWindowless, + framerate: opts.silverlight.framerate, + version: opts.silverlight.version + }; + var events = { + onError: opts.silverlight.onError, + onLoad: opts.silverlight.onLoad + }; + + var id1 = el.id ? (' id="'+el.id+'"') : ''; + var id2 = opts.id || 'AG' + counter++; + // convert element to div + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + $(el).after($div).remove(); + + Sys.Silverlight.createObjectEx({ + source: opts.src, + initParams: opts.silverlight.initParams, + userContext: opts.silverlight.userContext, + id: id2, + parentElement: $div[0], + properties: props, + events: events + }); + + if (opts.caption) $('
    ').appendTo($div).html(opts.caption); + return $div; +}; + +// +// generate object/embed markup +// +function generate(el, opts, player) { + var $el = $(el); + var o = $.fn.media.defaults.players[player]; + var a, key, v; + + if (player == 'iframe') { + o = $(''); + o.attr('src', opts.src); + o.css('backgroundColor', o.bgColor); + } + else if (player == 'img') { + o = $(''); + o.attr('src', opts.src); + if (opts.width) + o.attr('width', opts.width); + if (opts.height) + o.attr('height', opts.height); + o.css('backgroundColor', o.bgColor); + } + else if (lameIE) { + a = [''); + var p = ['']; + for (key in opts.params) + p.push(''); + o = document.createElement(a.join('')); + for (var i=0; i < p.length; i++) + o.appendChild(document.createElement(p[i])); + } + else if (opts.standards) { + // Rewritten to be standards compliant by Richard Connamacher + a = [''); + a.push(''); + for (key in opts.params) { + if (key == 'wmode' && player != 'flash') // FF3/Quicktime borks on wmode + continue; + a.push(''); + } + // Alternate HTML + a.push('

    '+o.title+' Required

    '+o.title+' is required to view this media. Download Here.

    '); + a.push(''); + } + else { + a = [''); + } + // convert element to div + var id = el.id ? (' id="'+el.id+'"') : ''; + var cls = opts.cls ? (' class="' + opts.cls + '"') : ''; + var $div = $(''); + $el.after($div).remove(); + if (lameIE || player == 'iframe' || player == 'img') + $div.append(o); + else + $div.html(a.join('')); + + if (opts.caption) + $('
    ').appendTo($div).html(opts.caption); + return $div; +} + + +})(jQuery); diff --git a/yulan.pdf b/yulan.pdf new file mode 100644 index 0000000..021f5d9 Binary files /dev/null and b/yulan.pdf differ