提交dev

1

dist/html/files/临时加课/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1677 {
-=======
 #u1678 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1678_img {
-=======
 #u1679_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1678 {
-=======
 #u1679 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1678_text {
-=======
 #u1679_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1679_div {
-=======
 #u1680_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1679 {
-=======
 #u1680 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1679_text {
-=======
 #u1680_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1680_div {
-=======
 #u1681_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1680 {
-=======
 #u1681 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1680_text {
-=======
 #u1681_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1681_div {
-=======
 #u1682_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1681 {
-=======
 #u1682 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1681_text {
-=======
 #u1682_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:223px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1682_div {
-=======
 #u1683_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1682 {
-=======
 #u1683 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1682_text {
-=======
 #u1683_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1683 {
-=======
 #u1684 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1684_img {
-=======
 #u1685_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1684 {
-=======
 #u1685 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1177px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1684_text {
-=======
 #u1685_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1685_div {
-=======
 #u1686_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -334,11 +250,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1685 {
-=======
 #u1686 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1217px;
@@ -350,11 +262,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1685_text {
-=======
 #u1686_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -362,11 +270,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1686_div {
-=======
 #u1687_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -381,11 +285,7 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
-<<<<<<< HEAD
-#u1686 {
-=======
 #u1687 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1217px;
@@ -393,11 +293,7 @@
   width:352px;
   height:611px;
 }
-<<<<<<< HEAD
-#u1686_text {
-=======
 #u1687_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -405,11 +301,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1687_img {
-=======
 #u1688_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -417,11 +309,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1687 {
-=======
 #u1688 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -429,11 +317,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1687_text {
-=======
 #u1688_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1688_img {
-=======
 #u1689_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -454,11 +334,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1688 {
-=======
 #u1689 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:542px;
@@ -471,11 +347,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1688_text {
-=======
 #u1689_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -483,11 +355,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1689_div {
-=======
 #u1690_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -506,11 +374,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1689 {
-=======
 #u1690 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -522,11 +386,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1689_text {
-=======
 #u1690_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -534,11 +394,7 @@
   width:223px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1690_img {
-=======
 #u1691_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -546,11 +402,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1690 {
-=======
 #u1691 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -558,11 +410,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1690_text {
-=======
 #u1691_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -571,11 +419,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1691 {
-=======
 #u1692 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -583,11 +427,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1692_img {
-=======
 #u1693_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -595,11 +435,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1692 {
-=======
 #u1693 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -611,11 +447,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1692_text {
-=======
 #u1693_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -623,11 +455,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1693_div {
-=======
 #u1694_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -646,11 +474,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1693 {
-=======
 #u1694 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -662,11 +486,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1693_text {
-=======
 #u1694_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -674,11 +494,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1694_div {
-=======
 #u1695_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -693,11 +509,7 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
-<<<<<<< HEAD
-#u1694 {
-=======
 #u1695 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -705,11 +517,7 @@
   width:352px;
   height:552px;
 }
-<<<<<<< HEAD
-#u1694_text {
-=======
 #u1695_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -717,11 +525,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1695_img {
-=======
 #u1696_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -729,11 +533,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1695 {
-=======
 #u1696 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:542px;
@@ -746,11 +546,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1695_text {
-=======
 #u1696_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -758,20 +554,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1696 {
-=======
 #u1697 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1696_state0 {
-=======
 #u1697_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -779,11 +567,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1696_state0_content {
-=======
 #u1697_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -791,11 +575,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1697_div {
-=======
 #u1698_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -814,11 +594,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1697 {
-=======
 #u1698 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -830,11 +606,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1697_text {
-=======
 #u1698_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/临时合并课程/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1775_img {
-=======
 #u1776_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1775 {
-=======
 #u1776 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1775_text {
-=======
 #u1776_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1776_div {
-=======
 #u1777_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,11 +54,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1776 {
-=======
 #u1777 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -84,11 +64,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1776_text {
-=======
 #u1777_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -96,11 +72,7 @@
   width:716px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1777 {
-=======
 #u1778 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -108,11 +80,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1778_img {
-=======
 #u1779_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1778 {
-=======
 #u1779 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -132,11 +96,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1778_text {
-=======
 #u1779_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -145,11 +105,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1779_div {
-=======
 #u1780_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -167,11 +123,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1779 {
-=======
 #u1780 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -182,11 +134,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1779_text {
-=======
 #u1780_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,11 +142,7 @@
   width:145px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1780_div {
-=======
 #u1781_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -217,11 +161,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1780 {
-=======
 #u1781 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -233,11 +173,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1780_text {
-=======
 #u1781_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -245,11 +181,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1781_div {
-=======
 #u1782_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -268,11 +200,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1781 {
-=======
 #u1782 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -284,11 +212,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1781_text {
-=======
 #u1782_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   width:228px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1782_img {
-=======
 #u1783_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1782 {
-=======
 #u1783 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1149px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1782_text {
-=======
 #u1783_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1783 {
-=======
 #u1784 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1784_img {
-=======
 #u1785_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1784 {
-=======
 #u1785 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1784_text {
-=======
 #u1785_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1785_div {
-=======
 #u1786_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1785 {
-=======
 #u1786 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1785_text {
-=======
 #u1786_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:198px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1786_div {
-=======
 #u1787_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1786 {
-=======
 #u1787 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:110px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1786_text {
-=======
 #u1787_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1787 {
-=======
 #u1788 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -501,11 +369,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1788_div {
-=======
 #u1789_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -526,11 +390,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1788 {
-=======
 #u1789 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -541,11 +401,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1788_text {
-=======
 #u1789_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -553,11 +409,7 @@
   width:301px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1789_img {
-=======
 #u1790_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -565,11 +417,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1789 {
-=======
 #u1790 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -577,11 +425,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1789_text {
-=======
 #u1790_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -590,20 +434,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1790 {
-=======
 #u1791 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1790_state0 {
-=======
 #u1791_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -611,11 +447,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1790_state0_content {
-=======
 #u1791_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -623,11 +455,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1791_div {
-=======
 #u1792_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -646,11 +474,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1791 {
-=======
 #u1792 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -662,11 +486,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1791_text {
-=======
 #u1792_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/乐团关闭/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1832_img {
-=======
 #u1833_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1832 {
-=======
 #u1833 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1832_text {
-=======
 #u1833_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1833 {
-=======
 #u1834 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1834_img {
-=======
 #u1835_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1834 {
-=======
 #u1835 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1834_text {
-=======
 #u1835_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1835_div {
-=======
 #u1836_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1835 {
-=======
 #u1836 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1835_text {
-=======
 #u1836_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1836_div {
-=======
 #u1837_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1836 {
-=======
 #u1837 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1836_text {
-=======
 #u1837_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1837_div {
-=======
 #u1838_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -221,11 +165,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1837 {
-=======
 #u1838 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -237,11 +177,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1837_text {
-=======
 #u1838_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1838_div {
-=======
 #u1839_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,11 +202,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1838 {
-=======
 #u1839 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:54px;
@@ -284,11 +212,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1838_text {
-=======
 #u1839_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1839 {
-=======
 #u1840 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -308,11 +228,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1840_img {
-=======
 #u1841_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -320,11 +236,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u1840 {
-=======
 #u1841 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -337,11 +249,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1840_text {
-=======
 #u1841_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -349,11 +257,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1841_div {
-=======
 #u1842_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -372,11 +276,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1841 {
-=======
 #u1842 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -388,11 +288,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1841_text {
-=======
 #u1842_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -400,11 +296,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1842_div {
-=======
 #u1843_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -420,11 +312,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1842 {
-=======
 #u1843 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -433,11 +321,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1842_text {
-=======
 #u1843_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -445,11 +329,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1843_img {
-=======
 #u1844_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -457,11 +337,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1843 {
-=======
 #u1844 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1062px;
@@ -474,11 +350,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1843_text {
-=======
 #u1844_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/乐团审核/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u112 {
-=======
 #u113 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u113_img {
-=======
 #u114_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u113 {
-=======
 #u114 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u113_text {
-=======
 #u114_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u114_div {
-=======
 #u115_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u114 {
-=======
 #u115 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u114_text {
-=======
 #u115_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u115_div {
-=======
 #u116_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u115 {
-=======
 #u116 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u115_text {
-=======
 #u116_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u116_div {
-=======
 #u117_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -182,11 +138,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u116 {
-=======
 #u117 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -196,11 +148,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u116_text {
-=======
 #u117_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -208,11 +156,7 @@
   width:507px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u117_div {
-=======
 #u118_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,11 +175,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u117 {
-=======
 #u118 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -247,11 +187,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u117_text {
-=======
 #u118_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:197px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u118_img {
-=======
 #u119_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u118 {
-=======
 #u119 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -283,11 +211,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u118_text {
-=======
 #u119_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u119_img {
-=======
 #u120_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u119 {
-=======
 #u120 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1034px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u119_text {
-=======
 #u120_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u120 {
-=======
 #u121 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u121_img {
-=======
 #u122_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u121 {
-=======
 #u122 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -378,11 +278,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u121_text {
-=======
 #u122_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -390,11 +286,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u122_div {
-=======
 #u123_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u122 {
-=======
 #u123 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -429,11 +317,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u122_text {
-=======
 #u123_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -441,11 +325,7 @@
   width:120px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u123_div {
-=======
 #u124_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -461,11 +341,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u123 {
-=======
 #u124 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -474,11 +350,7 @@
   height:66px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u123_text {
-=======
 #u124_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -486,11 +358,7 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u124_img {
-=======
 #u125_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -498,11 +366,7 @@
   width:1153px;
   height:583px;
 }
-<<<<<<< HEAD
-#u124 {
-=======
 #u125 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -513,11 +377,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u124_text {
-=======
 #u125_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -526,11 +386,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u125_img {
-=======
 #u126_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -538,11 +394,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u125 {
-=======
 #u126 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1032px;
@@ -555,11 +407,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u125_text {
-=======
 #u126_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -567,11 +415,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u126 {
-=======
 #u127 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -579,11 +423,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u127_img {
-=======
 #u128_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -591,11 +431,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u127 {
-=======
 #u128 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -608,11 +444,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u127_text {
-=======
 #u128_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -620,11 +452,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u128_div {
-=======
 #u129_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -643,11 +471,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u128 {
-=======
 #u129 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -659,11 +483,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u128_text {
-=======
 #u129_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -671,11 +491,7 @@
   width:120px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u129_div {
-=======
 #u130_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -691,11 +507,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u129 {
-=======
 #u130 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -704,11 +516,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u129_text {
-=======
 #u130_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -716,11 +524,7 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u130 {
-=======
 #u131 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -728,11 +532,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u131_img {
-=======
 #u132_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -740,11 +540,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u131 {
-=======
 #u132 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -757,11 +553,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u131_text {
-=======
 #u132_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -769,11 +561,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u132_div {
-=======
 #u133_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -792,11 +580,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u132 {
-=======
 #u133 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -808,11 +592,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u132_text {
-=======
 #u133_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -820,11 +600,7 @@
   width:120px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u133_div {
-=======
 #u134_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -840,11 +616,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u133 {
-=======
 #u134 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -853,11 +625,7 @@
   height:88px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u133_text {
-=======
 #u134_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -865,11 +633,7 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u134_img {
-=======
 #u135_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -877,11 +641,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u134 {
-=======
 #u135 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1032px;
@@ -894,11 +654,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u134_text {
-=======
 #u135_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -906,11 +662,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u135 {
-=======
 #u136 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -918,11 +670,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u136_img {
-=======
 #u137_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -930,11 +678,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u136 {
-=======
 #u137 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -947,11 +691,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u136_text {
-=======
 #u137_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -959,11 +699,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u137_div {
-=======
 #u138_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -982,11 +718,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u137 {
-=======
 #u138 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -998,11 +730,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u137_text {
-=======
 #u138_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1010,11 +738,7 @@
   width:120px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u138_div {
-=======
 #u139_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1030,11 +754,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u138 {
-=======
 #u139 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -1043,11 +763,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u138_text {
-=======
 #u139_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1055,11 +771,7 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u139_img {
-=======
 #u140_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -1067,11 +779,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u139 {
-=======
 #u140 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1138px;
@@ -1084,11 +792,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u139_text {
-=======
 #u140_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -1096,11 +800,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u140 {
-=======
 #u141 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
@@ -1108,11 +808,7 @@
   height:40px;
   overflow:hidden;
 }
-<<<<<<< HEAD
-#u140_state0 {
-=======
 #u141_state0 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1125,11 +821,7 @@
   overflow-y:hidden;
   background-image:none;
 }
-<<<<<<< HEAD
-#u140_state0_content {
-=======
 #u141_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1137,11 +829,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u141_div {
-=======
 #u142_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1159,11 +847,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u141 {
-=======
 #u142 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1174,11 +858,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u141_text {
-=======
 #u142_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/乐团暂停/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1844 {
-=======
 #u1845 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1845_img {
-=======
 #u1846_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1845 {
-=======
 #u1846 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1845_text {
-=======
 #u1846_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1846_div {
-=======
 #u1847_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1846 {
-=======
 #u1847 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1846_text {
-=======
 #u1847_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1847_div {
-=======
 #u1848_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1847 {
-=======
 #u1848 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1847_text {
-=======
 #u1848_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1848_div {
-=======
 #u1849_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1848 {
-=======
 #u1849 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1848_text {
-=======
 #u1849_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1849_div {
-=======
 #u1850_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1849 {
-=======
 #u1850 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1849_text {
-=======
 #u1850_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1850_img {
-=======
 #u1851_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1850 {
-=======
 #u1851 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -283,11 +211,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1850_text {
-=======
 #u1851_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1851_img {
-=======
 #u1852_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1851 {
-=======
 #u1852 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1094px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1851_text {
-=======
 #u1852_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1852 {
-=======
 #u1853 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1853_img {
-=======
 #u1854_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u1853 {
-=======
 #u1854 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -378,11 +278,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1853_text {
-=======
 #u1854_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -390,11 +286,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1854_div {
-=======
 #u1855_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1854 {
-=======
 #u1855 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -429,11 +317,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1854_text {
-=======
 #u1855_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -441,11 +325,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1855_div {
-=======
 #u1856_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -461,11 +341,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1855 {
-=======
 #u1856 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -474,11 +350,7 @@
   height:22px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1855_text {
-=======
 #u1856_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -486,11 +358,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1856_img {
-=======
 #u1857_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -498,11 +366,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1856 {
-=======
 #u1857 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -510,11 +374,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1856_text {
-=======
 #u1857_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -523,11 +383,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1857_div {
-=======
 #u1858_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -546,11 +402,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1857 {
-=======
 #u1858 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -562,11 +414,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1857_text {
-=======
 #u1858_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -574,11 +422,7 @@
   width:91px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1858_img {
-=======
 #u1859_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -586,11 +430,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1858 {
-=======
 #u1859 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1090px;
@@ -603,11 +443,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1858_text {
-=======
 #u1859_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -615,11 +451,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1859 {
-=======
 #u1860 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -627,11 +459,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1860_img {
-=======
 #u1861_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -639,11 +467,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u1860 {
-=======
 #u1861 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -656,11 +480,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1860_text {
-=======
 #u1861_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -668,11 +488,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1861_div {
-=======
 #u1862_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -691,11 +507,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1861 {
-=======
 #u1862 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -707,11 +519,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1861_text {
-=======
 #u1862_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -719,11 +527,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1862_div {
-=======
 #u1863_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -739,11 +543,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1862 {
-=======
 #u1863 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -752,11 +552,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1862_text {
-=======
 #u1863_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;

dist/html/files/乐团续费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1656 {
-=======
 #u1657 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1657_img {
-=======
 #u1658_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1657 {
-=======
 #u1658 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1657_text {
-=======
 #u1658_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1658_div {
-=======
 #u1659_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1658 {
-=======
 #u1659 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1658_text {
-=======
 #u1659_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1659_div {
-=======
 #u1660_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1659 {
-=======
 #u1660 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1659_text {
-=======
 #u1660_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1660_div {
-=======
 #u1661_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1660 {
-=======
 #u1661 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1660_text {
-=======
 #u1661_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:223px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1661_div {
-=======
 #u1662_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1661 {
-=======
 #u1662 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1661_text {
-=======
 #u1662_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1662 {
-=======
 #u1663 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1663_img {
-=======
 #u1664_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:42px;
 }
-<<<<<<< HEAD
-#u1663 {
-=======
 #u1664 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1663_text {
-=======
 #u1664_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1664_div {
-=======
 #u1665_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -334,11 +250,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1664 {
-=======
 #u1665 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -350,11 +262,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1664_text {
-=======
 #u1665_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -362,11 +270,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1665_div {
-=======
 #u1666_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -381,11 +285,7 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
-<<<<<<< HEAD
-#u1665 {
-=======
 #u1666 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -393,11 +293,7 @@
   width:352px;
   height:575px;
 }
-<<<<<<< HEAD
-#u1665_text {
-=======
 #u1666_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -405,11 +301,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1666_img {
-=======
 #u1667_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -417,11 +309,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1666 {
-=======
 #u1667 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -429,11 +317,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1666_text {
-=======
 #u1667_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1667_img {
-=======
 #u1668_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -454,11 +334,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1667 {
-=======
 #u1668 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:459px;
@@ -471,11 +347,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1667_text {
-=======
 #u1668_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -483,11 +355,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1668_img {
-=======
 #u1669_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -495,11 +363,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1668 {
-=======
 #u1669 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -507,11 +371,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1668_text {
-=======
 #u1669_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -520,11 +380,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1669_div {
-=======
 #u1670_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -543,11 +399,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1669 {
-=======
 #u1670 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -559,11 +411,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1669_text {
-=======
 #u1670_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -571,11 +419,7 @@
   width:278px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1670 {
-=======
 #u1671 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -583,11 +427,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1671_img {
-=======
 #u1672_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -595,11 +435,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1671 {
-=======
 #u1672 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -611,11 +447,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1671_text {
-=======
 #u1672_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -623,11 +455,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1672_div {
-=======
 #u1673_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -646,11 +474,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1672 {
-=======
 #u1673 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -662,11 +486,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1672_text {
-=======
 #u1673_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -674,11 +494,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1673_div {
-=======
 #u1674_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -693,11 +509,7 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
-<<<<<<< HEAD
-#u1673 {
-=======
 #u1674 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -705,11 +517,7 @@
   width:352px;
   height:460px;
 }
-<<<<<<< HEAD
-#u1673_text {
-=======
 #u1674_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -717,11 +525,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1674_img {
-=======
 #u1675_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -729,11 +533,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1674 {
-=======
 #u1675 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:464px;
@@ -746,11 +546,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1674_text {
-=======
 #u1675_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -758,20 +554,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1675 {
-=======
 #u1676 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1675_state0 {
-=======
 #u1676_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -779,9 +567,6 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1675_state0_content {
-=======
 #u1676_state0_content {
   border-width:0px;
   position:absolute;
@@ -791,22 +576,10 @@
   height:1px;
 }
 #u1677_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
   top:0px;
-<<<<<<< HEAD
-  width:1px;
-  height:1px;
-}
-#u1676_div {
-  border-width:0px;
-  position:absolute;
-  left:0px;
-  top:0px;
-=======
->>>>>>> 0601optimize
   width:140px;
   height:40px;
   background:inherit;
@@ -821,11 +594,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1676 {
-=======
 #u1677 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -837,11 +606,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1676_text {
-=======
 #u1677_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/乐团补招/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1042 {
-=======
 #u1043 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1043_img {
-=======
 #u1044_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -36,11 +28,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1043 {
-=======
 #u1044 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -52,11 +40,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1043_text {
-=======
 #u1044_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -64,11 +48,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1044_div {
-=======
 #u1045_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,11 +68,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1044 {
-=======
 #u1045 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -105,11 +81,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1044_text {
-=======
 #u1045_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -117,11 +89,7 @@
   width:187px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1045_div {
-=======
 #u1046_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -137,11 +105,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1045 {
-=======
 #u1046 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -150,11 +114,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1045_text {
-=======
 #u1046_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -162,11 +122,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1046 {
-=======
 #u1047 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -176,11 +132,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1047_div {
-=======
 #u1048_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -200,11 +152,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1047 {
-=======
 #u1048 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -214,11 +162,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1047_text {
-=======
 #u1048_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -226,11 +170,7 @@
   width:272px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1048 {
-=======
 #u1049 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -238,11 +178,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1049_img {
-=======
 #u1050_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -250,11 +186,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1049 {
-=======
 #u1050 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -262,11 +194,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1049_text {
-=======
 #u1050_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -275,11 +203,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1050_div {
-=======
 #u1051_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -297,11 +221,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1050 {
-=======
 #u1051 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -312,11 +232,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1050_text {
-=======
 #u1051_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,11 +240,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1051_div {
-=======
 #u1052_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -347,11 +259,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1051 {
-=======
 #u1052 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -363,11 +271,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1051_text {
-=======
 #u1052_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -375,11 +279,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1052_div {
-=======
 #u1053_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -398,11 +298,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1052 {
-=======
 #u1053 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -414,11 +310,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1052_text {
-=======
 #u1053_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -426,11 +318,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1053_div {
-=======
 #u1054_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -447,11 +335,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1053 {
-=======
 #u1054 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -461,11 +345,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1053_text {
-=======
 #u1054_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -473,11 +353,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1054_img {
-=======
 #u1055_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,11 +361,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1054 {
-=======
 #u1055 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -497,11 +369,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1054_text {
-=======
 #u1055_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -510,11 +378,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1055_img {
-=======
 #u1056_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -522,11 +386,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1055 {
-=======
 #u1056 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:310px;
@@ -539,11 +399,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1055_text {
-=======
 #u1056_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -551,20 +407,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1056 {
-=======
 #u1057 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1056_state0 {
-=======
 #u1057_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -572,11 +420,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1056_state0_content {
-=======
 #u1057_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -584,11 +428,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1057_div {
-=======
 #u1058_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -607,11 +447,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1057 {
-=======
 #u1058 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -623,11 +459,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1057_text {
-=======
 #u1058_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/修改专业/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u548_img {
-=======
 #u549_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u548 {
-=======
 #u549 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u548_text {
-=======
 #u549_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u549 {
-=======
 #u550 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u550_img {
-=======
 #u551_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u550 {
-=======
 #u551 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u550_text {
-=======
 #u551_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u551_div {
-=======
 #u552_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u551 {
-=======
 #u552 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u551_text {
-=======
 #u552_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u552_div {
-=======
 #u553_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u552 {
-=======
 #u553 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u552_text {
-=======
 #u553_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u553_img {
-=======
 #u554_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u553 {
-=======
 #u554 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1031px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u553_text {
-=======
 #u554_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u554_div {
-=======
 #u555_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u554 {
-=======
 #u555 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u554_text {
-=======
 #u555_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u555_div {
-=======
 #u556_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u555 {
-=======
 #u556 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u555_text {
-=======
 #u556_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u556 {
-=======
 #u557 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u557_img {
-=======
 #u558_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u557 {
-=======
 #u558 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u557_text {
-=======
 #u558_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u558_div {
-=======
 #u559_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u558 {
-=======
 #u559 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u558_text {
-=======
 #u559_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:180px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u559_div {
-=======
 #u560_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u559 {
-=======
 #u560 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:31px;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u559_text {
-=======
 #u560_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u560_img {
-=======
 #u561_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -499,11 +367,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u560 {
-=======
 #u561 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -511,11 +375,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u560_text {
-=======
 #u561_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -524,20 +384,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u561 {
-=======
 #u562 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u561_state0 {
-=======
 #u562_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -545,11 +397,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u561_state0_content {
-=======
 #u562_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +405,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u562_div {
-=======
 #u563_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -580,11 +424,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u562 {
-=======
 #u563 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -596,11 +436,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u562_text {
-=======
 #u563_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/合并学员/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u533_img {
-=======
 #u534_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u533 {
-=======
 #u534 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u533_text {
-=======
 #u534_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u534 {
-=======
 #u535 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u535_img {
-=======
 #u536_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u535 {
-=======
 #u536 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u535_text {
-=======
 #u536_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u536_div {
-=======
 #u537_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u536 {
-=======
 #u537 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u536_text {
-=======
 #u537_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u537_div {
-=======
 #u538_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u537 {
-=======
 #u538 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u537_text {
-=======
 #u538_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u538_img {
-=======
 #u539_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u538 {
-=======
 #u539 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:533px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u538_text {
-=======
 #u539_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u539_div {
-=======
 #u540_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u539 {
-=======
 #u540 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u539_text {
-=======
 #u540_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u540_div {
-=======
 #u541_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u540 {
-=======
 #u541 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u540_text {
-=======
 #u541_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:1120px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u541 {
-=======
 #u542 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u542_img {
-=======
 #u543_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u542 {
-=======
 #u543 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u542_text {
-=======
 #u543_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u543_div {
-=======
 #u544_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u543 {
-=======
 #u544 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u543_text {
-=======
 #u544_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:107px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u544_div {
-=======
 #u545_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -463,11 +343,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u544 {
-=======
 #u545 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -477,11 +353,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u544_text {
-=======
 #u545_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -489,11 +361,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u545_img {
-=======
 #u546_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -501,11 +369,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u545 {
-=======
 #u546 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -513,11 +377,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u545_text {
-=======
 #u546_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -526,20 +386,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u546 {
-=======
 #u547 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u546_state0 {
-=======
 #u547_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -547,11 +399,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u546_state0_content {
-=======
 #u547_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -559,11 +407,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u547_div {
-=======
 #u548_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -582,11 +426,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u547 {
-=======
 #u548 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -598,11 +438,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u547_text {
-=======
 #u548_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/合并学员_1/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u757 {
-=======
 #u758 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u758_img {
-=======
 #u759_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u758 {
-=======
 #u759 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u758_text {
-=======
 #u759_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u759_div {
-=======
 #u760_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u759 {
-=======
 #u760 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u759_text {
-=======
 #u760_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u760_div {
-=======
 #u761_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u760 {
-=======
 #u761 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u760_text {
-=======
 #u761_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u761_div {
-=======
 #u762_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u761 {
-=======
 #u762 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u761_text {
-=======
 #u762_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u762_div {
-=======
 #u763_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u762 {
-=======
 #u763 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:55px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u762_text {
-=======
 #u763_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u763 {
-=======
 #u764 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u764_img {
-=======
 #u765_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u764 {
-=======
 #u765 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u764_text {
-=======
 #u765_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u765_div {
-=======
 #u766_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -335,11 +251,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u765 {
-=======
 #u766 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -352,11 +264,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u765_text {
-=======
 #u766_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -364,11 +272,7 @@
   width:107px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u766_div {
-=======
 #u767_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -385,11 +289,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u766 {
-=======
 #u767 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -399,11 +299,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u766_text {
-=======
 #u767_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -411,11 +307,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u767_img {
-=======
 #u768_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -423,11 +315,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u767 {
-=======
 #u768 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -435,11 +323,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u767_text {
-=======
 #u768_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -448,20 +332,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u768 {
-=======
 #u769 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u768_state0 {
-=======
 #u769_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -469,11 +345,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u768_state0_content {
-=======
 #u769_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -481,11 +353,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u769_div {
-=======
 #u770_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -504,11 +372,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u769 {
-=======
 #u770 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -520,11 +384,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u769_text {
-=======
 #u770_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/合并学员_2/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1086_img {
-=======
 #u1087_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1086 {
-=======
 #u1087 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1086_text {
-=======
 #u1087_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1087_img {
-=======
 #u1088_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -61,11 +45,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1087 {
-=======
 #u1088 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:520px;
@@ -78,11 +58,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1087_text {
-=======
 #u1088_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -90,11 +66,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1088 {
-=======
 #u1089 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -102,11 +74,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1089_img {
-=======
 #u1090_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -114,11 +82,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1089 {
-=======
 #u1090 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -130,11 +94,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1089_text {
-=======
 #u1090_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -142,11 +102,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1090_div {
-=======
 #u1091_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -166,11 +122,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1090 {
-=======
 #u1091 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -183,11 +135,7 @@
   font-size:16px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1090_text {
-=======
 #u1091_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,11 +143,7 @@
   width:107px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1091_div {
-=======
 #u1092_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -216,11 +160,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1091 {
-=======
 #u1092 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -230,11 +170,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1091_text {
-=======
 #u1092_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -242,11 +178,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1092 {
-=======
 #u1093 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -254,11 +186,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1093_img {
-=======
 #u1094_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -266,11 +194,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1093 {
-=======
 #u1094 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -278,11 +202,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1093_text {
-=======
 #u1094_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -291,11 +211,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1094_div {
-=======
 #u1095_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -313,11 +229,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1094 {
-=======
 #u1095 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -328,11 +240,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1094_text {
-=======
 #u1095_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,11 +248,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1095_div {
-=======
 #u1096_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -363,11 +267,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1095 {
-=======
 #u1096 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -379,11 +279,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1095_text {
-=======
 #u1096_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -391,11 +287,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1096_div {
-=======
 #u1097_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -414,11 +306,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1096 {
-=======
 #u1097 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -430,11 +318,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1096_text {
-=======
 #u1097_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1097_div {
-=======
 #u1098_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -463,11 +343,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1097 {
-=======
 #u1098 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -477,11 +353,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1097_text {
-=======
 #u1098_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -489,20 +361,12 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1098 {
-=======
 #u1099 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1098_state0 {
-=======
 #u1099_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -510,11 +374,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1098_state0_content {
-=======
 #u1099_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -522,11 +382,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1099_div {
-=======
 #u1100_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -545,11 +401,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1099 {
-=======
 #u1100 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -561,11 +413,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1099_text {
-=======
 #u1100_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/学员调整/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1478_img {
-=======
 #u1479_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1478 {
-=======
 #u1479 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1478_text {
-=======
 #u1479_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1479 {
-=======
 #u1480 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1480_img {
-=======
 #u1481_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1480 {
-=======
 #u1481 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1480_text {
-=======
 #u1481_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1481_div {
-=======
 #u1482_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1481 {
-=======
 #u1482 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1481_text {
-=======
 #u1482_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1482_div {
-=======
 #u1483_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1482 {
-=======
 #u1483 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1482_text {
-=======
 #u1483_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1483_div {
-=======
 #u1484_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -221,11 +165,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1483 {
-=======
 #u1484 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -237,11 +177,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1483_text {
-=======
 #u1484_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1484_div {
-=======
 #u1485_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,11 +202,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1484 {
-=======
 #u1485 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -284,11 +212,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1484_text {
-=======
 #u1485_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1485_img {
-=======
 #u1486_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1485 {
-=======
 #u1486 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:988px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1485_text {
-=======
 #u1486_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1486 {
-=======
 #u1487 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1487_img {
-=======
 #u1488_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1487 {
-=======
 #u1488 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1173px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1487_text {
-=======
 #u1488_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1488_div {
-=======
 #u1489_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1488 {
-=======
 #u1489 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1488_text {
-=======
 #u1489_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1489_div {
-=======
 #u1490_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1489 {
-=======
 #u1490 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -475,11 +351,7 @@
   height:198px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1489_text {
-=======
 #u1490_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1490 {
-=======
 #u1491 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1218px;
@@ -501,11 +369,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1491_img {
-=======
 #u1492_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -513,11 +377,7 @@
   width:276px;
   height:89px;
 }
-<<<<<<< HEAD
-#u1491 {
-=======
 #u1492 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -528,11 +388,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1491_text {
-=======
 #u1492_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -540,11 +396,7 @@
   width:272px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1492_img {
-=======
 #u1493_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -552,11 +404,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1492 {
-=======
 #u1493 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -564,11 +412,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1492_text {
-=======
 #u1493_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -577,20 +421,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1493 {
-=======
 #u1494 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1493_state0 {
-=======
 #u1494_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -598,11 +434,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1493_state0_content {
-=======
 #u1494_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -610,11 +442,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1494_div {
-=======
 #u1495_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -633,11 +461,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1494 {
-=======
 #u1495 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -649,11 +473,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1494_text {
-=======
 #u1495_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/延长报名/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u505_img {
-=======
 #u506_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u505 {
-=======
 #u506 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u505_text {
-=======
 #u506_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u506 {
-=======
 #u507 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u507_img {
-=======
 #u508_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u507 {
-=======
 #u508 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u507_text {
-=======
 #u508_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u508_div {
-=======
 #u509_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u508 {
-=======
 #u509 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u508_text {
-=======
 #u509_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u509_div {
-=======
 #u510_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u509 {
-=======
 #u510 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u509_text {
-=======
 #u510_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u510_img {
-=======
 #u511_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u510 {
-=======
 #u511 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:281px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u510_text {
-=======
 #u511_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u511_div {
-=======
 #u512_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u511 {
-=======
 #u512 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u511_text {
-=======
 #u512_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u512_div {
-=======
 #u513_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u512 {
-=======
 #u513 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u512_text {
-=======
 #u513_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u513 {
-=======
 #u514 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u514_img {
-=======
 #u515_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u514 {
-=======
 #u515 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u514_text {
-=======
 #u515_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u515_div {
-=======
 #u516_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -412,11 +304,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u515 {
-=======
 #u516 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -428,11 +316,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u515_text {
-=======
 #u516_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:146px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u516_div {
-=======
 #u517_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -460,11 +340,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u516 {
-=======
 #u517 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -473,11 +349,7 @@
   height:25px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u516_text {
-=======
 #u517_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u517 {
-=======
 #u518 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u517_state0 {
-=======
 #u518_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u517_state0_content {
-=======
 #u518_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u518_div {
-=======
 #u519_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u518 {
-=======
 #u519 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u518_text {
-=======
 #u519_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/延长报名_1/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u729_img {
-=======
 #u730_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u729 {
-=======
 #u730 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u729_text {
-=======
 #u730_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u730 {
-=======
 #u731 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u731_img {
-=======
 #u732_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u731 {
-=======
 #u732 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u731_text {
-=======
 #u732_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u732_div {
-=======
 #u733_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u732 {
-=======
 #u733 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u732_text {
-=======
 #u733_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u733_div {
-=======
 #u734_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u733 {
-=======
 #u734 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u733_text {
-=======
 #u734_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u734_img {
-=======
 #u735_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u734 {
-=======
 #u735 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:281px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u734_text {
-=======
 #u735_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u735_div {
-=======
 #u736_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u735 {
-=======
 #u736 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u735_text {
-=======
 #u736_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u736_div {
-=======
 #u737_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u736 {
-=======
 #u737 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u736_text {
-=======
 #u737_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u737 {
-=======
 #u738 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u738_img {
-=======
 #u739_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u738 {
-=======
 #u739 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u738_text {
-=======
 #u739_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u739_div {
-=======
 #u740_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -412,11 +304,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u739 {
-=======
 #u740 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -428,11 +316,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u739_text {
-=======
 #u740_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:146px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u740_div {
-=======
 #u741_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -460,11 +340,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u740 {
-=======
 #u741 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -473,11 +349,7 @@
   height:25px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u740_text {
-=======
 #u741_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u741 {
-=======
 #u742 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u741_state0 {
-=======
 #u742_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u741_state0_content {
-=======
 #u742_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u742_div {
-=======
 #u743_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u742 {
-=======
 #u743 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u742_text {
-=======
 #u743_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/延长报名_2/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1058 {
-=======
 #u1059 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1059_img {
-=======
 #u1060_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1059 {
-=======
 #u1060 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1059_text {
-=======
 #u1060_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1060_div {
-=======
 #u1061_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1060 {
-=======
 #u1061 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1060_text {
-=======
 #u1061_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1061_div {
-=======
 #u1062_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1061 {
-=======
 #u1062 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1061_text {
-=======
 #u1062_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1062_div {
-=======
 #u1063_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1062 {
-=======
 #u1063 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1062_text {
-=======
 #u1063_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1063_div {
-=======
 #u1064_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1063 {
-=======
 #u1064 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1063_text {
-=======
 #u1064_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1064_img {
-=======
 #u1065_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1064 {
-=======
 #u1065 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -283,11 +211,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1064_text {
-=======
 #u1065_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1065_img {
-=======
 #u1066_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1065 {
-=======
 #u1066 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:250px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1065_text {
-=======
 #u1066_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1066 {
-=======
 #u1067 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1067_img {
-=======
 #u1068_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1067 {
-=======
 #u1068 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1188px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1067_text {
-=======
 #u1068_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1068_div {
-=======
 #u1069_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -412,11 +304,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1068 {
-=======
 #u1069 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -428,11 +316,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1068_text {
-=======
 #u1069_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:146px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1069_div {
-=======
 #u1070_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -460,11 +340,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1069 {
-=======
 #u1070 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -473,11 +349,7 @@
   height:25px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1069_text {
-=======
 #u1070_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1070 {
-=======
 #u1071 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1070_state0 {
-=======
 #u1071_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1070_state0_content {
-=======
 #u1071_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1071_div {
-=======
 #u1072_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1071 {
-=======
 #u1072 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1071_text {
-=======
 #u1072_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/延长缴费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u743_img {
-=======
 #u744_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u743 {
-=======
 #u744 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u743_text {
-=======
 #u744_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u744 {
-=======
 #u745 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u745_img {
-=======
 #u746_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u745 {
-=======
 #u746 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u745_text {
-=======
 #u746_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u746_div {
-=======
 #u747_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u746 {
-=======
 #u747 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u746_text {
-=======
 #u747_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u747_div {
-=======
 #u748_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u747 {
-=======
 #u748 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u747_text {
-=======
 #u748_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u748_div {
-=======
 #u749_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -221,11 +165,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u748 {
-=======
 #u749 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -237,11 +177,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u748_text {
-=======
 #u749_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u749_div {
-=======
 #u750_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,11 +202,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u749 {
-=======
 #u750 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -284,11 +212,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u749_text {
-=======
 #u750_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u750_img {
-=======
 #u751_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u750 {
-=======
 #u751 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:220px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u750_text {
-=======
 #u751_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u751 {
-=======
 #u752 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u752_img {
-=======
 #u753_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u752 {
-=======
 #u753 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u752_text {
-=======
 #u753_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u753_div {
-=======
 #u754_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -412,11 +304,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u753 {
-=======
 #u754 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -428,11 +316,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u753_text {
-=======
 #u754_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u754_div {
-=======
 #u755_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -461,11 +341,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u754 {
-=======
 #u755 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u754_text {
-=======
 #u755_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,20 +359,12 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u755 {
-=======
 #u756 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u755_state0 {
-=======
 #u756_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -508,11 +372,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u755_state0_content {
-=======
 #u756_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -520,11 +380,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u756_div {
-=======
 #u757_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -543,11 +399,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u756 {
-=======
 #u757 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -559,11 +411,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u756_text {
-=======
 #u757_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/延长缴费_1/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1072_img {
-=======
 #u1073_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1072 {
-=======
 #u1073 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1072_text {
-=======
 #u1073_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1073 {
-=======
 #u1074 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1074_img {
-=======
 #u1075_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -73,11 +53,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1074 {
-=======
 #u1075 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1188px;
@@ -89,11 +65,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1074_text {
-=======
 #u1075_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -101,11 +73,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1075_div {
-=======
 #u1076_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -124,11 +92,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1075 {
-=======
 #u1076 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -140,11 +104,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1075_text {
-=======
 #u1076_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -152,11 +112,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1076_div {
-=======
 #u1077_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -173,11 +129,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1076 {
-=======
 #u1077 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -187,11 +139,7 @@
   color:#000000;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1076_text {
-=======
 #u1077_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -199,11 +147,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1077 {
-=======
 #u1078 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -211,11 +155,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1078_img {
-=======
 #u1079_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -223,11 +163,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1078 {
-=======
 #u1079 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -235,11 +171,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1078_text {
-=======
 #u1079_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -248,11 +180,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1079_div {
-=======
 #u1080_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,11 +198,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1079 {
-=======
 #u1080 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -285,11 +209,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1079_text {
-=======
 #u1080_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -297,11 +217,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1080_div {
-=======
 #u1081_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -320,11 +236,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1080 {
-=======
 #u1081 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -336,11 +248,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1080_text {
-=======
 #u1081_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -348,11 +256,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1081_div {
-=======
 #u1082_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -371,11 +275,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1081 {
-=======
 #u1082 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -387,11 +287,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1081_text {
-=======
 #u1082_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -399,11 +295,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1082_div {
-=======
 #u1083_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -420,11 +312,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1082 {
-=======
 #u1083 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -434,11 +322,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1082_text {
-=======
 #u1083_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -446,11 +330,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1083_img {
-=======
 #u1084_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -458,11 +338,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1083 {
-=======
 #u1084 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:169px;
@@ -475,11 +351,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1083_text {
-=======
 #u1084_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -487,20 +359,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1084 {
-=======
 #u1085 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1084_state0 {
-=======
 #u1085_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -508,11 +372,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1084_state0_content {
-=======
 #u1085_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -520,11 +380,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1085_div {
-=======
 #u1086_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -543,11 +399,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1085 {
-=======
 #u1086 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -559,11 +411,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1085_text {
-=======
 #u1086_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/开启缴费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u519_img {
-=======
 #u520_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u519 {
-=======
 #u520 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u519_text {
-=======
 #u520_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u520 {
-=======
 #u521 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u521_img {
-=======
 #u522_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u521 {
-=======
 #u522 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u521_text {
-=======
 #u522_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u522_div {
-=======
 #u523_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u522 {
-=======
 #u523 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u522_text {
-=======
 #u523_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u523_div {
-=======
 #u524_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u523 {
-=======
 #u524 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u523_text {
-=======
 #u524_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u524_img {
-=======
 #u525_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u524 {
-=======
 #u525 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:457px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u524_text {
-=======
 #u525_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u525_div {
-=======
 #u526_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u525 {
-=======
 #u526 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u525_text {
-=======
 #u526_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u526_div {
-=======
 #u527_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u526 {
-=======
 #u527 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u526_text {
-=======
 #u527_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u527 {
-=======
 #u528 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u528_img {
-=======
 #u529_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u528 {
-=======
 #u529 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u528_text {
-=======
 #u529_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u529_div {
-=======
 #u530_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -412,11 +304,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u529 {
-=======
 #u530 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -428,11 +316,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u529_text {
-=======
 #u530_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:107px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u530_div {
-=======
 #u531_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -460,11 +340,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u530 {
-=======
 #u531 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -473,11 +349,7 @@
   height:66px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u530_text {
-=======
 #u531_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u531 {
-=======
 #u532 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u531_state0 {
-=======
 #u532_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u531_state0_content {
-=======
 #u532_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u532_div {
-=======
 #u533_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u532 {
-=======
 #u533 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u532_text {
-=======
 #u533_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/开始缴费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u580_img {
-=======
 #u581_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u580 {
-=======
 #u581 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u580_text {
-=======
 #u581_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u581 {
-=======
 #u582 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u582_img {
-=======
 #u583_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u582 {
-=======
 #u583 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u582_text {
-=======
 #u583_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u583_div {
-=======
 #u584_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u583 {
-=======
 #u584 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u583_text {
-=======
 #u584_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u584_div {
-=======
 #u585_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u584 {
-=======
 #u585 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u584_text {
-=======
 #u585_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u585_div {
-=======
 #u586_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -221,11 +165,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u585 {
-=======
 #u586 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -237,11 +177,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u585_text {
-=======
 #u586_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u586_div {
-=======
 #u587_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,11 +202,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u586 {
-=======
 #u587 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -284,11 +212,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u586_text {
-=======
 #u587_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u587_img {
-=======
 #u588_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u587 {
-=======
 #u588 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:149px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u587_text {
-=======
 #u588_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u588 {
-=======
 #u589 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u589_img {
-=======
 #u590_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u589 {
-=======
 #u590 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u589_text {
-=======
 #u590_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u590_div {
-=======
 #u591_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u590 {
-=======
 #u591 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u590_text {
-=======
 #u591_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:146px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u591_div {
-=======
 #u592_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u591 {
-=======
 #u592 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u591_text {
-=======
 #u592_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u592_div {
-=======
 #u593_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -511,11 +379,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u592 {
-=======
 #u593 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1225px;
@@ -525,11 +389,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u592_text {
-=======
 #u593_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -537,11 +397,7 @@
   width:197px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u593 {
-=======
 #u594 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -551,20 +407,12 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u594 {
-=======
 #u595 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u594_state0 {
-=======
 #u595_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -572,11 +420,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u594_state0_content {
-=======
 #u595_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -584,11 +428,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u595_div {
-=======
 #u596_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -607,11 +447,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u595 {
-=======
 #u596 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -623,11 +459,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u595_text {
-=======
 #u596_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/报名中-新增学员/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u2051 {
-=======
 #u2052 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2052_img {
-=======
 #u2053_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2052 {
-=======
 #u2053 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2052_text {
-=======
 #u2053_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2053_div {
-=======
 #u2054_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2053 {
-=======
 #u2054 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2053_text {
-=======
 #u2054_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:177px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2054_div {
-=======
 #u2055_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2054 {
-=======
 #u2055 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2054_text {
-=======
 #u2055_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2055_div {
-=======
 #u2056_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2055 {
-=======
 #u2056 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2055_text {
-=======
 #u2056_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:252px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2056_img {
-=======
 #u2057_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -224,11 +168,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2056 {
-=======
 #u2057 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -236,11 +176,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2056_text {
-=======
 #u2057_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2057_img {
-=======
 #u2058_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -261,11 +193,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u2057 {
-=======
 #u2058 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:162px;
@@ -278,11 +206,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u2057_text {
-=======
 #u2058_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -290,11 +214,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2058 {
-=======
 #u2059 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -302,11 +222,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2059_img {
-=======
 #u2060_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -314,11 +230,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u2059 {
-=======
 #u2060 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1181px;
@@ -330,11 +242,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u2059_text {
-=======
 #u2060_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -342,11 +250,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2060_div {
-=======
 #u2061_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -366,11 +270,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u2060 {
-=======
 #u2061 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1221px;
@@ -383,11 +283,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u2060_text {
-=======
 #u2061_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -395,11 +291,7 @@
   width:143px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2061_div {
-=======
 #u2062_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,11 +307,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2061 {
-=======
 #u2062 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1221px;
@@ -428,11 +316,7 @@
   height:88px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2061_text {
-=======
 #u2062_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2062 {
-=======
 #u2063 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -454,11 +334,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u2063_img {
-=======
 #u2064_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -466,11 +342,7 @@
   width:245px;
   height:88px;
 }
-<<<<<<< HEAD
-#u2063 {
-=======
 #u2064 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -479,11 +351,7 @@
   height:88px;
   text-align:left;
 }
-<<<<<<< HEAD
-#u2063_text {
-=======
 #u2064_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -491,11 +359,7 @@
   width:241px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2064_div {
-=======
 #u2065_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -512,11 +376,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2064 {
-=======
 #u2065 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -526,11 +386,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2064_text {
-=======
 #u2065_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -538,20 +394,12 @@
   width:938px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2065 {
-=======
 #u2066 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u2065_state0 {
-=======
 #u2066_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -559,11 +407,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u2065_state0_content {
-=======
 #u2066_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -571,11 +415,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u2066_div {
-=======
 #u2067_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -594,11 +434,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2066 {
-=======
 #u2067 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -610,11 +446,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2066_text {
-=======
 #u2067_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/报名中-确认成课/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u2085 {
-=======
 #u2086 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2086_img {
-=======
 #u2087_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2086 {
-=======
 #u2087 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2086_text {
-=======
 #u2087_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2087_div {
-=======
 #u2088_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2087 {
-=======
 #u2088 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2087_text {
-=======
 #u2088_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:177px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2088_div {
-=======
 #u2089_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2088 {
-=======
 #u2089 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2088_text {
-=======
 #u2089_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2089_div {
-=======
 #u2090_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2089 {
-=======
 #u2090 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2089_text {
-=======
 #u2090_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:252px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2090_img {
-=======
 #u2091_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -224,11 +168,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2090 {
-=======
 #u2091 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -236,11 +176,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2090_text {
-=======
 #u2091_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2091_img {
-=======
 #u2092_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -261,11 +193,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u2091 {
-=======
 #u2092 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1117px;
@@ -278,11 +206,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u2091_text {
-=======
 #u2092_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -290,11 +214,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2092 {
-=======
 #u2093 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -302,11 +222,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2093_img {
-=======
 #u2094_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -314,11 +230,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u2093 {
-=======
 #u2094 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -330,11 +242,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u2093_text {
-=======
 #u2094_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -342,11 +250,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2094_div {
-=======
 #u2095_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -365,11 +269,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2094 {
-=======
 #u2095 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -381,11 +281,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2094_text {
-=======
 #u2095_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -393,11 +289,7 @@
   width:143px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2095_div {
-=======
 #u2096_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2095 {
-=======
 #u2096 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -426,11 +314,7 @@
   height:66px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2095_text {
-=======
 #u2096_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -438,11 +322,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2096_div {
-=======
 #u2097_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -459,11 +339,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2096 {
-=======
 #u2097 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -473,11 +349,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2096_text {
-=======
 #u2097_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:938px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2097 {
-=======
 #u2098 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u2097_state0 {
-=======
 #u2098_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u2097_state0_content {
-=======
 #u2098_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u2098_div {
-=======
 #u2099_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2098 {
-=======
 #u2099 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2098_text {
-=======
 #u2099_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/报名中-退学/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u2067 {
-=======
 #u2068 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2068_img {
-=======
 #u2069_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2068 {
-=======
 #u2069 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2068_text {
-=======
 #u2069_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2069_div {
-=======
 #u2070_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2069 {
-=======
 #u2070 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2069_text {
-=======
 #u2070_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:129px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2070_div {
-=======
 #u2071_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2070 {
-=======
 #u2071 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2070_text {
-=======
 #u2071_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2071_div {
-=======
 #u2072_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2071 {
-=======
 #u2072 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2071_text {
-=======
 #u2072_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:216px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2072_img {
-=======
 #u2073_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -224,11 +168,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2072 {
-=======
 #u2073 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -236,11 +176,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2072_text {
-=======
 #u2073_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,11 +185,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2073_img {
-=======
 #u2074_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -261,11 +193,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u2073 {
-=======
 #u2074 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1030px;
@@ -278,11 +206,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u2073_text {
-=======
 #u2074_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -290,11 +214,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2074 {
-=======
 #u2075 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -302,11 +222,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2075_img {
-=======
 #u2076_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -314,11 +230,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u2075 {
-=======
 #u2076 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -330,11 +242,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u2075_text {
-=======
 #u2076_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -342,11 +250,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2076_div {
-=======
 #u2077_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -366,11 +270,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u2076 {
-=======
 #u2077 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -383,11 +283,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u2076_text {
-=======
 #u2077_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -395,11 +291,7 @@
   width:119px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2077_div {
-=======
 #u2078_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,11 +307,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2077 {
-=======
 #u2078 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -428,11 +316,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2077_text {
-=======
 #u2078_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -440,11 +324,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2078 {
-=======
 #u2079 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -454,11 +334,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u2079_img {
-=======
 #u2080_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -466,11 +342,7 @@
   width:245px;
   height:88px;
 }
-<<<<<<< HEAD
-#u2079 {
-=======
 #u2080 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -479,11 +351,7 @@
   height:88px;
   text-align:left;
 }
-<<<<<<< HEAD
-#u2079_text {
-=======
 #u2080_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -491,11 +359,7 @@
   width:241px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2080_div {
-=======
 #u2081_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -512,11 +376,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2080 {
-=======
 #u2081 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -526,11 +386,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2080_text {
-=======
 #u2081_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -538,20 +394,12 @@
   width:938px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2081 {
-=======
 #u2082 {
->>>>>>> 0601optimize
   position:fixed;
   left:315px;
   top:245px;
 }
-<<<<<<< HEAD
-#u2081_state0 {
-=======
 #u2082_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -559,11 +407,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u2081_state0_content {
-=======
 #u2082_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -571,11 +415,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u2082_div {
-=======
 #u2083_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -594,11 +434,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2082 {
-=======
 #u2083 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -610,11 +446,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2082_text {
-=======
 #u2083_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -622,20 +454,12 @@
   width:136px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2083 {
-=======
 #u2084 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u2083_state0 {
-=======
 #u2084_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -643,11 +467,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u2083_state0_content {
-=======
 #u2084_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -655,11 +475,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u2084_div {
-=======
 #u2085_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -678,11 +494,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2084 {
-=======
 #u2085 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -694,11 +506,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2084_text {
-=======
 #u2085_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/拆分班级/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1512_div {
-=======
 #u1513_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -33,11 +29,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1512 {
-=======
 #u1513 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -47,11 +39,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1512_text {
-=======
 #u1513_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -59,11 +47,7 @@
   width:741px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1513 {
-=======
 #u1514 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -71,11 +55,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1514_img {
-=======
 #u1515_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1514 {
-=======
 #u1515 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -95,11 +71,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1514_text {
-=======
 #u1515_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -108,11 +80,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1515_div {
-=======
 #u1516_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -130,11 +98,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1515 {
-=======
 #u1516 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -145,11 +109,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1515_text {
-=======
 #u1516_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -157,11 +117,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1516_div {
-=======
 #u1517_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -180,11 +136,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1516 {
-=======
 #u1517 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -196,11 +148,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1516_text {
-=======
 #u1517_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -208,11 +156,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1517_div {
-=======
 #u1518_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,11 +175,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1517 {
-=======
 #u1518 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -247,11 +187,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1517_text {
-=======
 #u1518_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:202px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1518 {
-=======
 #u1519 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1519_img {
-=======
 #u1520_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1519 {
-=======
 #u1520 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1519_text {
-=======
 #u1520_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1520_div {
-=======
 #u1521_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -334,11 +250,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1520 {
-=======
 #u1521 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -350,11 +262,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1520_text {
-=======
 #u1521_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -362,11 +270,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1521_div {
-=======
 #u1522_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -382,11 +286,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1521 {
-=======
 #u1522 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -395,11 +295,7 @@
   height:66px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1521_text {
-=======
 #u1522_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -407,11 +303,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1522_img {
-=======
 #u1523_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -419,11 +311,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1522 {
-=======
 #u1523 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -431,11 +319,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1522_text {
-=======
 #u1523_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -444,11 +328,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1523_img {
-=======
 #u1524_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -456,11 +336,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1523 {
-=======
 #u1524 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:226px;
@@ -473,11 +349,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1523_text {
-=======
 #u1524_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -485,20 +357,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1524 {
-=======
 #u1525 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1524_state0 {
-=======
 #u1525_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1524_state0_content {
-=======
 #u1525_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1525_div {
-=======
 #u1526_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1525 {
-=======
 #u1526 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1525_text {
-=======
 #u1526_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/排课/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1495_img {
-=======
 #u1496_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1495 {
-=======
 #u1496 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1495_text {
-=======
 #u1496_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1496_img {
-=======
 #u1497_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1496 {
-=======
 #u1497 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -73,11 +53,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1496_text {
-=======
 #u1497_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -86,11 +62,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1497 {
-=======
 #u1498 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1498_img {
-=======
 #u1499_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +78,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1498 {
-=======
 #u1499 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -122,11 +86,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1498_text {
-=======
 #u1499_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -135,11 +95,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1499_div {
-=======
 #u1500_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -157,11 +113,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1499 {
-=======
 #u1500 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -172,11 +124,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1499_text {
-=======
 #u1500_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +132,7 @@
   width:49px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1500_div {
-=======
 #u1501_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -207,11 +151,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1500 {
-=======
 #u1501 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -223,11 +163,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1500_text {
-=======
 #u1501_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -235,11 +171,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1501_div {
-=======
 #u1502_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -258,11 +190,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1501 {
-=======
 #u1502 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -274,11 +202,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1501_text {
-=======
 #u1502_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -286,11 +210,7 @@
   width:156px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1502_div {
-=======
 #u1503_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,11 +227,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1502 {
-=======
 #u1503 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -321,11 +237,7 @@
   font-size:16px;
   line-height:28px;
 }
-<<<<<<< HEAD
-#u1502_text {
-=======
 #u1503_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -333,11 +245,7 @@
   width:1104px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1503_img {
-=======
 #u1504_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -345,11 +253,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1503 {
-=======
 #u1504 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1095px;
@@ -362,11 +266,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1503_text {
-=======
 #u1504_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -374,11 +274,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1504 {
-=======
 #u1505 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -386,11 +282,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1505_img {
-=======
 #u1506_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -398,11 +290,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1505 {
-=======
 #u1506 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1195px;
@@ -414,11 +302,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1505_text {
-=======
 #u1506_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -426,11 +310,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1506_div {
-=======
 #u1507_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -450,11 +330,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1506 {
-=======
 #u1507 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -467,11 +343,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1506_text {
-=======
 #u1507_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -479,11 +351,7 @@
   width:77px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1507_div {
-=======
 #u1508_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -499,11 +367,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1507 {
-=======
 #u1508 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -512,11 +376,7 @@
   height:220px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1507_text {
-=======
 #u1508_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -524,11 +384,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1508 {
-=======
 #u1509 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1240px;
@@ -538,11 +394,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1509_div {
-=======
 #u1510_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -563,11 +415,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1509 {
-=======
 #u1510 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -578,11 +426,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1509_text {
-=======
 #u1510_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -590,20 +434,12 @@
   width:266px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1510 {
-=======
 #u1511 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1510_state0 {
-=======
 #u1511_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -611,9 +447,6 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1510_state0_content {
-=======
 #u1511_state0_content {
   border-width:0px;
   position:absolute;
@@ -623,22 +456,10 @@
   height:1px;
 }
 #u1512_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
   top:0px;
-<<<<<<< HEAD
-  width:1px;
-  height:1px;
-}
-#u1511_div {
-  border-width:0px;
-  position:absolute;
-  left:0px;
-  top:0px;
-=======
->>>>>>> 0601optimize
   width:140px;
   height:40px;
   background:inherit;
@@ -653,11 +474,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1511 {
-=======
 #u1512 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -669,11 +486,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1511_text {
-=======
 #u1512_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新增回访/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u563_img {
-=======
 #u564_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u563 {
-=======
 #u564 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u563_text {
-=======
 #u564_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u564 {
-=======
 #u565 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u565_img {
-=======
 #u566_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u565 {
-=======
 #u566 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u565_text {
-=======
 #u566_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u566_div {
-=======
 #u567_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u566 {
-=======
 #u567 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u566_text {
-=======
 #u567_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u567_div {
-=======
 #u568_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u567 {
-=======
 #u568 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u567_text {
-=======
 #u568_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u568_img {
-=======
 #u569_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u568 {
-=======
 #u569 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1104px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u568_text {
-=======
 #u569_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u569_div {
-=======
 #u570_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u569 {
-=======
 #u570 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u569_text {
-=======
 #u570_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u570_div {
-=======
 #u571_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u570 {
-=======
 #u571 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u570_text {
-=======
 #u571_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u571 {
-=======
 #u572 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u572_img {
-=======
 #u573_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u572 {
-=======
 #u573 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u572_text {
-=======
 #u573_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u573_div {
-=======
 #u574_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u573 {
-=======
 #u574 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u573_text {
-=======
 #u574_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:180px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u574_div {
-=======
 #u575_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u574 {
-=======
 #u575 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:24px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u574_text {
-=======
 #u575_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u575 {
-=======
 #u576 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -501,11 +369,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u576_div {
-=======
 #u577_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -525,11 +389,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u576 {
-=======
 #u577 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -539,11 +399,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u576_text {
-=======
 #u577_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -551,11 +407,7 @@
   width:242px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u577_img {
-=======
 #u578_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -563,11 +415,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u577 {
-=======
 #u578 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -575,11 +423,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u577_text {
-=======
 #u578_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -588,20 +432,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u578 {
-=======
 #u579 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u578_state0 {
-=======
 #u579_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -609,11 +445,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u578_state0_content {
-=======
 #u579_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -621,11 +453,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u579_div {
-=======
 #u580_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -644,11 +472,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u579 {
-=======
 #u580 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -660,11 +484,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u579_text {
-=======
 #u580_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新增回访_1/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u820_img {
-=======
 #u821_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u820 {
-=======
 #u821 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u820_text {
-=======
 #u821_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u821 {
-=======
 #u822 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u822_img {
-=======
 #u823_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -73,11 +53,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u822 {
-=======
 #u823 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -85,11 +61,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u822_text {
-=======
 #u823_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,11 +70,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u823_div {
-=======
 #u824_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -120,11 +88,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u823 {
-=======
 #u824 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -135,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u823_text {
-=======
 #u824_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,11 +107,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u824_div {
-=======
 #u825_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -170,11 +126,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u824 {
-=======
 #u825 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -186,11 +138,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u824_text {
-=======
 #u825_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,11 +146,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u825_img {
-=======
 #u826_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -210,11 +154,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u825 {
-=======
 #u826 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1104px;
@@ -227,11 +167,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u825_text {
-=======
 #u826_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -239,11 +175,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u826_div {
-=======
 #u827_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +194,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u826 {
-=======
 #u827 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -278,11 +206,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u826_text {
-=======
 #u827_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,11 +214,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u827_div {
-=======
 #u828_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,11 +231,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u827 {
-=======
 #u828 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -325,11 +241,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u827_text {
-=======
 #u828_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +249,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u828 {
-=======
 #u829 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u829_img {
-=======
 #u830_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u829 {
-=======
 #u830 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u829_text {
-=======
 #u830_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u830_div {
-=======
 #u831_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u830 {
-=======
 #u831 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u830_text {
-=======
 #u831_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:180px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u831_div {
-=======
 #u832_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u831 {
-=======
 #u832 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:24px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u831_text {
-=======
 #u832_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u832 {
-=======
 #u833 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -501,11 +369,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u833_div {
-=======
 #u834_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -525,11 +389,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u833 {
-=======
 #u834 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -539,11 +399,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u833_text {
-=======
 #u834_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -551,11 +407,7 @@
   width:242px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u834_img {
-=======
 #u835_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -563,11 +415,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u834 {
-=======
 #u835 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -575,11 +423,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u834_text {
-=======
 #u835_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -588,20 +432,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u835 {
-=======
 #u836 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u835_state0 {
-=======
 #u836_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -609,11 +445,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u835_state0_content {
-=======
 #u836_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -621,11 +453,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u836_div {
-=======
 #u837_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -644,11 +472,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u836 {
-=======
 #u837 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -660,11 +484,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u836_text {
-=======
 #u837_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新增回访_2/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1132 {
-=======
 #u1133 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1133_img {
-=======
 #u1134_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1133 {
-=======
 #u1134 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1133_text {
-=======
 #u1134_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1134_div {
-=======
 #u1135_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1134 {
-=======
 #u1135 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u1134_text {
-=======
 #u1135_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1135_div {
-=======
 #u1136_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1135 {
-=======
 #u1136 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1135_text {
-=======
 #u1136_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1136_div {
-=======
 #u1137_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1136 {
-=======
 #u1137 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1136_text {
-=======
 #u1137_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1137_div {
-=======
 #u1138_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1137 {
-=======
 #u1138 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1137_text {
-=======
 #u1138_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:884px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1138_img {
-=======
 #u1139_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1138 {
-=======
 #u1139 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -283,11 +211,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1138_text {
-=======
 #u1139_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,11 +220,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1139_img {
-=======
 #u1140_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -308,11 +228,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1139 {
-=======
 #u1140 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1103px;
@@ -325,11 +241,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1139_text {
-=======
 #u1140_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -337,11 +249,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1140 {
-=======
 #u1141 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -349,11 +257,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1141_img {
-=======
 #u1142_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -361,11 +265,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1141 {
-=======
 #u1142 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -377,11 +277,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1141_text {
-=======
 #u1142_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -389,11 +285,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1142_div {
-=======
 #u1143_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,11 +305,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1142 {
-=======
 #u1143 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -430,11 +318,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1142_text {
-=======
 #u1143_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,11 +326,7 @@
   width:180px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1143_div {
-=======
 #u1144_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -462,11 +342,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1143 {
-=======
 #u1144 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -475,11 +351,7 @@
   height:34px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1143_text {
-=======
 #u1144_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,11 +359,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1144 {
-=======
 #u1145 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -501,11 +369,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1145_div {
-=======
 #u1146_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -525,11 +389,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1145 {
-=======
 #u1146 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -539,11 +399,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1145_text {
-=======
 #u1146_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -551,20 +407,12 @@
   width:228px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1146 {
-=======
 #u1147 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1146_state0 {
-=======
 #u1147_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -572,11 +420,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1146_state0_content {
-=======
 #u1147_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -584,11 +428,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1147_div {
-=======
 #u1148_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -607,11 +447,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1147 {
-=======
 #u1148 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -623,11 +459,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1147_text {
-=======
 #u1148_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新建乐团/styles.css

@@ -507,13 +507,8 @@
   position:absolute;
   left:0px;
   top:0px;
-<<<<<<< HEAD
-  width:328px;
-  height:115px;
-=======
   width:302px;
   height:143px;
->>>>>>> 0601optimize
   background:inherit;
   background-color:rgba(255, 255, 0, 1);
   box-sizing:border-box;
@@ -531,17 +526,10 @@
 #u17 {
   border-width:0px;
   position:absolute;
-<<<<<<< HEAD
-  left:1175px;
-  top:472px;
-  width:328px;
-  height:115px;
-=======
   left:1226px;
   top:292px;
   width:302px;
   height:143px;
->>>>>>> 0601optimize
   color:#000000;
   text-align:left;
   line-height:18px;
@@ -3055,13 +3043,8 @@
 #u110 {
   border-width:0px;
   position:absolute;
-<<<<<<< HEAD
-  left:1259px;
-  top:432px;
-=======
   left:1252px;
   top:556px;
->>>>>>> 0601optimize
   width:264px;
   height:88px;
   text-align:left;
@@ -3078,19 +3061,13 @@
 #u111 {
   border-width:0px;
   position:absolute;
-<<<<<<< HEAD
-  left:1292px;
-=======
   left:1484px;
->>>>>>> 0601optimize
   top:530px;
   width:56px;
   height:21px;
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-=======
 #u112 {
   border-width:0px;
   position:absolute;
@@ -3101,4 +3078,3 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
->>>>>>> 0601optimize

dist/html/files/新建学员缴费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u305_div {
-=======
 #u306_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -33,11 +29,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u305 {
-=======
 #u306 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -47,11 +39,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u305_text {
-=======
 #u306_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -60,11 +48,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u306 {
-=======
 #u307 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -72,11 +56,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u307_img {
-=======
 #u308_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -84,11 +64,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u307 {
-=======
 #u308 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -96,11 +72,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u307_text {
-=======
 #u308_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -109,11 +81,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u308_div {
-=======
 #u309_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -131,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u308 {
-=======
 #u309 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -146,11 +110,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u308_text {
-=======
 #u309_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -158,11 +118,7 @@
   width:145px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u309_div {
-=======
 #u310_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -181,11 +137,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u309 {
-=======
 #u310 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -197,11 +149,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u309_text {
-=======
 #u310_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -209,11 +157,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u310_div {
-=======
 #u311_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -230,11 +174,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u310 {
-=======
 #u311 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:48px;
@@ -244,11 +184,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u310_text {
-=======
 #u311_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -256,11 +192,7 @@
   width:1128px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u311_div {
-=======
 #u312_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -279,11 +211,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u311 {
-=======
 #u312 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -295,11 +223,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u311_text {
-=======
 #u312_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,11 +231,7 @@
   width:233px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u312 {
-=======
 #u313 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -319,11 +239,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u313_img {
-=======
 #u314_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -331,11 +247,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u313 {
-=======
 #u314 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -348,11 +260,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u313_text {
-=======
 #u314_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -360,11 +268,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u314_div {
-=======
 #u315_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -383,11 +287,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u314 {
-=======
 #u315 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -399,11 +299,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u314_text {
-=======
 #u315_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -411,11 +307,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u315_div {
-=======
 #u316_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -431,11 +323,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u315 {
-=======
 #u316 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -444,11 +332,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u315_text {
-=======
 #u316_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -456,11 +340,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u316_img {
-=======
 #u317_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -468,11 +348,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u316 {
-=======
 #u317 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -480,11 +356,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u316_text {
-=======
 #u317_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -493,11 +365,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u317_img {
-=======
 #u318_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -505,11 +373,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u317 {
-=======
 #u318 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -517,11 +381,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u317_text {
-=======
 #u318_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -530,11 +390,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u318_img {
-=======
 #u319_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -542,11 +398,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u318 {
-=======
 #u319 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:371px;
@@ -559,11 +411,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u318_text {
-=======
 #u319_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -571,11 +419,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u319_img {
-=======
 #u320_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -583,11 +427,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u319 {
-=======
 #u320 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:163px;
@@ -600,11 +440,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u319_text {
-=======
 #u320_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -612,20 +448,12 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u320 {
-=======
 #u321 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u320_state0 {
-=======
 #u321_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -633,11 +461,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u320_state0_content {
-=======
 #u321_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -645,11 +469,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u321_div {
-=======
 #u322_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -667,11 +487,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u321 {
-=======
 #u322 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -682,11 +498,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u321_text {
-=======
 #u322_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -694,11 +506,7 @@
   width:136px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u322 {
-=======
 #u323 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1562px;
@@ -708,11 +516,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u323 {
-=======
 #u324 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -720,11 +524,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u324_img {
-=======
 #u325_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -732,11 +532,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u324 {
-=======
 #u325 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -748,11 +544,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u324_text {
-=======
 #u325_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -760,11 +552,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u325_div {
-=======
 #u326_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -783,11 +571,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u325 {
-=======
 #u326 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -799,11 +583,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u325_text {
-=======
 #u326_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -811,11 +591,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u326_div {
-=======
 #u327_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -831,11 +607,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u326 {
-=======
 #u327 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -844,11 +616,7 @@
   height:110px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u326_text {
-=======
 #u327_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -856,11 +624,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u327 {
-=======
 #u328 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1431px;
@@ -870,11 +634,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u328_div {
-=======
 #u329_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -894,11 +654,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u328 {
-=======
 #u329 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1273px;
@@ -908,11 +664,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u328_text {
-=======
 #u329_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -920,11 +672,7 @@
   width:275px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u329 {
-=======
 #u330 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -934,11 +682,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u330 {
-=======
 #u331 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1366px;
@@ -948,11 +692,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u331 {
-=======
 #u332 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1564px;
@@ -962,11 +702,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u332 {
-=======
 #u333 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -976,11 +712,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u333_div {
-=======
 #u334_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1000,11 +732,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u333 {
-=======
 #u334 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -1014,11 +742,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u333_text {
-=======
 #u334_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -1026,11 +750,7 @@
   width:219px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u334 {
-=======
 #u335 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1551px;
@@ -1040,11 +760,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u335_div {
-=======
 #u336_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1064,11 +780,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u335 {
-=======
 #u336 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1320px;
@@ -1078,11 +790,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u335_text {
-=======
 #u336_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -1090,11 +798,7 @@
   width:237px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u336_div {
-=======
 #u337_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1114,11 +818,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u336 {
-=======
 #u337 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -1128,11 +828,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u336_text {
-=======
 #u337_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新建学校缴费/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u337_div {
-=======
 #u338_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -33,11 +29,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u337 {
-=======
 #u338 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:42px;
@@ -47,11 +39,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u337_text {
-=======
 #u338_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -60,11 +48,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u338 {
-=======
 #u339 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -72,11 +56,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u339_img {
-=======
 #u340_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -84,11 +64,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u339 {
-=======
 #u340 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -96,11 +72,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u339_text {
-=======
 #u340_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -109,11 +81,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u340_div {
-=======
 #u341_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -131,11 +99,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u340 {
-=======
 #u341 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -146,11 +110,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u340_text {
-=======
 #u341_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -158,11 +118,7 @@
   width:145px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u341_div {
-=======
 #u342_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -181,11 +137,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u341 {
-=======
 #u342 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -197,11 +149,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u341_text {
-=======
 #u342_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -209,11 +157,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u342_div {
-=======
 #u343_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -230,11 +174,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u342 {
-=======
 #u343 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:42px;
@@ -244,11 +184,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u342_text {
-=======
 #u343_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -256,11 +192,7 @@
   width:1128px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u343_div {
-=======
 #u344_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -279,11 +211,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u343 {
-=======
 #u344 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -295,11 +223,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u343_text {
-=======
 #u344_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,11 +231,7 @@
   width:233px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u344_img {
-=======
 #u345_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -319,11 +239,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u344 {
-=======
 #u345 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -331,11 +247,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u344_text {
-=======
 #u345_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -344,11 +256,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u345_img {
-=======
 #u346_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -356,11 +264,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u345 {
-=======
 #u346 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:421px;
@@ -373,11 +277,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u345_text {
-=======
 #u346_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -385,11 +285,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u346_img {
-=======
 #u347_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -397,11 +293,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u346 {
-=======
 #u347 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:142px;
@@ -414,11 +306,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u346_text {
-=======
 #u347_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -426,11 +314,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u347 {
-=======
 #u348 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -438,11 +322,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u348_img {
-=======
 #u349_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -450,11 +330,7 @@
   width:40px;
   height:40px;
 }
-<<<<<<< HEAD
-#u348 {
-=======
 #u349 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1173px;
@@ -467,11 +343,7 @@
   font-size:18px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u348_text {
-=======
 #u349_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -479,11 +351,7 @@
   width:26px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u349_div {
-=======
 #u350_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -503,11 +371,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u349 {
-=======
 #u350 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -520,11 +384,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u349_text {
-=======
 #u350_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -532,11 +392,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u350_div {
-=======
 #u351_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -552,11 +408,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u350 {
-=======
 #u351 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -565,11 +417,7 @@
   height:66px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u350_text {
-=======
 #u351_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -577,11 +425,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u351_img {
-=======
 #u352_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -589,11 +433,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u351 {
-=======
 #u352 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -601,11 +441,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u351_text {
-=======
 #u352_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -614,11 +450,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u352 {
-=======
 #u353 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1219px;
@@ -628,11 +460,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u353_div {
-=======
 #u354_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -652,11 +480,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u353 {
-=======
 #u354 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1219px;
@@ -666,11 +490,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u353_text {
-=======
 #u354_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -678,20 +498,12 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u354 {
-=======
 #u355 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u354_state0 {
-=======
 #u355_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -699,11 +511,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u354_state0_content {
-=======
 #u355_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -711,11 +519,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u355_div {
-=======
 #u356_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -733,11 +537,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u355 {
-=======
 #u356 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -748,11 +548,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u355_text {
-=======
 #u356_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -760,11 +556,7 @@
   width:136px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u356 {
-=======
 #u357 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -772,11 +564,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u357_img {
-=======
 #u358_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -784,11 +572,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u357 {
-=======
 #u358 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1169px;
@@ -800,11 +584,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u357_text {
-=======
 #u358_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -812,11 +592,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u358_div {
-=======
 #u359_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -835,11 +611,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u358 {
-=======
 #u359 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1209px;
@@ -851,11 +623,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u358_text {
-=======
 #u359_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -863,11 +631,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u359_div {
-=======
 #u360_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -883,11 +647,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u359 {
-=======
 #u360 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1209px;
@@ -896,11 +656,7 @@
   height:88px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u359_text {
-=======
 #u360_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -908,11 +664,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u360 {
-=======
 #u361 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1261px;
@@ -922,11 +674,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u361_div {
-=======
 #u362_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -946,11 +694,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u361 {
-=======
 #u362 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1153px;
@@ -960,11 +704,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u361_text {
-=======
 #u362_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -972,11 +712,7 @@
   width:297px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u362 {
-=======
 #u363 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1391px;
@@ -986,11 +722,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u363_div {
-=======
 #u364_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1010,11 +742,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u363 {
-=======
 #u364 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1312px;
@@ -1024,11 +752,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u363_text {
-=======
 #u364_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -1036,11 +760,7 @@
   width:219px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u364 {
-=======
 #u365 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1207px;
@@ -1050,11 +770,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u365_div {
-=======
 #u366_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1074,11 +790,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u365 {
-=======
 #u366 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1207px;
@@ -1088,11 +800,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u365_text {
-=======
 #u366_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -1100,11 +808,7 @@
   width:258px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u366 {
-=======
 #u367 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1547px;
@@ -1114,11 +818,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u367 {
-=======
 #u368 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1385px;
@@ -1128,11 +828,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u368_div {
-=======
 #u369_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -1152,11 +848,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u368 {
-=======
 #u369 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1326px;
@@ -1166,11 +858,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u368_text {
-=======
 #u369_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/新建班级、老师调整、学员调整、删除班级/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u1148 {
-=======
 #u1149 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1149_img {
-=======
 #u1150_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1149 {
-=======
 #u1150 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u1149_text {
-=======
 #u1150_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1150_div {
-=======
 #u1151_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -84,11 +64,7 @@
   font-style:normal;
   color:#000000;
 }
-<<<<<<< HEAD
-#u1150 {
-=======
 #u1151 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -100,11 +76,7 @@
   font-style:normal;
   color:#000000;
 }
-<<<<<<< HEAD
-#u1150_text {
-=======
 #u1151_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -112,11 +84,7 @@
   width:457px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1151_div {
-=======
 #u1152_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -135,11 +103,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1151 {
-=======
 #u1152 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -151,11 +115,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1151_text {
-=======
 #u1152_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -163,11 +123,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1152_div {
-=======
 #u1153_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -186,11 +142,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1152 {
-=======
 #u1153 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -202,11 +154,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u1152_text {
-=======
 #u1153_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,11 +162,7 @@
   width:462px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u1153_div {
-=======
 #u1154_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -235,11 +179,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1153 {
-=======
 #u1154 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -249,11 +189,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u1153_text {
-=======
 #u1154_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -261,11 +197,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1154 {
-=======
 #u1155 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -273,11 +205,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u1155_img {
-=======
 #u1156_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -285,11 +213,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u1155 {
-=======
 #u1156 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -301,11 +225,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u1155_text {
-=======
 #u1156_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -313,11 +233,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1156_div {
-=======
 #u1157_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,11 +253,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1156 {
-=======
 #u1157 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -354,11 +266,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u1156_text {
-=======
 #u1157_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -366,11 +274,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1157_div {
-=======
 #u1158_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -386,11 +290,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1157 {
-=======
 #u1158 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -399,11 +299,7 @@
   height:44px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u1157_text {
-=======
 #u1158_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -411,11 +307,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1158_img {
-=======
 #u1159_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -423,11 +315,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1158 {
-=======
 #u1159 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -435,11 +323,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u1158_text {
-=======
 #u1159_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -448,11 +332,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1159_img {
-=======
 #u1160_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -460,11 +340,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u1159 {
-=======
 #u1160 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:640px;
@@ -477,11 +353,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u1159_text {
-=======
 #u1160_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -489,11 +361,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1160 {
-=======
 #u1161 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -503,11 +371,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u1161_div {
-=======
 #u1162_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -527,11 +391,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1161 {
-=======
 #u1162 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -541,11 +401,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u1161_text {
-=======
 #u1162_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -553,20 +409,12 @@
   width:222px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u1162 {
-=======
 #u1163 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u1162_state0 {
-=======
 #u1163_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -574,11 +422,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u1162_state0_content {
-=======
 #u1163_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -586,11 +430,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u1163_div {
-=======
 #u1164_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -609,11 +449,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1163 {
-=======
 #u1164 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -625,11 +461,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u1163_text {
-=======
 #u1164_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/更换老师/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u2799_img {
-=======
 #u2800_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2799 {
-=======
 #u2800 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -36,11 +28,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u2799_text {
-=======
 #u2800_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -49,11 +37,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2800_img {
-=======
 #u2801_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -61,11 +45,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u2800 {
-=======
 #u2801 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1039px;
@@ -78,11 +58,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u2800_text {
-=======
 #u2801_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -90,11 +66,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2801 {
-=======
 #u2802 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -102,11 +74,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2802_img {
-=======
 #u2803_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -114,11 +82,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u2802 {
-=======
 #u2803 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -130,11 +94,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u2802_text {
-=======
 #u2803_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -142,11 +102,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2803_div {
-=======
 #u2804_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -165,11 +121,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2803 {
-=======
 #u2804 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -181,11 +133,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2803_text {
-=======
 #u2804_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -193,11 +141,7 @@
   width:198px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2804_div {
-=======
 #u2805_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -213,11 +157,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2804 {
-=======
 #u2805 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -226,11 +166,7 @@
   height:22px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u2804_text {
-=======
 #u2805_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -238,11 +174,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2805 {
-=======
 #u2806 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -250,11 +182,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2806_img {
-=======
 #u2807_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -262,11 +190,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2806 {
-=======
 #u2807 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -274,11 +198,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2806_text {
-=======
 #u2807_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -287,11 +207,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2807_div {
-=======
 #u2808_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -309,11 +225,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2807 {
-=======
 #u2808 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -324,11 +236,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2807_text {
-=======
 #u2808_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -336,11 +244,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2808_div {
-=======
 #u2809_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,11 +263,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2808 {
-=======
 #u2809 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -375,11 +275,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2808_text {
-=======
 #u2809_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -387,11 +283,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2809_div {
-=======
 #u2810_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -408,11 +300,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2809 {
-=======
 #u2810 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -422,11 +310,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2809_text {
-=======
 #u2810_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -434,11 +318,7 @@
   width:865px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2810_div {
-=======
 #u2811_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -457,11 +337,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2810 {
-=======
 #u2811 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -473,11 +349,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2810_text {
-=======
 #u2811_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,20 +357,12 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2811 {
-=======
 #u2812 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u2811_state0 {
-=======
 #u2812_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -506,11 +370,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u2811_state0_content {
-=======
 #u2812_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -518,11 +378,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u2812_div {
-=======
 #u2813_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -541,11 +397,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2812 {
-=======
 #u2813 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -557,11 +409,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u2812_text {
-=======
 #u2813_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/更改声部/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u803 {
-=======
 #u804 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u804_img {
-=======
 #u805_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u804 {
-=======
 #u805 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u804_text {
-=======
 #u805_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u805_div {
-=======
 #u806_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u805 {
-=======
 #u806 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u805_text {
-=======
 #u806_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:97px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u806_div {
-=======
 #u807_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u806 {
-=======
 #u807 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u806_text {
-=======
 #u807_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u807_div {
-=======
 #u808_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -184,11 +140,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u807 {
-=======
 #u808 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -200,11 +152,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u807_text {
-=======
 #u808_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -212,11 +160,7 @@
   width:192px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u808_div {
-=======
 #u809_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -233,11 +177,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u808 {
-=======
 #u809 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -247,11 +187,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u808_text {
-=======
 #u809_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:1121px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u809 {
-=======
 #u810 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u810_img {
-=======
 #u811_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u810 {
-=======
 #u811 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u810_text {
-=======
 #u811_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u811_div {
-=======
 #u812_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -335,11 +251,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u811 {
-=======
 #u812 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -352,11 +264,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u811_text {
-=======
 #u812_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -364,11 +272,7 @@
   width:131px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u812_div {
-=======
 #u813_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -384,11 +288,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u812 {
-=======
 #u813 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -397,11 +297,7 @@
   height:88px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u812_text {
-=======
 #u813_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,11 +305,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u813 {
-=======
 #u814 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -423,11 +315,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u814_div {
-=======
 #u815_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -447,11 +335,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u814 {
-=======
 #u815 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -461,11 +345,7 @@
   text-align:left;
   line-height:18px;
 }
-<<<<<<< HEAD
-#u814_text {
-=======
 #u815_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -473,11 +353,7 @@
   width:322px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u815_img {
-=======
 #u816_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -485,11 +361,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u815 {
-=======
 #u816 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -497,11 +369,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u815_text {
-=======
 #u816_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -510,11 +378,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u816_img {
-=======
 #u817_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -522,11 +386,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u816 {
-=======
 #u817 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1121px;
@@ -539,11 +399,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u816_text {
-=======
 #u817_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -551,11 +407,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u817_img {
-=======
 #u818_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -563,11 +415,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u817 {
-=======
 #u818 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -575,11 +423,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u817_text {
-=======
 #u818_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -588,20 +432,12 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u818 {
-=======
 #u819 {
->>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
 }
-<<<<<<< HEAD
-#u818_state0 {
-=======
 #u819_state0 {
->>>>>>> 0601optimize
   position:relative;
   left:0px;
   top:0px;
@@ -609,11 +445,7 @@
   height:40px;
   background-image:none;
 }
-<<<<<<< HEAD
-#u818_state0_content {
-=======
 #u819_state0_content {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -621,11 +453,7 @@
   width:1px;
   height:1px;
 }
-<<<<<<< HEAD
-#u819_div {
-=======
 #u820_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -644,11 +472,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u819 {
-=======
 #u820 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -660,11 +484,7 @@
   font-style:normal;
   font-size:16px;
 }
-<<<<<<< HEAD
-#u819_text {
-=======
 #u820_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

dist/html/files/有效期调整/styles.css

@@ -12,11 +12,7 @@
   position:absolute;
   z-index:0;
 }
-<<<<<<< HEAD
-#u2995 {
-=======
 #u2996 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -24,11 +20,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u2996_img {
-=======
 #u2997_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -36,11 +28,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2996 {
-=======
 #u2997 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -48,11 +36,7 @@
   width:8px;
   height:28px;
 }
-<<<<<<< HEAD
-#u2996_text {
-=======
 #u2997_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -61,11 +45,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u2997_div {
-=======
 #u2998_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -83,11 +63,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2997 {
-=======
 #u2998 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -98,11 +74,7 @@
   font-weight:700;
   font-style:normal;
 }
-<<<<<<< HEAD
-#u2997_text {
-=======
 #u2998_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -110,11 +82,7 @@
   width:121px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2998_div {
-=======
 #u2999_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -133,11 +101,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2998 {
-=======
 #u2999 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,11 +113,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u2998_text {
-=======
 #u2999_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,11 +121,7 @@
   width:109px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u2999_div {
-=======
 #u3000_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -182,11 +138,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2999 {
-=======
 #u3000 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -196,11 +148,7 @@
   font-size:16px;
   line-height:24px;
 }
-<<<<<<< HEAD
-#u2999_text {
-=======
 #u3000_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -208,11 +156,7 @@
   width:865px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3000_div {
-=======
 #u3001_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,11 +175,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3000 {
-=======
 #u3001 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -247,11 +187,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3000_text {
-=======
 #u3001_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,11 +195,7 @@
   width:215px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u3001 {
-=======
 #u3002 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -271,11 +203,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u3002_img {
-=======
 #u3003_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -283,11 +211,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u3002 {
-=======
 #u3003 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -299,11 +223,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u3002_text {
-=======
 #u3003_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -311,11 +231,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3003_div {
-=======
 #u3004_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -335,11 +251,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u3003 {
-=======
 #u3004 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -352,11 +264,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u3003_text {
-=======
 #u3004_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -364,11 +272,7 @@
   width:196px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3004_div {
-=======
 #u3005_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -384,11 +288,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u3004 {
-=======
 #u3005 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -397,11 +297,7 @@
   height:22px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u3004_text {
-=======
 #u3005_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,11 +305,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3005 {
-=======
 #u3006 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -423,11 +315,7 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
-<<<<<<< HEAD
-#u3006_div {
-=======
 #u3007_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -446,11 +334,7 @@
   box-shadow:none;
   text-align:left;
 }
-<<<<<<< HEAD
-#u3006 {
-=======
 #u3007 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -459,11 +343,7 @@
   height:146px;
   text-align:left;
 }
-<<<<<<< HEAD
-#u3006_text {
-=======
 #u3007_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -471,11 +351,7 @@
   width:259px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3007_img {
-=======
 #u3008_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -483,11 +359,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u3007 {
-=======
 #u3008 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -495,11 +367,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u3007_text {
-=======
 #u3008_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -508,11 +376,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3008_img {
-=======
 #u3009_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -520,11 +384,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u3008 {
-=======
 #u3009 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:216px;
@@ -537,11 +397,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u3008_text {
-=======
 #u3009_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -549,11 +405,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3009_div {
-=======
 #u3010_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -572,11 +424,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3009 {
-=======
 #u3010 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -588,11 +436,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3009_text {
-=======
 #u3010_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -600,11 +444,7 @@
   width:73px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u3010_img {
-=======
 #u3011_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -612,11 +452,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u3010 {
-=======
 #u3011 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -624,11 +460,7 @@
   width:1155px;
   height:583px;
 }
-<<<<<<< HEAD
-#u3010_text {
-=======
 #u3011_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -637,11 +469,7 @@
   visibility:hidden;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3011_div {
-=======
 #u3012_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -660,11 +488,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3011 {
-=======
 #u3012 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -676,11 +500,7 @@
   font-style:normal;
   font-size:18px;
 }
-<<<<<<< HEAD
-#u3011_text {
-=======
 #u3012_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -688,11 +508,7 @@
   width:91px;
   white-space:nowrap;
 }
-<<<<<<< HEAD
-#u3012_img {
-=======
 #u3013_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -700,11 +516,7 @@
   width:30px;
   height:30px;
 }
-<<<<<<< HEAD
-#u3012 {
-=======
 #u3013 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:441px;
@@ -717,11 +529,7 @@
   font-size:14px;
   color:#1E1E1E;
 }
-<<<<<<< HEAD
-#u3012_text {
-=======
 #u3013_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -729,11 +537,7 @@
   width:16px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3013 {
-=======
 #u3014 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -741,11 +545,7 @@
   width:0px;
   height:0px;
 }
-<<<<<<< HEAD
-#u3014_img {
-=======
 #u3015_img {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -753,11 +553,7 @@
   width:44px;
   height:44px;
 }
-<<<<<<< HEAD
-#u3014 {
-=======
 #u3015 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -769,11 +565,7 @@
   font-style:normal;
   font-size:26px;
 }
-<<<<<<< HEAD
-#u3014_text {
-=======
 #u3015_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -781,11 +573,7 @@
   width:30px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3015_div {
-=======
 #u3016_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -805,11 +593,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u3015 {
-=======
 #u3016 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -822,11 +606,7 @@
   font-size:16px;
   color:#FF0000;
 }
-<<<<<<< HEAD
-#u3015_text {
-=======
 #u3016_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -834,11 +614,7 @@
   width:196px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3016_div {
-=======
 #u3017_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -854,11 +630,7 @@
   box-shadow:none;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u3016 {
-=======
 #u3017 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -867,11 +639,7 @@
   height:22px;
   line-height:22px;
 }
-<<<<<<< HEAD
-#u3016_text {
-=======
 #u3017_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -879,11 +647,7 @@
   width:352px;
   word-wrap:break-word;
 }
-<<<<<<< HEAD
-#u3017_div {
-=======
 #u3018_div {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -902,11 +666,7 @@
   box-shadow:none;
   text-align:left;
 }
-<<<<<<< HEAD
-#u3017 {
-=======
 #u3018 {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -915,11 +675,7 @@
   height:146px;
   text-align:left;
 }
-<<<<<<< HEAD
-#u3017_text {
-=======
 #u3018_text {
->>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;