11

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

@@ -12,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1677 {
+=======
+#u1678 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1678_img {
+=======
+#u1679_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1678 {
+=======
+#u1679 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1678_text {
+=======
+#u1679_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1679_div {
+=======
+#u1680_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1679 {
+=======
+#u1680 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1679_text {
+=======
+#u1680_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1680_div {
+=======
+#u1681_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1680 {
+=======
+#u1681 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1680_text {
+=======
+#u1681_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1681_div {
+=======
+#u1682_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1681 {
+=======
+#u1682 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1681_text {
+=======
+#u1682_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:223px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1682_div {
+=======
+#u1683_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1682 {
+=======
+#u1683 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1682_text {
+=======
+#u1683_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1683 {
+=======
+#u1684 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1684_img {
+=======
+#u1685_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -211,7 +283,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1684 {
+=======
+#u1685 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1177px;
@@ -223,7 +299,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1684_text {
+=======
+#u1685_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -231,7 +311,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1685_div {
+=======
+#u1686_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -250,7 +334,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1685 {
+=======
+#u1686 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1217px;
@@ -262,7 +350,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1685_text {
+=======
+#u1686_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,7 +362,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1686_div {
+=======
+#u1687_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -285,7 +381,11 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
+<<<<<<< HEAD
 #u1686 {
+=======
+#u1687 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1217px;
@@ -293,7 +393,11 @@
   width:352px;
   height:611px;
 }
+<<<<<<< HEAD
 #u1686_text {
+=======
+#u1687_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -301,7 +405,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1687_img {
+=======
+#u1688_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -309,7 +417,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1687 {
+=======
+#u1688 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -317,7 +429,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1687_text {
+=======
+#u1688_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1688_img {
+=======
+#u1689_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -334,7 +454,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1688 {
+=======
+#u1689 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:542px;
@@ -347,7 +471,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1688_text {
+=======
+#u1689_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -355,7 +483,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1689_div {
+=======
+#u1690_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -374,7 +506,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1689 {
+=======
+#u1690 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -386,7 +522,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1689_text {
+=======
+#u1690_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -394,7 +534,11 @@
   width:223px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1690_img {
+=======
+#u1691_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -402,7 +546,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1690 {
+=======
+#u1691 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -410,7 +558,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1690_text {
+=======
+#u1691_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -419,7 +571,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1691 {
+=======
+#u1692 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -427,7 +583,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1692_img {
+=======
+#u1693_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -435,7 +595,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1692 {
+=======
+#u1693 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -447,7 +611,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1692_text {
+=======
+#u1693_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -455,7 +623,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1693_div {
+=======
+#u1694_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -474,7 +646,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1693 {
+=======
+#u1694 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -486,7 +662,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1693_text {
+=======
+#u1694_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -494,7 +674,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1694_div {
+=======
+#u1695_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -509,7 +693,11 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
+<<<<<<< HEAD
 #u1694 {
+=======
+#u1695 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -517,7 +705,11 @@
   width:352px;
   height:552px;
 }
+<<<<<<< HEAD
 #u1694_text {
+=======
+#u1695_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -525,7 +717,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1695_img {
+=======
+#u1696_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -533,7 +729,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1695 {
+=======
+#u1696 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:542px;
@@ -546,7 +746,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1695_text {
+=======
+#u1696_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -554,12 +758,20 @@
   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;
@@ -567,7 +779,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1696_state0_content {
+=======
+#u1697_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -575,7 +791,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1697_div {
+=======
+#u1698_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -594,7 +814,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1697 {
+=======
+#u1698 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -606,7 +830,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1775_img {
+=======
+#u1776_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1775 {
+=======
+#u1776 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1775_text {
+=======
+#u1776_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1776_div {
+=======
+#u1777_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -54,7 +70,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1776 {
+=======
+#u1777 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -64,7 +84,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1776_text {
+=======
+#u1777_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -72,7 +96,11 @@
   width:716px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1777 {
+=======
+#u1778 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -80,7 +108,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1778_img {
+=======
+#u1779_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1778 {
+=======
+#u1779 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -96,7 +132,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1778_text {
+=======
+#u1779_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -105,7 +145,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1779_div {
+=======
+#u1780_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -123,7 +167,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1779 {
+=======
+#u1780 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -134,7 +182,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1779_text {
+=======
+#u1780_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -142,7 +194,11 @@
   width:145px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1780_div {
+=======
+#u1781_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -161,7 +217,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1780 {
+=======
+#u1781 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -173,7 +233,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1780_text {
+=======
+#u1781_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -181,7 +245,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1781_div {
+=======
+#u1782_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -200,7 +268,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1781 {
+=======
+#u1782 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -212,7 +284,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1781_text {
+=======
+#u1782_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   width:228px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1782_img {
+=======
+#u1783_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1782 {
+=======
+#u1783 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1149px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1782_text {
+=======
+#u1783_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1783 {
+=======
+#u1784 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1784_img {
+=======
+#u1785_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1784 {
+=======
+#u1785 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1784_text {
+=======
+#u1785_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1785_div {
+=======
+#u1786_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1785 {
+=======
+#u1786 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1785_text {
+=======
+#u1786_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:198px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1786_div {
+=======
+#u1787_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1786 {
+=======
+#u1787 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:110px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1786_text {
+=======
+#u1787_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1787 {
+=======
+#u1788 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -369,7 +501,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1788_div {
+=======
+#u1789_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -390,7 +526,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1788 {
+=======
+#u1789 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -401,7 +541,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1788_text {
+=======
+#u1789_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -409,7 +553,11 @@
   width:301px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1789_img {
+=======
+#u1790_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -417,7 +565,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1789 {
+=======
+#u1790 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -425,7 +577,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1789_text {
+=======
+#u1790_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -434,12 +590,20 @@
   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;
@@ -447,7 +611,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1790_state0_content {
+=======
+#u1791_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -455,7 +623,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1791_div {
+=======
+#u1792_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -474,7 +646,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1791 {
+=======
+#u1792 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -486,7 +662,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1832_img {
+=======
+#u1833_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1832 {
+=======
+#u1833 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1832_text {
+=======
+#u1833_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1833 {
+=======
+#u1834 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1834_img {
+=======
+#u1835_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1834 {
+=======
+#u1835 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1834_text {
+=======
+#u1835_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1835_div {
+=======
+#u1836_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1835 {
+=======
+#u1836 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1835_text {
+=======
+#u1836_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1836_div {
+=======
+#u1837_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1836 {
+=======
+#u1837 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1836_text {
+=======
+#u1837_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1837_div {
+=======
+#u1838_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -165,7 +221,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1837 {
+=======
+#u1838 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -177,7 +237,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1837_text {
+=======
+#u1838_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1838_div {
+=======
+#u1839_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -202,7 +270,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1838 {
+=======
+#u1839 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:54px;
@@ -212,7 +284,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1838_text {
+=======
+#u1839_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1839 {
+=======
+#u1840 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -228,7 +308,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1840_img {
+=======
+#u1841_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -236,7 +320,11 @@
   width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u1840 {
+=======
+#u1841 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -249,7 +337,11 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1840_text {
+=======
+#u1841_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -257,7 +349,11 @@
   width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1841_div {
+=======
+#u1842_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -276,7 +372,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1841 {
+=======
+#u1842 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -288,7 +388,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1841_text {
+=======
+#u1842_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -296,7 +400,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1842_div {
+=======
+#u1843_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -312,7 +420,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1842 {
+=======
+#u1843 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -321,7 +433,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1842_text {
+=======
+#u1843_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -329,7 +445,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1843_img {
+=======
+#u1844_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -337,7 +457,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1843 {
+=======
+#u1844 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1062px;
@@ -350,7 +474,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1843_text {
+=======
+#u1844_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

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

@@ -12,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u112 {
+=======
+#u113 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u113_img {
+=======
+#u114_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u113 {
+=======
+#u114 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u113_text {
+=======
+#u114_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u114_div {
+=======
+#u115_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u114 {
+=======
+#u115 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u114_text {
+=======
+#u115_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u115_div {
+=======
+#u116_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u115 {
+=======
+#u116 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u115_text {
+=======
+#u116_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u116_div {
+=======
+#u117_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -138,7 +182,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u116 {
+=======
+#u117 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -148,7 +196,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u116_text {
+=======
+#u117_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -156,7 +208,11 @@
   width:507px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u117_div {
+=======
+#u118_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -175,7 +231,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u117 {
+=======
+#u118 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -187,7 +247,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u117_text {
+=======
+#u118_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:197px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u118_img {
+=======
+#u119_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u118 {
+=======
+#u119 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -211,7 +283,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u118_text {
+=======
+#u119_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u119_img {
+=======
+#u120_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u119 {
+=======
+#u120 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1034px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u119_text {
+=======
+#u120_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u120 {
+=======
+#u121 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,20 +349,28 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u121_img {
+=======
+#u122_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
   top:-4px;
-  width:37px;
+  width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u121 {
+=======
+#u122 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
   top:235px;
-  width:27px;
+  width:30px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -278,15 +378,23 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u121_text {
+=======
+#u122_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
   top:4px;
-  width:23px;
+  width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u122_div {
+=======
+#u123_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u122 {
+=======
+#u123 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -317,7 +429,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u122_text {
+=======
+#u123_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -325,7 +441,11 @@
   width:120px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u123_div {
+=======
+#u124_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -341,7 +461,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u123 {
+=======
+#u124 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -350,7 +474,11 @@
   height:66px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u123_text {
+=======
+#u124_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -358,7 +486,11 @@
   width:322px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u124_img {
+=======
+#u125_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -366,7 +498,11 @@
   width:1153px;
   height:583px;
 }
+<<<<<<< HEAD
 #u124 {
+=======
+#u125 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -377,7 +513,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u124_text {
+=======
+#u125_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -386,7 +526,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u125_img {
+=======
+#u126_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -394,7 +538,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u125 {
+=======
+#u126 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1032px;
@@ -407,7 +555,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u125_text {
+=======
+#u126_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -415,7 +567,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u126 {
+=======
+#u127 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -423,20 +579,28 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u127_img {
+=======
+#u128_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
   top:-4px;
-  width:37px;
+  width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u127 {
+=======
+#u128 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
   top:455px;
-  width:27px;
+  width:30px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -444,15 +608,23 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u127_text {
+=======
+#u128_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
   top:4px;
-  width:23px;
+  width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u128_div {
+=======
+#u129_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -471,7 +643,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u128 {
+=======
+#u129 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -483,7 +659,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u128_text {
+=======
+#u129_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -491,7 +671,11 @@
   width:120px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u129_div {
+=======
+#u130_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -507,7 +691,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u129 {
+=======
+#u130 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -516,7 +704,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u129_text {
+=======
+#u130_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -524,7 +716,11 @@
   width:322px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u130 {
+=======
+#u131 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -532,20 +728,28 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u131_img {
+=======
+#u132_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
   top:-4px;
-  width:37px;
+  width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u131 {
+=======
+#u132 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
   top:554px;
-  width:27px;
+  width:30px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -553,15 +757,23 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u131_text {
+=======
+#u132_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
   top:4px;
-  width:23px;
+  width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u132_div {
+=======
+#u133_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -580,7 +792,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u132 {
+=======
+#u133 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -592,7 +808,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u132_text {
+=======
+#u133_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -600,7 +820,11 @@
   width:120px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u133_div {
+=======
+#u134_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -616,7 +840,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u133 {
+=======
+#u134 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -625,7 +853,11 @@
   height:88px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u133_text {
+=======
+#u134_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -633,7 +865,11 @@
   width:322px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u134_img {
+=======
+#u135_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -641,7 +877,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u134 {
+=======
+#u135 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1032px;
@@ -654,7 +894,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u134_text {
+=======
+#u135_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -662,7 +906,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u135 {
+=======
+#u136 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -670,20 +918,28 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u136_img {
+=======
+#u137_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
   top:-4px;
-  width:37px;
+  width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u136 {
+=======
+#u137 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
   top:356px;
-  width:27px;
+  width:30px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -691,15 +947,23 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u136_text {
+=======
+#u137_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
   top:4px;
-  width:23px;
+  width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u137_div {
+=======
+#u138_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -718,7 +982,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u137 {
+=======
+#u138 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -730,7 +998,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u137_text {
+=======
+#u138_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -738,7 +1010,11 @@
   width:120px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u138_div {
+=======
+#u139_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -754,7 +1030,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u138 {
+=======
+#u139 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -763,7 +1043,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u138_text {
+=======
+#u139_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -771,7 +1055,11 @@
   width:322px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u139_img {
+=======
+#u140_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -779,7 +1067,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u139 {
+=======
+#u140 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1138px;
@@ -792,7 +1084,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u139_text {
+=======
+#u140_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -800,7 +1096,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u140 {
+=======
+#u141 {
+>>>>>>> 0601optimize
   position:fixed;
   left:1382px;
   top:68px;
@@ -808,7 +1108,11 @@
   height:40px;
   overflow:hidden;
 }
+<<<<<<< HEAD
 #u140_state0 {
+=======
+#u141_state0 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -821,7 +1125,11 @@
   overflow-y:hidden;
   background-image:none;
 }
+<<<<<<< HEAD
 #u140_state0_content {
+=======
+#u141_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -829,7 +1137,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u141_div {
+=======
+#u142_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -847,7 +1159,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u141 {
+=======
+#u142 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -858,7 +1174,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1844 {
+=======
+#u1845 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1845_img {
+=======
+#u1846_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1845 {
+=======
+#u1846 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1845_text {
+=======
+#u1846_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1846_div {
+=======
+#u1847_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1846 {
+=======
+#u1847 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1846_text {
+=======
+#u1847_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1847_div {
+=======
+#u1848_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1847 {
+=======
+#u1848 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1847_text {
+=======
+#u1848_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1848_div {
+=======
+#u1849_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1848 {
+=======
+#u1849 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1848_text {
+=======
+#u1849_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1849_div {
+=======
+#u1850_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1849 {
+=======
+#u1850 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1849_text {
+=======
+#u1850_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1850_img {
+=======
+#u1851_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1850 {
+=======
+#u1851 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -211,7 +283,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1850_text {
+=======
+#u1851_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1851_img {
+=======
+#u1852_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1851 {
+=======
+#u1852 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1094px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1851_text {
+=======
+#u1852_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1852 {
+=======
+#u1853 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1853_img {
+=======
+#u1854_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u1853 {
+=======
+#u1854 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -278,7 +378,11 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1853_text {
+=======
+#u1854_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -286,7 +390,11 @@
   width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1854_div {
+=======
+#u1855_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1854 {
+=======
+#u1855 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -317,7 +429,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1854_text {
+=======
+#u1855_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -325,7 +441,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1855_div {
+=======
+#u1856_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -341,7 +461,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1855 {
+=======
+#u1856 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -350,7 +474,11 @@
   height:22px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1855_text {
+=======
+#u1856_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -358,7 +486,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1856_img {
+=======
+#u1857_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -366,7 +498,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1856 {
+=======
+#u1857 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -374,7 +510,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1856_text {
+=======
+#u1857_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -383,7 +523,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1857_div {
+=======
+#u1858_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -402,7 +546,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1857 {
+=======
+#u1858 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -414,7 +562,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1857_text {
+=======
+#u1858_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -422,7 +574,11 @@
   width:91px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1858_img {
+=======
+#u1859_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -430,7 +586,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1858 {
+=======
+#u1859 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1090px;
@@ -443,7 +603,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1858_text {
+=======
+#u1859_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -451,7 +615,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1859 {
+=======
+#u1860 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -459,7 +627,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1860_img {
+=======
+#u1861_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -467,7 +639,11 @@
   width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u1860 {
+=======
+#u1861 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -480,7 +656,11 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1860_text {
+=======
+#u1861_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -488,7 +668,11 @@
   width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1861_div {
+=======
+#u1862_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -507,7 +691,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1861 {
+=======
+#u1862 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -519,7 +707,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1861_text {
+=======
+#u1862_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -527,7 +719,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1862_div {
+=======
+#u1863_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -543,7 +739,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1862 {
+=======
+#u1863 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -552,7 +752,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1862_text {
+=======
+#u1863_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;

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

@@ -12,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1656 {
+=======
+#u1657 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1657_img {
+=======
+#u1658_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1657 {
+=======
+#u1658 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1657_text {
+=======
+#u1658_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1658_div {
+=======
+#u1659_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1658 {
+=======
+#u1659 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1658_text {
+=======
+#u1659_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1659_div {
+=======
+#u1660_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1659 {
+=======
+#u1660 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1659_text {
+=======
+#u1660_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1660_div {
+=======
+#u1661_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1660 {
+=======
+#u1661 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1660_text {
+=======
+#u1661_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:223px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1661_div {
+=======
+#u1662_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1661 {
+=======
+#u1662 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1661_text {
+=======
+#u1662_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1662 {
+=======
+#u1663 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1663_img {
+=======
+#u1664_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -211,7 +283,11 @@
   width:44px;
   height:42px;
 }
+<<<<<<< HEAD
 #u1663 {
+=======
+#u1664 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -223,7 +299,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1663_text {
+=======
+#u1664_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -231,7 +311,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1664_div {
+=======
+#u1665_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -250,7 +334,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1664 {
+=======
+#u1665 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -262,7 +350,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1664_text {
+=======
+#u1665_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,7 +362,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1665_div {
+=======
+#u1666_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -285,7 +381,11 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
+<<<<<<< HEAD
 #u1665 {
+=======
+#u1666 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -293,7 +393,11 @@
   width:352px;
   height:575px;
 }
+<<<<<<< HEAD
 #u1665_text {
+=======
+#u1666_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -301,7 +405,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1666_img {
+=======
+#u1667_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -309,7 +417,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1666 {
+=======
+#u1667 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -317,7 +429,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1666_text {
+=======
+#u1667_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1667_img {
+=======
+#u1668_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -334,7 +454,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1667 {
+=======
+#u1668 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:459px;
@@ -347,7 +471,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1667_text {
+=======
+#u1668_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -355,7 +483,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1668_img {
+=======
+#u1669_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -363,7 +495,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1668 {
+=======
+#u1669 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -371,7 +507,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1668_text {
+=======
+#u1669_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -380,7 +520,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1669_div {
+=======
+#u1670_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -399,7 +543,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1669 {
+=======
+#u1670 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -411,7 +559,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1669_text {
+=======
+#u1670_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -419,7 +571,11 @@
   width:278px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1670 {
+=======
+#u1671 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -427,7 +583,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1671_img {
+=======
+#u1672_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -435,7 +595,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1671 {
+=======
+#u1672 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -447,7 +611,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1671_text {
+=======
+#u1672_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -455,7 +623,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1672_div {
+=======
+#u1673_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -474,7 +646,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1672 {
+=======
+#u1673 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -486,7 +662,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1672_text {
+=======
+#u1673_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -494,7 +674,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1673_div {
+=======
+#u1674_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -509,7 +693,11 @@
   -webkit-box-shadow:none;
   box-shadow:none;
 }
+<<<<<<< HEAD
 #u1673 {
+=======
+#u1674 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -517,7 +705,11 @@
   width:352px;
   height:460px;
 }
+<<<<<<< HEAD
 #u1673_text {
+=======
+#u1674_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -525,7 +717,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1674_img {
+=======
+#u1675_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -533,7 +729,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1674 {
+=======
+#u1675 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:464px;
@@ -546,7 +746,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1674_text {
+=======
+#u1675_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -554,12 +758,20 @@
   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;
@@ -567,11 +779,24 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1675_state0_content {
+=======
+#u1676_state0_content {
+  border-width:0px;
+  position:absolute;
+  left:0px;
+  top:0px;
+  width:1px;
+  height:1px;
+}
+#u1677_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
   top:0px;
+<<<<<<< HEAD
   width:1px;
   height:1px;
 }
@@ -580,6 +805,8 @@
   position:absolute;
   left:0px;
   top:0px;
+=======
+>>>>>>> 0601optimize
   width:140px;
   height:40px;
   background:inherit;
@@ -594,7 +821,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1676 {
+=======
+#u1677 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -606,7 +837,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1042 {
+=======
+#u1043 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1043_img {
+=======
+#u1044_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -28,7 +36,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1043 {
+=======
+#u1044 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -40,7 +52,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1043_text {
+=======
+#u1044_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -48,7 +64,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1044_div {
+=======
+#u1045_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -68,7 +88,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1044 {
+=======
+#u1045 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -81,7 +105,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1044_text {
+=======
+#u1045_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -89,7 +117,11 @@
   width:187px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1045_div {
+=======
+#u1046_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -105,7 +137,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1045 {
+=======
+#u1046 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -114,7 +150,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1045_text {
+=======
+#u1046_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -122,7 +162,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1046 {
+=======
+#u1047 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -132,7 +176,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1047_div {
+=======
+#u1048_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -152,7 +200,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1047 {
+=======
+#u1048 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -162,7 +214,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1047_text {
+=======
+#u1048_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -170,7 +226,11 @@
   width:272px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1048 {
+=======
+#u1049 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -178,7 +238,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1049_img {
+=======
+#u1050_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -186,7 +250,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1049 {
+=======
+#u1050 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -194,7 +262,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1049_text {
+=======
+#u1050_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +275,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1050_div {
+=======
+#u1051_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -221,7 +297,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1050 {
+=======
+#u1051 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -232,7 +312,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1050_text {
+=======
+#u1051_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -240,7 +324,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1051_div {
+=======
+#u1052_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -259,7 +347,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1051 {
+=======
+#u1052 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -271,7 +363,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1051_text {
+=======
+#u1052_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -279,7 +375,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1052_div {
+=======
+#u1053_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -298,7 +398,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1052 {
+=======
+#u1053 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -310,7 +414,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1052_text {
+=======
+#u1053_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -318,7 +426,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1053_div {
+=======
+#u1054_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -335,7 +447,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1053 {
+=======
+#u1054 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -345,7 +461,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1053_text {
+=======
+#u1054_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -353,7 +473,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1054_img {
+=======
+#u1055_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -361,7 +485,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1054 {
+=======
+#u1055 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -369,7 +497,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1054_text {
+=======
+#u1055_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +510,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1055_img {
+=======
+#u1056_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -386,7 +522,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1055 {
+=======
+#u1056 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:310px;
@@ -399,7 +539,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1055_text {
+=======
+#u1056_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -407,12 +551,20 @@
   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;
@@ -420,7 +572,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1056_state0_content {
+=======
+#u1057_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -428,7 +584,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1057_div {
+=======
+#u1058_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -447,7 +607,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1057 {
+=======
+#u1058 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -459,7 +623,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u548_img {
+=======
+#u549_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u548 {
+=======
+#u549 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u548_text {
+=======
+#u549_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u549 {
+=======
+#u550 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u550_img {
+=======
+#u551_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u550 {
+=======
+#u551 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u550_text {
+=======
+#u551_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u551_div {
+=======
+#u552_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u551 {
+=======
+#u552 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u551_text {
+=======
+#u552_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u552_div {
+=======
+#u553_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u552 {
+=======
+#u553 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u552_text {
+=======
+#u553_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u553_img {
+=======
+#u554_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u553 {
+=======
+#u554 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1031px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u553_text {
+=======
+#u554_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u554_div {
+=======
+#u555_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u554 {
+=======
+#u555 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u554_text {
+=======
+#u555_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u555_div {
+=======
+#u556_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u555 {
+=======
+#u556 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u555_text {
+=======
+#u556_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u556 {
+=======
+#u557 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u557_img {
+=======
+#u558_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u557 {
+=======
+#u558 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u557_text {
+=======
+#u558_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u558_div {
+=======
+#u559_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u558 {
+=======
+#u559 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u558_text {
+=======
+#u559_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:180px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u559_div {
+=======
+#u560_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u559 {
+=======
+#u560 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:31px;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u559_text {
+=======
+#u560_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u560_img {
+=======
+#u561_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -367,7 +499,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u560 {
+=======
+#u561 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -375,7 +511,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u560_text {
+=======
+#u561_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -384,12 +524,20 @@
   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;
@@ -397,7 +545,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u561_state0_content {
+=======
+#u562_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -405,7 +557,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u562_div {
+=======
+#u563_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -424,7 +580,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u562 {
+=======
+#u563 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -436,7 +596,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u533_img {
+=======
+#u534_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u533 {
+=======
+#u534 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u533_text {
+=======
+#u534_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u534 {
+=======
+#u535 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u535_img {
+=======
+#u536_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u535 {
+=======
+#u536 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u535_text {
+=======
+#u536_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u536_div {
+=======
+#u537_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u536 {
+=======
+#u537 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u536_text {
+=======
+#u537_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u537_div {
+=======
+#u538_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u537 {
+=======
+#u538 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u537_text {
+=======
+#u538_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u538_img {
+=======
+#u539_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u538 {
+=======
+#u539 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:533px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u538_text {
+=======
+#u539_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u539_div {
+=======
+#u540_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u539 {
+=======
+#u540 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u539_text {
+=======
+#u540_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u540_div {
+=======
+#u541_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u540 {
+=======
+#u541 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u540_text {
+=======
+#u541_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:1120px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u541 {
+=======
+#u542 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u542_img {
+=======
+#u543_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u542 {
+=======
+#u543 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u542_text {
+=======
+#u543_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u543_div {
+=======
+#u544_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u543 {
+=======
+#u544 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u543_text {
+=======
+#u544_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:107px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u544_div {
+=======
+#u545_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -343,7 +463,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u544 {
+=======
+#u545 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -353,7 +477,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u544_text {
+=======
+#u545_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -361,7 +489,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u545_img {
+=======
+#u546_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -369,7 +501,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u545 {
+=======
+#u546 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -377,7 +513,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u545_text {
+=======
+#u546_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -386,12 +526,20 @@
   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;
@@ -399,7 +547,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u546_state0_content {
+=======
+#u547_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -407,7 +559,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u547_div {
+=======
+#u548_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -426,7 +582,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u547 {
+=======
+#u548 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -438,7 +598,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u757 {
+=======
+#u758 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u758_img {
+=======
+#u759_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u758 {
+=======
+#u759 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u758_text {
+=======
+#u759_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u759_div {
+=======
+#u760_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u759 {
+=======
+#u760 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u759_text {
+=======
+#u760_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u760_div {
+=======
+#u761_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u760 {
+=======
+#u761 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u760_text {
+=======
+#u761_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u761_div {
+=======
+#u762_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u761 {
+=======
+#u762 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u761_text {
+=======
+#u762_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u762_div {
+=======
+#u763_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u762 {
+=======
+#u763 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:55px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u762_text {
+=======
+#u763_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u763 {
+=======
+#u764 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u764_img {
+=======
+#u765_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -211,7 +283,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u764 {
+=======
+#u765 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -223,7 +299,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u764_text {
+=======
+#u765_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -231,7 +311,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u765_div {
+=======
+#u766_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -251,7 +335,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u765 {
+=======
+#u766 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -264,7 +352,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u765_text {
+=======
+#u766_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -272,7 +364,11 @@
   width:107px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u766_div {
+=======
+#u767_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -289,7 +385,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u766 {
+=======
+#u767 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -299,7 +399,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u766_text {
+=======
+#u767_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,7 +411,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u767_img {
+=======
+#u768_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -315,7 +423,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u767 {
+=======
+#u768 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -323,7 +435,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u767_text {
+=======
+#u768_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -332,12 +448,20 @@
   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;
@@ -345,7 +469,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u768_state0_content {
+=======
+#u769_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -353,7 +481,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u769_div {
+=======
+#u770_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -372,7 +504,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u769 {
+=======
+#u770 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -384,7 +520,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1086_img {
+=======
+#u1087_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1086 {
+=======
+#u1087 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1086_text {
+=======
+#u1087_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1087_img {
+=======
+#u1088_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -45,7 +61,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1087 {
+=======
+#u1088 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:520px;
@@ -58,7 +78,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1087_text {
+=======
+#u1088_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -66,7 +90,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1088 {
+=======
+#u1089 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -74,7 +102,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1089_img {
+=======
+#u1090_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -82,7 +114,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1089 {
+=======
+#u1090 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -94,7 +130,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1089_text {
+=======
+#u1090_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -102,7 +142,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1090_div {
+=======
+#u1091_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -122,7 +166,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1090 {
+=======
+#u1091 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -135,7 +183,11 @@
   font-size:16px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1090_text {
+=======
+#u1091_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -143,7 +195,11 @@
   width:107px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1091_div {
+=======
+#u1092_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +216,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1091 {
+=======
+#u1092 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -170,7 +230,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1091_text {
+=======
+#u1092_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -178,7 +242,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1092 {
+=======
+#u1093 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -186,7 +254,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1093_img {
+=======
+#u1094_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +266,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1093 {
+=======
+#u1094 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -202,7 +278,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1093_text {
+=======
+#u1094_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -211,7 +291,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1094_div {
+=======
+#u1095_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -229,7 +313,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1094 {
+=======
+#u1095 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -240,7 +328,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1094_text {
+=======
+#u1095_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -248,7 +340,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1095_div {
+=======
+#u1096_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -267,7 +363,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1095 {
+=======
+#u1096 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -279,7 +379,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1095_text {
+=======
+#u1096_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -287,7 +391,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1096_div {
+=======
+#u1097_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -306,7 +414,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1096 {
+=======
+#u1097 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -318,7 +430,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1096_text {
+=======
+#u1097_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1097_div {
+=======
+#u1098_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -343,7 +463,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1097 {
+=======
+#u1098 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -353,7 +477,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1097_text {
+=======
+#u1098_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -361,12 +489,20 @@
   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;
@@ -374,7 +510,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1098_state0_content {
+=======
+#u1099_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -382,7 +522,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1099_div {
+=======
+#u1100_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -401,7 +545,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1099 {
+=======
+#u1100 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -413,7 +561,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1478_img {
+=======
+#u1479_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1478 {
+=======
+#u1479 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1478_text {
+=======
+#u1479_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1479 {
+=======
+#u1480 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1480_img {
+=======
+#u1481_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1480 {
+=======
+#u1481 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1480_text {
+=======
+#u1481_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1481_div {
+=======
+#u1482_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1481 {
+=======
+#u1482 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1481_text {
+=======
+#u1482_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1482_div {
+=======
+#u1483_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1482 {
+=======
+#u1483 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1482_text {
+=======
+#u1483_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1483_div {
+=======
+#u1484_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -165,7 +221,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1483 {
+=======
+#u1484 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -177,7 +237,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1483_text {
+=======
+#u1484_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1484_div {
+=======
+#u1485_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -202,7 +270,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1484 {
+=======
+#u1485 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -212,7 +284,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1484_text {
+=======
+#u1485_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1485_img {
+=======
+#u1486_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1485 {
+=======
+#u1486 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:988px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1485_text {
+=======
+#u1486_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1486 {
+=======
+#u1487 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1487_img {
+=======
+#u1488_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1487 {
+=======
+#u1488 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1173px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1487_text {
+=======
+#u1488_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1488_div {
+=======
+#u1489_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1488 {
+=======
+#u1489 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1488_text {
+=======
+#u1489_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1489_div {
+=======
+#u1490_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1489 {
+=======
+#u1490 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -351,7 +475,11 @@
   height:198px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1489_text {
+=======
+#u1490_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1490 {
+=======
+#u1491 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1218px;
@@ -369,7 +501,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1491_img {
+=======
+#u1492_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -377,7 +513,11 @@
   width:276px;
   height:89px;
 }
+<<<<<<< HEAD
 #u1491 {
+=======
+#u1492 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -388,7 +528,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1491_text {
+=======
+#u1492_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -396,7 +540,11 @@
   width:272px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1492_img {
+=======
+#u1493_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -404,7 +552,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1492 {
+=======
+#u1493 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -412,7 +564,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1492_text {
+=======
+#u1493_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -421,12 +577,20 @@
   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;
@@ -434,7 +598,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1493_state0_content {
+=======
+#u1494_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -442,7 +610,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1494_div {
+=======
+#u1495_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -461,7 +633,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1494 {
+=======
+#u1495 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -473,7 +649,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u505_img {
+=======
+#u506_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u505 {
+=======
+#u506 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u505_text {
+=======
+#u506_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u506 {
+=======
+#u507 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u507_img {
+=======
+#u508_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u507 {
+=======
+#u508 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u507_text {
+=======
+#u508_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u508_div {
+=======
+#u509_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u508 {
+=======
+#u509 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u508_text {
+=======
+#u509_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u509_div {
+=======
+#u510_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u509 {
+=======
+#u510 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u509_text {
+=======
+#u510_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u510_img {
+=======
+#u511_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u510 {
+=======
+#u511 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:281px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u510_text {
+=======
+#u511_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u511_div {
+=======
+#u512_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u511 {
+=======
+#u512 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u511_text {
+=======
+#u512_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u512_div {
+=======
+#u513_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u512 {
+=======
+#u513 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u512_text {
+=======
+#u513_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u513 {
+=======
+#u514 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u514_img {
+=======
+#u515_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u514 {
+=======
+#u515 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u514_text {
+=======
+#u515_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u515_div {
+=======
+#u516_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -304,7 +412,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u515 {
+=======
+#u516 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -316,7 +428,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u515_text {
+=======
+#u516_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:146px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u516_div {
+=======
+#u517_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,7 +460,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u516 {
+=======
+#u517 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -349,7 +473,11 @@
   height:25px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u516_text {
+=======
+#u517_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u517_state0_content {
+=======
+#u518_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u518_div {
+=======
+#u519_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u518 {
+=======
+#u519 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u729_img {
+=======
+#u730_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u729 {
+=======
+#u730 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u729_text {
+=======
+#u730_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u730 {
+=======
+#u731 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u731_img {
+=======
+#u732_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u731 {
+=======
+#u732 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u731_text {
+=======
+#u732_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u732_div {
+=======
+#u733_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u732 {
+=======
+#u733 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u732_text {
+=======
+#u733_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u733_div {
+=======
+#u734_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u733 {
+=======
+#u734 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u733_text {
+=======
+#u734_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u734_img {
+=======
+#u735_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u734 {
+=======
+#u735 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:281px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u734_text {
+=======
+#u735_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u735_div {
+=======
+#u736_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u735 {
+=======
+#u736 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u735_text {
+=======
+#u736_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u736_div {
+=======
+#u737_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u736 {
+=======
+#u737 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u736_text {
+=======
+#u737_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u737 {
+=======
+#u738 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u738_img {
+=======
+#u739_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u738 {
+=======
+#u739 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u738_text {
+=======
+#u739_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u739_div {
+=======
+#u740_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -304,7 +412,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u739 {
+=======
+#u740 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -316,7 +428,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u739_text {
+=======
+#u740_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:146px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u740_div {
+=======
+#u741_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,7 +460,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u740 {
+=======
+#u741 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -349,7 +473,11 @@
   height:25px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u740_text {
+=======
+#u741_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u741_state0_content {
+=======
+#u742_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u742_div {
+=======
+#u743_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u742 {
+=======
+#u743 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1058 {
+=======
+#u1059 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1059_img {
+=======
+#u1060_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1059 {
+=======
+#u1060 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1059_text {
+=======
+#u1060_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1060_div {
+=======
+#u1061_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1060 {
+=======
+#u1061 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1060_text {
+=======
+#u1061_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1061_div {
+=======
+#u1062_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1061 {
+=======
+#u1062 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1061_text {
+=======
+#u1062_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1062_div {
+=======
+#u1063_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1062 {
+=======
+#u1063 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1062_text {
+=======
+#u1063_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1063_div {
+=======
+#u1064_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1063 {
+=======
+#u1064 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1063_text {
+=======
+#u1064_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1064_img {
+=======
+#u1065_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1064 {
+=======
+#u1065 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -211,7 +283,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1064_text {
+=======
+#u1065_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1065_img {
+=======
+#u1066_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1065 {
+=======
+#u1066 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:250px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1065_text {
+=======
+#u1066_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1066 {
+=======
+#u1067 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1067_img {
+=======
+#u1068_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1067 {
+=======
+#u1068 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1188px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1067_text {
+=======
+#u1068_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1068_div {
+=======
+#u1069_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -304,7 +412,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1068 {
+=======
+#u1069 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -316,7 +428,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1068_text {
+=======
+#u1069_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:146px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1069_div {
+=======
+#u1070_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,7 +460,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1069 {
+=======
+#u1070 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -349,7 +473,11 @@
   height:25px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1069_text {
+=======
+#u1070_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1070_state0_content {
+=======
+#u1071_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1071_div {
+=======
+#u1072_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1071 {
+=======
+#u1072 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u743_img {
+=======
+#u744_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u743 {
+=======
+#u744 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u743_text {
+=======
+#u744_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u744 {
+=======
+#u745 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u745_img {
+=======
+#u746_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u745 {
+=======
+#u746 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u745_text {
+=======
+#u746_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u746_div {
+=======
+#u747_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u746 {
+=======
+#u747 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u746_text {
+=======
+#u747_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u747_div {
+=======
+#u748_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u747 {
+=======
+#u748 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u747_text {
+=======
+#u748_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u748_div {
+=======
+#u749_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -165,7 +221,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u748 {
+=======
+#u749 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -177,7 +237,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u748_text {
+=======
+#u749_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u749_div {
+=======
+#u750_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -202,7 +270,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u749 {
+=======
+#u750 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -212,7 +284,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u749_text {
+=======
+#u750_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u750_img {
+=======
+#u751_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u750 {
+=======
+#u751 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:220px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u750_text {
+=======
+#u751_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u751 {
+=======
+#u752 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u752_img {
+=======
+#u753_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u752 {
+=======
+#u753 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u752_text {
+=======
+#u753_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u753_div {
+=======
+#u754_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -304,7 +412,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u753 {
+=======
+#u754 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -316,7 +428,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u753_text {
+=======
+#u754_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u754_div {
+=======
+#u755_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -341,7 +461,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u754 {
+=======
+#u755 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u754_text {
+=======
+#u755_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,12 +487,20 @@
   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;
@@ -372,7 +508,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u755_state0_content {
+=======
+#u756_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -380,7 +520,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u756_div {
+=======
+#u757_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -399,7 +543,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u756 {
+=======
+#u757 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -411,7 +559,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1072_img {
+=======
+#u1073_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1072 {
+=======
+#u1073 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1072_text {
+=======
+#u1073_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1073 {
+=======
+#u1074 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1074_img {
+=======
+#u1075_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -53,7 +73,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1074 {
+=======
+#u1075 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1188px;
@@ -65,7 +89,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1074_text {
+=======
+#u1075_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -73,7 +101,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1075_div {
+=======
+#u1076_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -92,7 +124,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1075 {
+=======
+#u1076 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -104,7 +140,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1075_text {
+=======
+#u1076_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -112,7 +152,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1076_div {
+=======
+#u1077_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -129,7 +173,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1076 {
+=======
+#u1077 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1228px;
@@ -139,7 +187,11 @@
   color:#000000;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1076_text {
+=======
+#u1077_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -147,7 +199,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1077 {
+=======
+#u1078 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -155,7 +211,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1078_img {
+=======
+#u1079_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -163,7 +223,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1078 {
+=======
+#u1079 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -171,7 +235,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1078_text {
+=======
+#u1079_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -180,7 +248,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1079_div {
+=======
+#u1080_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -198,7 +270,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1079 {
+=======
+#u1080 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -209,7 +285,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1079_text {
+=======
+#u1080_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -217,7 +297,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1080_div {
+=======
+#u1081_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -236,7 +320,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1080 {
+=======
+#u1081 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -248,7 +336,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1080_text {
+=======
+#u1081_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -256,7 +348,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1081_div {
+=======
+#u1082_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -275,7 +371,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1081 {
+=======
+#u1082 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -287,7 +387,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1081_text {
+=======
+#u1082_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -295,7 +399,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1082_div {
+=======
+#u1083_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -312,7 +420,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1082 {
+=======
+#u1083 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -322,7 +434,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1082_text {
+=======
+#u1083_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -330,7 +446,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1083_img {
+=======
+#u1084_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -338,7 +458,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1083 {
+=======
+#u1084 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:169px;
@@ -351,7 +475,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1083_text {
+=======
+#u1084_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -359,12 +487,20 @@
   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;
@@ -372,7 +508,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1084_state0_content {
+=======
+#u1085_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -380,7 +520,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1085_div {
+=======
+#u1086_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -399,7 +543,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1085 {
+=======
+#u1086 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -411,7 +559,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u519_img {
+=======
+#u520_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u519 {
+=======
+#u520 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u519_text {
+=======
+#u520_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u520 {
+=======
+#u521 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u521_img {
+=======
+#u522_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u521 {
+=======
+#u522 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u521_text {
+=======
+#u522_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u522_div {
+=======
+#u523_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u522 {
+=======
+#u523 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u522_text {
+=======
+#u523_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u523_div {
+=======
+#u524_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u523 {
+=======
+#u524 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u523_text {
+=======
+#u524_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u524_img {
+=======
+#u525_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u524 {
+=======
+#u525 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:457px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u524_text {
+=======
+#u525_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u525_div {
+=======
+#u526_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u525 {
+=======
+#u526 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u525_text {
+=======
+#u526_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u526_div {
+=======
+#u527_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u526 {
+=======
+#u527 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u526_text {
+=======
+#u527_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u527 {
+=======
+#u528 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u528_img {
+=======
+#u529_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u528 {
+=======
+#u529 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u528_text {
+=======
+#u529_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u529_div {
+=======
+#u530_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -304,7 +412,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u529 {
+=======
+#u530 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -316,7 +428,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u529_text {
+=======
+#u530_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:107px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u530_div {
+=======
+#u531_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,7 +460,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u530 {
+=======
+#u531 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -349,7 +473,11 @@
   height:66px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u530_text {
+=======
+#u531_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u531_state0_content {
+=======
+#u532_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u532_div {
+=======
+#u533_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u532 {
+=======
+#u533 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u580_img {
+=======
+#u581_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u580 {
+=======
+#u581 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u580_text {
+=======
+#u581_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u581 {
+=======
+#u582 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u582_img {
+=======
+#u583_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u582 {
+=======
+#u583 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u582_text {
+=======
+#u583_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u583_div {
+=======
+#u584_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u583 {
+=======
+#u584 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u583_text {
+=======
+#u584_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u584_div {
+=======
+#u585_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u584 {
+=======
+#u585 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u584_text {
+=======
+#u585_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u585_div {
+=======
+#u586_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -165,7 +221,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u585 {
+=======
+#u586 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -177,7 +237,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u585_text {
+=======
+#u586_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u586_div {
+=======
+#u587_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -202,7 +270,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u586 {
+=======
+#u587 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -212,7 +284,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u586_text {
+=======
+#u587_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u587_img {
+=======
+#u588_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u587 {
+=======
+#u588 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:149px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u587_text {
+=======
+#u588_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u588 {
+=======
+#u589 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u589_img {
+=======
+#u590_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u589 {
+=======
+#u590 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u589_text {
+=======
+#u590_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u590_div {
+=======
+#u591_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u590 {
+=======
+#u591 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u590_text {
+=======
+#u591_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:146px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u591_div {
+=======
+#u592_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u591 {
+=======
+#u592 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u591_text {
+=======
+#u592_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u592_div {
+=======
+#u593_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -379,7 +511,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u592 {
+=======
+#u593 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1225px;
@@ -389,7 +525,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u592_text {
+=======
+#u593_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -397,7 +537,11 @@
   width:197px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u593 {
+=======
+#u594 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1231px;
@@ -407,12 +551,20 @@
   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;
@@ -420,7 +572,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u594_state0_content {
+=======
+#u595_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -428,7 +584,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u595_div {
+=======
+#u596_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -447,7 +607,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u595 {
+=======
+#u596 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -459,7 +623,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u2051 {
+=======
+#u2052 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2052_img {
+=======
+#u2053_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2052 {
+=======
+#u2053 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2052_text {
+=======
+#u2053_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2053_div {
+=======
+#u2054_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2053 {
+=======
+#u2054 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2053_text {
+=======
+#u2054_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:177px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2054_div {
+=======
+#u2055_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2054 {
+=======
+#u2055 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2054_text {
+=======
+#u2055_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2055_div {
+=======
+#u2056_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2055 {
+=======
+#u2056 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2055_text {
+=======
+#u2056_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:252px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2056_img {
+=======
+#u2057_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -168,7 +224,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2056 {
+=======
+#u2057 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -176,7 +236,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2056_text {
+=======
+#u2057_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2057_img {
+=======
+#u2058_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -193,7 +261,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u2057 {
+=======
+#u2058 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:162px;
@@ -206,7 +278,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u2057_text {
+=======
+#u2058_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -214,7 +290,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2058 {
+=======
+#u2059 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -222,7 +302,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2059_img {
+=======
+#u2060_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -230,7 +314,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u2059 {
+=======
+#u2060 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1181px;
@@ -242,7 +330,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u2059_text {
+=======
+#u2060_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -250,7 +342,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2060_div {
+=======
+#u2061_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,7 +366,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u2060 {
+=======
+#u2061 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1221px;
@@ -283,7 +383,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u2060_text {
+=======
+#u2061_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -291,7 +395,11 @@
   width:143px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2061_div {
+=======
+#u2062_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,7 +415,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2061 {
+=======
+#u2062 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1221px;
@@ -316,7 +428,11 @@
   height:88px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2061_text {
+=======
+#u2062_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2062 {
+=======
+#u2063 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -334,7 +454,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u2063_img {
+=======
+#u2064_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +466,11 @@
   width:245px;
   height:88px;
 }
+<<<<<<< HEAD
 #u2063 {
+=======
+#u2064 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -351,7 +479,11 @@
   height:88px;
   text-align:left;
 }
+<<<<<<< HEAD
 #u2063_text {
+=======
+#u2064_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -359,7 +491,11 @@
   width:241px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2064_div {
+=======
+#u2065_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -376,7 +512,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2064 {
+=======
+#u2065 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -386,7 +526,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2064_text {
+=======
+#u2065_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -394,12 +538,20 @@
   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;
@@ -407,7 +559,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u2065_state0_content {
+=======
+#u2066_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +571,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u2066_div {
+=======
+#u2067_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -434,7 +594,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2066 {
+=======
+#u2067 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -446,7 +610,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u2085 {
+=======
+#u2086 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2086_img {
+=======
+#u2087_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2086 {
+=======
+#u2087 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2086_text {
+=======
+#u2087_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2087_div {
+=======
+#u2088_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2087 {
+=======
+#u2088 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2087_text {
+=======
+#u2088_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:177px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2088_div {
+=======
+#u2089_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2088 {
+=======
+#u2089 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2088_text {
+=======
+#u2089_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2089_div {
+=======
+#u2090_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2089 {
+=======
+#u2090 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2089_text {
+=======
+#u2090_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:252px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2090_img {
+=======
+#u2091_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -168,7 +224,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2090 {
+=======
+#u2091 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -176,7 +236,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2090_text {
+=======
+#u2091_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2091_img {
+=======
+#u2092_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -193,7 +261,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u2091 {
+=======
+#u2092 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1117px;
@@ -206,7 +278,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u2091_text {
+=======
+#u2092_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -214,7 +290,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2092 {
+=======
+#u2093 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -222,7 +302,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2093_img {
+=======
+#u2094_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -230,7 +314,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u2093 {
+=======
+#u2094 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -242,7 +330,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u2093_text {
+=======
+#u2094_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -250,7 +342,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2094_div {
+=======
+#u2095_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -269,7 +365,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2094 {
+=======
+#u2095 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -281,7 +381,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2094_text {
+=======
+#u2095_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -289,7 +393,11 @@
   width:143px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2095_div {
+=======
+#u2096_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2095 {
+=======
+#u2096 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -314,7 +426,11 @@
   height:66px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2095_text {
+=======
+#u2096_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -322,7 +438,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2096_div {
+=======
+#u2097_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -339,7 +459,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2096 {
+=======
+#u2097 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -349,7 +473,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2096_text {
+=======
+#u2097_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u2097_state0_content {
+=======
+#u2098_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u2098_div {
+=======
+#u2099_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2098 {
+=======
+#u2099 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u2067 {
+=======
+#u2068 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2068_img {
+=======
+#u2069_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2068 {
+=======
+#u2069 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2068_text {
+=======
+#u2069_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2069_div {
+=======
+#u2070_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2069 {
+=======
+#u2070 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2069_text {
+=======
+#u2070_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:129px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2070_div {
+=======
+#u2071_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2070 {
+=======
+#u2071 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2070_text {
+=======
+#u2071_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2071_div {
+=======
+#u2072_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2071 {
+=======
+#u2072 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2071_text {
+=======
+#u2072_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:216px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2072_img {
+=======
+#u2073_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -168,7 +224,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2072 {
+=======
+#u2073 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -176,7 +236,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2072_text {
+=======
+#u2073_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -185,7 +249,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2073_img {
+=======
+#u2074_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -193,7 +261,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u2073 {
+=======
+#u2074 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1030px;
@@ -206,7 +278,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u2073_text {
+=======
+#u2074_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -214,7 +290,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2074 {
+=======
+#u2075 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -222,7 +302,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2075_img {
+=======
+#u2076_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -230,7 +314,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u2075 {
+=======
+#u2076 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -242,7 +330,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u2075_text {
+=======
+#u2076_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -250,7 +342,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2076_div {
+=======
+#u2077_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,7 +366,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u2076 {
+=======
+#u2077 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -283,7 +383,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u2076_text {
+=======
+#u2077_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -291,7 +395,11 @@
   width:119px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2077_div {
+=======
+#u2078_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,7 +415,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2077 {
+=======
+#u2078 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -316,7 +428,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2077_text {
+=======
+#u2078_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -324,7 +440,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2078 {
+=======
+#u2079 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -334,7 +454,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u2079_img {
+=======
+#u2080_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +466,11 @@
   width:245px;
   height:88px;
 }
+<<<<<<< HEAD
 #u2079 {
+=======
+#u2080 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -351,7 +479,11 @@
   height:88px;
   text-align:left;
 }
+<<<<<<< HEAD
 #u2079_text {
+=======
+#u2080_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -359,7 +491,11 @@
   width:241px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2080_div {
+=======
+#u2081_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -376,7 +512,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2080 {
+=======
+#u2081 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -386,7 +526,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2080_text {
+=======
+#u2081_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -394,12 +538,20 @@
   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;
@@ -407,7 +559,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u2081_state0_content {
+=======
+#u2082_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +571,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u2082_div {
+=======
+#u2083_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -434,7 +594,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2082 {
+=======
+#u2083 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -446,7 +610,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2082_text {
+=======
+#u2083_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -454,12 +622,20 @@
   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;
@@ -467,7 +643,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u2083_state0_content {
+=======
+#u2084_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -475,7 +655,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u2084_div {
+=======
+#u2085_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -494,7 +678,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2084 {
+=======
+#u2085 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -506,7 +694,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1512_div {
+=======
+#u1513_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -29,7 +33,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1512 {
+=======
+#u1513 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -39,7 +47,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1512_text {
+=======
+#u1513_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -47,7 +59,11 @@
   width:741px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1513 {
+=======
+#u1514 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -55,7 +71,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1514_img {
+=======
+#u1515_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1514 {
+=======
+#u1515 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -71,7 +95,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1514_text {
+=======
+#u1515_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -80,7 +108,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1515_div {
+=======
+#u1516_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -98,7 +130,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1515 {
+=======
+#u1516 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -109,7 +145,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1515_text {
+=======
+#u1516_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -117,7 +157,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1516_div {
+=======
+#u1517_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -136,7 +180,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1516 {
+=======
+#u1517 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -148,7 +196,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1516_text {
+=======
+#u1517_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -156,7 +208,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1517_div {
+=======
+#u1518_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -175,7 +231,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1517 {
+=======
+#u1518 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -187,7 +247,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1517_text {
+=======
+#u1518_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:202px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1518 {
+=======
+#u1519 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1519_img {
+=======
+#u1520_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -211,7 +283,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1519 {
+=======
+#u1520 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -223,7 +299,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1519_text {
+=======
+#u1520_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -231,7 +311,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1520_div {
+=======
+#u1521_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -250,7 +334,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1520 {
+=======
+#u1521 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -262,7 +350,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1520_text {
+=======
+#u1521_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -270,7 +362,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1521_div {
+=======
+#u1522_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -286,7 +382,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1521 {
+=======
+#u1522 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -295,7 +395,11 @@
   height:66px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1521_text {
+=======
+#u1522_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -303,7 +407,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1522_img {
+=======
+#u1523_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -311,7 +419,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1522 {
+=======
+#u1523 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -319,7 +431,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1522_text {
+=======
+#u1523_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -328,7 +444,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1523_img {
+=======
+#u1524_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -336,7 +456,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1523 {
+=======
+#u1524 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:226px;
@@ -349,7 +473,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1523_text {
+=======
+#u1524_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1524_state0_content {
+=======
+#u1525_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1525_div {
+=======
+#u1526_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1525 {
+=======
+#u1526 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1495_img {
+=======
+#u1496_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1495 {
+=======
+#u1496 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1495_text {
+=======
+#u1496_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1496_img {
+=======
+#u1497_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1496 {
+=======
+#u1497 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -53,7 +73,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1496_text {
+=======
+#u1497_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -62,7 +86,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1497 {
+=======
+#u1498 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1498_img {
+=======
+#u1499_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -78,7 +110,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1498 {
+=======
+#u1499 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -86,7 +122,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1498_text {
+=======
+#u1499_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -95,7 +135,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1499_div {
+=======
+#u1500_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -113,7 +157,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1499 {
+=======
+#u1500 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -124,7 +172,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1499_text {
+=======
+#u1500_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -132,7 +184,11 @@
   width:49px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1500_div {
+=======
+#u1501_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -151,7 +207,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1500 {
+=======
+#u1501 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -163,7 +223,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1500_text {
+=======
+#u1501_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -171,7 +235,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1501_div {
+=======
+#u1502_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -190,7 +258,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1501 {
+=======
+#u1502 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:30px;
@@ -202,7 +274,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1501_text {
+=======
+#u1502_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -210,7 +286,11 @@
   width:156px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1502_div {
+=======
+#u1503_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -227,7 +307,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1502 {
+=======
+#u1503 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:59px;
@@ -237,7 +321,11 @@
   font-size:16px;
   line-height:28px;
 }
+<<<<<<< HEAD
 #u1502_text {
+=======
+#u1503_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -245,7 +333,11 @@
   width:1104px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1503_img {
+=======
+#u1504_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -253,7 +345,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1503 {
+=======
+#u1504 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1095px;
@@ -266,7 +362,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1503_text {
+=======
+#u1504_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -274,7 +374,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1504 {
+=======
+#u1505 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -282,7 +386,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1505_img {
+=======
+#u1506_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -290,7 +398,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1505 {
+=======
+#u1506 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1195px;
@@ -302,7 +414,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1505_text {
+=======
+#u1506_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -310,7 +426,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1506_div {
+=======
+#u1507_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -330,7 +450,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1506 {
+=======
+#u1507 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -343,7 +467,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1506_text {
+=======
+#u1507_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -351,7 +479,11 @@
   width:77px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1507_div {
+=======
+#u1508_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -367,7 +499,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1507 {
+=======
+#u1508 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -376,7 +512,11 @@
   height:220px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1507_text {
+=======
+#u1508_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -384,7 +524,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1508 {
+=======
+#u1509 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1240px;
@@ -394,7 +538,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1509_div {
+=======
+#u1510_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +563,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1509 {
+=======
+#u1510 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1235px;
@@ -426,7 +578,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1509_text {
+=======
+#u1510_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -434,12 +590,20 @@
   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;
@@ -447,11 +611,24 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1510_state0_content {
+=======
+#u1511_state0_content {
+  border-width:0px;
+  position:absolute;
+  left:0px;
+  top:0px;
+  width:1px;
+  height:1px;
+}
+#u1512_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
   top:0px;
+<<<<<<< HEAD
   width:1px;
   height:1px;
 }
@@ -460,6 +637,8 @@
   position:absolute;
   left:0px;
   top:0px;
+=======
+>>>>>>> 0601optimize
   width:140px;
   height:40px;
   background:inherit;
@@ -474,7 +653,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1511 {
+=======
+#u1512 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -486,7 +669,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u563_img {
+=======
+#u564_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u563 {
+=======
+#u564 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u563_text {
+=======
+#u564_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u564 {
+=======
+#u565 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u565_img {
+=======
+#u566_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u565 {
+=======
+#u566 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u565_text {
+=======
+#u566_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u566_div {
+=======
+#u567_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u566 {
+=======
+#u567 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u566_text {
+=======
+#u567_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u567_div {
+=======
+#u568_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u567 {
+=======
+#u568 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u567_text {
+=======
+#u568_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u568_img {
+=======
+#u569_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u568 {
+=======
+#u569 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1104px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u568_text {
+=======
+#u569_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u569_div {
+=======
+#u570_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u569 {
+=======
+#u570 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u569_text {
+=======
+#u570_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u570_div {
+=======
+#u571_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u570 {
+=======
+#u571 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u570_text {
+=======
+#u571_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u571 {
+=======
+#u572 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u572_img {
+=======
+#u573_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u572 {
+=======
+#u573 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u572_text {
+=======
+#u573_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u573_div {
+=======
+#u574_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u573 {
+=======
+#u574 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u573_text {
+=======
+#u574_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:180px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u574_div {
+=======
+#u575_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u574 {
+=======
+#u575 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:24px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u574_text {
+=======
+#u575_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u575 {
+=======
+#u576 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -369,7 +501,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u576_div {
+=======
+#u577_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -389,7 +525,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u576 {
+=======
+#u577 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -399,7 +539,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u576_text {
+=======
+#u577_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -407,7 +551,11 @@
   width:242px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u577_img {
+=======
+#u578_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +563,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u577 {
+=======
+#u578 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -423,7 +575,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u577_text {
+=======
+#u578_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -432,12 +588,20 @@
   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;
@@ -445,7 +609,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u578_state0_content {
+=======
+#u579_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -453,7 +621,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u579_div {
+=======
+#u580_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -472,7 +644,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u579 {
+=======
+#u580 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -484,7 +660,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u820_img {
+=======
+#u821_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u820 {
+=======
+#u821 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u820_text {
+=======
+#u821_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u821 {
+=======
+#u822 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u822_img {
+=======
+#u823_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -53,7 +73,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u822 {
+=======
+#u823 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -61,7 +85,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u822_text {
+=======
+#u823_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -70,7 +98,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u823_div {
+=======
+#u824_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -88,7 +120,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u823 {
+=======
+#u824 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -99,7 +135,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u823_text {
+=======
+#u824_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -107,7 +147,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u824_div {
+=======
+#u825_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -126,7 +170,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u824 {
+=======
+#u825 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -138,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u824_text {
+=======
+#u825_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -146,7 +198,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u825_img {
+=======
+#u826_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -154,7 +210,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u825 {
+=======
+#u826 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1104px;
@@ -167,7 +227,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u825_text {
+=======
+#u826_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -175,7 +239,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u826_div {
+=======
+#u827_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -194,7 +262,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u826 {
+=======
+#u827 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -206,7 +278,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u826_text {
+=======
+#u827_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -214,7 +290,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u827_div {
+=======
+#u828_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +311,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u827 {
+=======
+#u828 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -241,7 +325,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u827_text {
+=======
+#u828_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -249,7 +337,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u828 {
+=======
+#u829 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u829_img {
+=======
+#u830_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u829 {
+=======
+#u830 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u829_text {
+=======
+#u830_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u830_div {
+=======
+#u831_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u830 {
+=======
+#u831 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u830_text {
+=======
+#u831_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:180px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u831_div {
+=======
+#u832_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u831 {
+=======
+#u832 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:24px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u831_text {
+=======
+#u832_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u832 {
+=======
+#u833 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -369,7 +501,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u833_div {
+=======
+#u834_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -389,7 +525,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u833 {
+=======
+#u834 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -399,7 +539,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u833_text {
+=======
+#u834_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -407,7 +551,11 @@
   width:242px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u834_img {
+=======
+#u835_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +563,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u834 {
+=======
+#u835 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -423,7 +575,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u834_text {
+=======
+#u835_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -432,12 +588,20 @@
   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;
@@ -445,7 +609,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u835_state0_content {
+=======
+#u836_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -453,7 +621,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u836_div {
+=======
+#u837_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -472,7 +644,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u836 {
+=======
+#u837 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -484,7 +660,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1132 {
+=======
+#u1133 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1133_img {
+=======
+#u1134_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1133 {
+=======
+#u1134 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1133_text {
+=======
+#u1134_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1134_div {
+=======
+#u1135_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1134 {
+=======
+#u1135 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u1134_text {
+=======
+#u1135_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1135_div {
+=======
+#u1136_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1135 {
+=======
+#u1136 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1135_text {
+=======
+#u1136_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1136_div {
+=======
+#u1137_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1136 {
+=======
+#u1137 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1136_text {
+=======
+#u1137_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1137_div {
+=======
+#u1138_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1137 {
+=======
+#u1138 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:58px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1137_text {
+=======
+#u1138_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:884px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1138_img {
+=======
+#u1139_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1138 {
+=======
+#u1139 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -211,7 +283,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1138_text {
+=======
+#u1139_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -220,7 +296,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1139_img {
+=======
+#u1140_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -228,7 +308,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1139 {
+=======
+#u1140 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1103px;
@@ -241,7 +325,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1139_text {
+=======
+#u1140_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -249,7 +337,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1140 {
+=======
+#u1141 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -257,7 +349,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1141_img {
+=======
+#u1142_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -265,7 +361,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1141 {
+=======
+#u1142 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -277,7 +377,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1141_text {
+=======
+#u1142_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +389,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1142_div {
+=======
+#u1143_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +413,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1142 {
+=======
+#u1143 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -318,7 +430,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1142_text {
+=======
+#u1143_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -326,7 +442,11 @@
   width:180px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1143_div {
+=======
+#u1144_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -342,7 +462,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1143 {
+=======
+#u1144 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -351,7 +475,11 @@
   height:34px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1143_text {
+=======
+#u1144_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -359,7 +487,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1144 {
+=======
+#u1145 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -369,7 +501,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1145_div {
+=======
+#u1146_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -389,7 +525,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1145 {
+=======
+#u1146 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -399,7 +539,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1145_text {
+=======
+#u1146_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -407,12 +551,20 @@
   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;
@@ -420,7 +572,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1146_state0_content {
+=======
+#u1147_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -428,7 +584,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1147_div {
+=======
+#u1148_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -447,7 +607,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1147 {
+=======
+#u1148 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -459,7 +623,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1147_text {
+=======
+#u1148_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;

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

@@ -3,7 +3,7 @@
   background-image:none;
   position:static;
   left:auto;
-  width:1583px;
+  width:1561px;
   margin-left:0;
   margin-right:0;
   text-align:left;
@@ -176,7 +176,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:661px;
+  width:922px;
   height:72px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -193,7 +193,7 @@
   position:absolute;
   left:58px;
   top:119px;
-  width:661px;
+  width:922px;
   height:72px;
   font-size:16px;
   line-height:24px;
@@ -203,7 +203,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:661px;
+  width:922px;
   word-wrap:break-word;
 }
 #u7_div {
@@ -287,7 +287,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:119px;
   height:19px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -305,8 +305,8 @@
   border-width:0px;
   position:absolute;
   left:1231px;
-  top:250px;
-  width:131px;
+  top:251px;
+  width:119px;
   height:19px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -318,7 +318,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:119px;
   word-wrap:break-word;
 }
 #u11_div {
@@ -326,7 +326,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:319px;
   height:44px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -341,8 +341,8 @@
   border-width:0px;
   position:absolute;
   left:1231px;
-  top:288px;
-  width:352px;
+  top:302px;
+  width:319px;
   height:44px;
   line-height:22px;
 }
@@ -351,7 +351,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:319px;
   word-wrap:break-word;
 }
 #u12_img {
@@ -387,7 +387,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   height:19px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -404,9 +404,9 @@
 #u13 {
   border-width:0px;
   position:absolute;
-  left:1229px;
+  left:1226px;
   top:359px;
-  width:131px;
+  width:120px;
   height:19px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -418,7 +418,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   word-wrap:break-word;
 }
 #u14_div {
@@ -426,8 +426,8 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
-  height:154px;
+  width:322px;
+  height:176px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
   border:none;
@@ -440,10 +440,10 @@
 #u14 {
   border-width:0px;
   position:absolute;
-  left:1229px;
+  left:1226px;
   top:397px;
-  width:352px;
-  height:154px;
+  width:322px;
+  height:176px;
   line-height:22px;
 }
 #u14_text {
@@ -451,15 +451,15 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:322px;
   word-wrap:break-word;
 }
 #u15 {
   border-width:0px;
   position:absolute;
-  left:1435px;
+  left:1473px;
   top:440px;
-  width:88px;
+  width:67px;
   height:22px;
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
@@ -487,8 +487,8 @@
 #u16 {
   border-width:0px;
   position:absolute;
-  left:1300px;
-  top:462px;
+  left:1270px;
+  top:396px;
   width:258px;
   height:39px;
   font-size:11px;
@@ -507,8 +507,13 @@
   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;
@@ -526,10 +531,17 @@
 #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;
@@ -538,14 +550,14 @@
   border-width:0px;
   position:absolute;
   left:2px;
-  top:12px;
-  width:324px;
+  top:26px;
+  width:298px;
   word-wrap:break-word;
 }
 #u18 {
   border-width:0px;
   position:absolute;
-  left:1277px;
+  left:1314px;
   top:440px;
   width:57px;
   height:22px;
@@ -557,8 +569,8 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
-  height:66px;
+  width:172px;
+  height:84px;
   background:inherit;
   background-color:rgba(255, 255, 0, 1);
   box-sizing:border-box;
@@ -574,10 +586,10 @@
 #u19 {
   border-width:0px;
   position:absolute;
-  left:1222px;
-  top:528px;
-  width:352px;
-  height:66px;
+  left:1250px;
+  top:558px;
+  width:172px;
+  height:84px;
   line-height:18px;
 }
 #u19_text {
@@ -585,14 +597,14 @@
   position:absolute;
   left:2px;
   top:15px;
-  width:348px;
+  width:168px;
   word-wrap:break-word;
 }
 #u20 {
   border-width:0px;
   position:absolute;
-  left:1438px;
-  top:507px;
+  left:1278px;
+  top:530px;
   width:65px;
   height:21px;
   overflow:hidden;
@@ -601,8 +613,8 @@
 #u21 {
   border-width:0px;
   position:absolute;
-  left:1331px;
-  top:484px;
+  left:1446px;
+  top:486px;
   width:81px;
   height:21px;
   overflow:hidden;
@@ -632,8 +644,8 @@
 #u22 {
   border-width:0px;
   position:absolute;
-  left:1311px;
-  top:418px;
+  left:1257px;
+  top:423px;
   width:267px;
   height:56px;
   font-size:11px;
@@ -697,7 +709,7 @@
   border-width:0px;
   position:absolute;
   left:1186px;
-  top:561px;
+  top:590px;
   width:30px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
@@ -719,7 +731,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   height:19px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -736,9 +748,9 @@
 #u26 {
   border-width:0px;
   position:absolute;
-  left:1226px;
-  top:568px;
-  width:131px;
+  left:1223px;
+  top:597px;
+  width:120px;
   height:19px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -750,7 +762,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   word-wrap:break-word;
 }
 #u27_div {
@@ -758,7 +770,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:322px;
   height:44px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -772,9 +784,9 @@
 #u27 {
   border-width:0px;
   position:absolute;
-  left:1226px;
-  top:606px;
-  width:352px;
+  left:1223px;
+  top:635px;
+  width:322px;
   height:44px;
   line-height:22px;
 }
@@ -783,7 +795,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:322px;
   word-wrap:break-word;
 }
 #u28 {
@@ -2816,7 +2828,7 @@
 }
 #u103 {
   position:fixed;
-  right:0px;
+  left:1382px;
   top:68px;
   width:140px;
   height:40px;
@@ -2924,15 +2936,15 @@
   position:absolute;
   left:-4px;
   top:-4px;
-  width:40px;
+  width:37px;
   height:40px;
 }
 #u107 {
   border-width:0px;
   position:absolute;
   left:1186px;
-  top:665px;
-  width:30px;
+  top:694px;
+  width:27px;
   height:30px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -2945,7 +2957,7 @@
   position:absolute;
   left:2px;
   top:4px;
-  width:26px;
+  width:23px;
   word-wrap:break-word;
 }
 #u108_div {
@@ -2953,7 +2965,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   height:19px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -2970,9 +2982,9 @@
 #u108 {
   border-width:0px;
   position:absolute;
-  left:1226px;
-  top:672px;
-  width:131px;
+  left:1223px;
+  top:701px;
+  width:120px;
   height:19px;
   font-family:'Arial Negreta', 'Arial Normal', 'Arial';
   font-weight:700;
@@ -2984,7 +2996,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:131px;
+  width:120px;
   word-wrap:break-word;
 }
 #u109_div {
@@ -2992,7 +3004,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:322px;
   height:22px;
   background:inherit;
   background-color:rgba(255, 255, 255, 0);
@@ -3006,9 +3018,9 @@
 #u109 {
   border-width:0px;
   position:absolute;
-  left:1226px;
-  top:710px;
-  width:352px;
+  left:1223px;
+  top:739px;
+  width:322px;
   height:22px;
   line-height:22px;
 }
@@ -3017,7 +3029,7 @@
   position:absolute;
   left:0px;
   top:0px;
-  width:352px;
+  width:322px;
   word-wrap:break-word;
 }
 #u110_div {
@@ -3043,8 +3055,13 @@
 #u110 {
   border-width:0px;
   position:absolute;
+<<<<<<< HEAD
   left:1259px;
   top:432px;
+=======
+  left:1252px;
+  top:556px;
+>>>>>>> 0601optimize
   width:264px;
   height:88px;
   text-align:left;
@@ -3061,10 +3078,27 @@
 #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;
+  left:1226px;
+  top:464px;
+  width:17px;
+  height:22px;
+  overflow:hidden;
+  background-image:url('../../resources/images/transparent.gif');
+}
+>>>>>>> 0601optimize

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

@@ -12,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u305_div {
+=======
+#u306_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -29,7 +33,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u305 {
+=======
+#u306 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -39,7 +47,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u305_text {
+=======
+#u306_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -48,7 +60,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u306 {
+=======
+#u307 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -56,7 +72,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u307_img {
+=======
+#u308_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -64,7 +84,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u307 {
+=======
+#u308 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -72,7 +96,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u307_text {
+=======
+#u308_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -81,7 +109,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u308_div {
+=======
+#u309_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -99,7 +131,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u308 {
+=======
+#u309 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -110,7 +146,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u308_text {
+=======
+#u309_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -118,7 +158,11 @@
   width:145px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u309_div {
+=======
+#u310_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -137,7 +181,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u309 {
+=======
+#u310 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -149,7 +197,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u309_text {
+=======
+#u310_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -157,7 +209,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u310_div {
+=======
+#u311_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -174,7 +230,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u310 {
+=======
+#u311 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:48px;
@@ -184,7 +244,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u310_text {
+=======
+#u311_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -192,7 +256,11 @@
   width:1128px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u311_div {
+=======
+#u312_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -211,7 +279,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u311 {
+=======
+#u312 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -223,7 +295,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u311_text {
+=======
+#u312_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +307,11 @@
   width:233px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u312 {
+=======
+#u313 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -239,7 +319,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u313_img {
+=======
+#u314_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -247,7 +331,11 @@
   width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u313 {
+=======
+#u314 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -260,7 +348,11 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u313_text {
+=======
+#u314_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -268,7 +360,11 @@
   width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u314_div {
+=======
+#u315_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -287,7 +383,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u314 {
+=======
+#u315 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -299,7 +399,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u314_text {
+=======
+#u315_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,7 +411,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u315_div {
+=======
+#u316_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -323,7 +431,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u315 {
+=======
+#u316 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -332,7 +444,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u315_text {
+=======
+#u316_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -340,7 +456,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u316_img {
+=======
+#u317_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -348,7 +468,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u316 {
+=======
+#u317 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -356,7 +480,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u316_text {
+=======
+#u317_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -365,7 +493,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u317_img {
+=======
+#u318_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -373,7 +505,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u317 {
+=======
+#u318 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -381,7 +517,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u317_text {
+=======
+#u318_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -390,7 +530,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u318_img {
+=======
+#u319_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -398,7 +542,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u318 {
+=======
+#u319 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:371px;
@@ -411,7 +559,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u318_text {
+=======
+#u319_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -419,7 +571,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u319_img {
+=======
+#u320_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -427,7 +583,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u319 {
+=======
+#u320 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:163px;
@@ -440,7 +600,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u319_text {
+=======
+#u320_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -448,12 +612,20 @@
   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;
@@ -461,7 +633,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u320_state0_content {
+=======
+#u321_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -469,7 +645,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u321_div {
+=======
+#u322_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -487,7 +667,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u321 {
+=======
+#u322 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -498,7 +682,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u321_text {
+=======
+#u322_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -506,7 +694,11 @@
   width:136px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u322 {
+=======
+#u323 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1562px;
@@ -516,7 +708,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u323 {
+=======
+#u324 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -524,7 +720,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u324_img {
+=======
+#u325_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -532,7 +732,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u324 {
+=======
+#u325 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -544,7 +748,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u324_text {
+=======
+#u325_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -552,7 +760,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u325_div {
+=======
+#u326_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -571,7 +783,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u325 {
+=======
+#u326 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -583,7 +799,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u325_text {
+=======
+#u326_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -591,7 +811,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u326_div {
+=======
+#u327_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -607,7 +831,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u326 {
+=======
+#u327 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -616,7 +844,11 @@
   height:110px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u326_text {
+=======
+#u327_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -624,7 +856,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u327 {
+=======
+#u328 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1431px;
@@ -634,7 +870,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u328_div {
+=======
+#u329_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -654,7 +894,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u328 {
+=======
+#u329 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1273px;
@@ -664,7 +908,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u328_text {
+=======
+#u329_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -672,7 +920,11 @@
   width:275px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u329 {
+=======
+#u330 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -682,7 +934,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u330 {
+=======
+#u331 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1366px;
@@ -692,7 +948,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u331 {
+=======
+#u332 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1564px;
@@ -702,7 +962,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u332 {
+=======
+#u333 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -712,7 +976,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u333_div {
+=======
+#u334_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -732,7 +1000,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u333 {
+=======
+#u334 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1223px;
@@ -742,7 +1014,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u333_text {
+=======
+#u334_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -750,7 +1026,11 @@
   width:219px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u334 {
+=======
+#u335 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1551px;
@@ -760,7 +1040,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u335_div {
+=======
+#u336_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -780,7 +1064,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u335 {
+=======
+#u336 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1320px;
@@ -790,7 +1078,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u335_text {
+=======
+#u336_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -798,7 +1090,11 @@
   width:237px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u336_div {
+=======
+#u337_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -818,7 +1114,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u336 {
+=======
+#u337 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -828,7 +1128,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u337_div {
+=======
+#u338_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -29,7 +33,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u337 {
+=======
+#u338 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:42px;
@@ -39,7 +47,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u337_text {
+=======
+#u338_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -48,7 +60,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u338 {
+=======
+#u339 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -56,7 +72,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u339_img {
+=======
+#u340_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -64,7 +84,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u339 {
+=======
+#u340 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -72,7 +96,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u339_text {
+=======
+#u340_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -81,7 +109,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u340_div {
+=======
+#u341_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -99,7 +131,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u340 {
+=======
+#u341 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -110,7 +146,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u340_text {
+=======
+#u341_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -118,7 +158,11 @@
   width:145px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u341_div {
+=======
+#u342_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -137,7 +181,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u341 {
+=======
+#u342 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -149,7 +197,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u341_text {
+=======
+#u342_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -157,7 +209,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u342_div {
+=======
+#u343_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -174,7 +230,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u342 {
+=======
+#u343 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:42px;
@@ -184,7 +244,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u342_text {
+=======
+#u343_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -192,7 +256,11 @@
   width:1128px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u343_div {
+=======
+#u344_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -211,7 +279,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u343 {
+=======
+#u344 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -223,7 +295,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u343_text {
+=======
+#u344_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -231,7 +307,11 @@
   width:233px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u344_img {
+=======
+#u345_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -239,7 +319,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u344 {
+=======
+#u345 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -247,7 +331,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u344_text {
+=======
+#u345_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -256,7 +344,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u345_img {
+=======
+#u346_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -264,7 +356,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u345 {
+=======
+#u346 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:421px;
@@ -277,7 +373,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u345_text {
+=======
+#u346_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -285,7 +385,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u346_img {
+=======
+#u347_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -293,7 +397,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u346 {
+=======
+#u347 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:142px;
@@ -306,7 +414,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u346_text {
+=======
+#u347_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -314,7 +426,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u347 {
+=======
+#u348 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -322,7 +438,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u348_img {
+=======
+#u349_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -330,7 +450,11 @@
   width:40px;
   height:40px;
 }
+<<<<<<< HEAD
 #u348 {
+=======
+#u349 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1173px;
@@ -343,7 +467,11 @@
   font-size:18px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u348_text {
+=======
+#u349_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -351,7 +479,11 @@
   width:26px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u349_div {
+=======
+#u350_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -371,7 +503,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u349 {
+=======
+#u350 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -384,7 +520,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u349_text {
+=======
+#u350_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -392,7 +532,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u350_div {
+=======
+#u351_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -408,7 +552,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u350 {
+=======
+#u351 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1213px;
@@ -417,7 +565,11 @@
   height:66px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u350_text {
+=======
+#u351_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -425,7 +577,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u351_img {
+=======
+#u352_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -433,7 +589,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u351 {
+=======
+#u352 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -441,7 +601,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u351_text {
+=======
+#u352_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -450,7 +614,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u352 {
+=======
+#u353 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1219px;
@@ -460,7 +628,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u353_div {
+=======
+#u354_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -480,7 +652,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u353 {
+=======
+#u354 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1219px;
@@ -490,7 +666,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u353_text {
+=======
+#u354_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -498,12 +678,20 @@
   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;
@@ -511,7 +699,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u354_state0_content {
+=======
+#u355_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -519,7 +711,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u355_div {
+=======
+#u356_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -537,7 +733,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u355 {
+=======
+#u356 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -548,7 +748,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u355_text {
+=======
+#u356_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -556,7 +760,11 @@
   width:136px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u356 {
+=======
+#u357 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -564,7 +772,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u357_img {
+=======
+#u358_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -572,7 +784,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u357 {
+=======
+#u358 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1169px;
@@ -584,7 +800,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u357_text {
+=======
+#u358_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -592,7 +812,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u358_div {
+=======
+#u359_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -611,7 +835,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u358 {
+=======
+#u359 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1209px;
@@ -623,7 +851,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u358_text {
+=======
+#u359_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -631,7 +863,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u359_div {
+=======
+#u360_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -647,7 +883,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u359 {
+=======
+#u360 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1209px;
@@ -656,7 +896,11 @@
   height:88px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u359_text {
+=======
+#u360_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -664,7 +908,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u360 {
+=======
+#u361 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1261px;
@@ -674,7 +922,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u361_div {
+=======
+#u362_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -694,7 +946,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u361 {
+=======
+#u362 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1153px;
@@ -704,7 +960,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u361_text {
+=======
+#u362_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -712,7 +972,11 @@
   width:297px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u362 {
+=======
+#u363 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1391px;
@@ -722,7 +986,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u363_div {
+=======
+#u364_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -742,7 +1010,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u363 {
+=======
+#u364 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1312px;
@@ -752,7 +1024,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u363_text {
+=======
+#u364_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -760,7 +1036,11 @@
   width:219px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u364 {
+=======
+#u365 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1207px;
@@ -770,7 +1050,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u365_div {
+=======
+#u366_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -790,7 +1074,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u365 {
+=======
+#u366 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1207px;
@@ -800,7 +1088,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u365_text {
+=======
+#u366_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -808,7 +1100,11 @@
   width:258px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u366 {
+=======
+#u367 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1547px;
@@ -818,7 +1114,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u367 {
+=======
+#u368 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1385px;
@@ -828,7 +1128,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u368_div {
+=======
+#u369_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -848,7 +1152,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u368 {
+=======
+#u369 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1326px;
@@ -858,7 +1166,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u1148 {
+=======
+#u1149 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1149_img {
+=======
+#u1150_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1149 {
+=======
+#u1150 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u1149_text {
+=======
+#u1150_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1150_div {
+=======
+#u1151_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -64,7 +84,11 @@
   font-style:normal;
   color:#000000;
 }
+<<<<<<< HEAD
 #u1150 {
+=======
+#u1151 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -76,7 +100,11 @@
   font-style:normal;
   color:#000000;
 }
+<<<<<<< HEAD
 #u1150_text {
+=======
+#u1151_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -84,7 +112,11 @@
   width:457px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1151_div {
+=======
+#u1152_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -103,7 +135,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1151 {
+=======
+#u1152 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -115,7 +151,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1151_text {
+=======
+#u1152_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -123,7 +163,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1152_div {
+=======
+#u1153_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -142,7 +186,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1152 {
+=======
+#u1153 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -154,7 +202,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u1152_text {
+=======
+#u1153_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -162,7 +214,11 @@
   width:462px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u1153_div {
+=======
+#u1154_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -179,7 +235,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1153 {
+=======
+#u1154 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -189,7 +249,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u1153_text {
+=======
+#u1154_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -197,7 +261,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1154 {
+=======
+#u1155 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -205,7 +273,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u1155_img {
+=======
+#u1156_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -213,7 +285,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u1155 {
+=======
+#u1156 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -225,7 +301,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u1155_text {
+=======
+#u1156_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -233,7 +313,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1156_div {
+=======
+#u1157_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -253,7 +337,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1156 {
+=======
+#u1157 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -266,7 +354,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u1156_text {
+=======
+#u1157_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -274,7 +366,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1157_div {
+=======
+#u1158_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -290,7 +386,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1157 {
+=======
+#u1158 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -299,7 +399,11 @@
   height:44px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u1157_text {
+=======
+#u1158_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -307,7 +411,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1158_img {
+=======
+#u1159_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -315,7 +423,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1158 {
+=======
+#u1159 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -323,7 +435,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u1158_text {
+=======
+#u1159_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -332,7 +448,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1159_img {
+=======
+#u1160_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -340,7 +460,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u1159 {
+=======
+#u1160 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:640px;
@@ -353,7 +477,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u1159_text {
+=======
+#u1160_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -361,7 +489,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u1160 {
+=======
+#u1161 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -371,7 +503,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u1161_div {
+=======
+#u1162_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -391,7 +527,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1161 {
+=======
+#u1162 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -401,7 +541,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u1161_text {
+=======
+#u1162_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -409,12 +553,20 @@
   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;
@@ -422,7 +574,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u1162_state0_content {
+=======
+#u1163_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -430,7 +586,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u1163_div {
+=======
+#u1164_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -449,7 +609,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u1163 {
+=======
+#u1164 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -461,7 +625,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u2799_img {
+=======
+#u2800_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2799 {
+=======
+#u2800 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -28,7 +36,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u2799_text {
+=======
+#u2800_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -37,7 +49,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2800_img {
+=======
+#u2801_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -45,7 +61,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u2800 {
+=======
+#u2801 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1039px;
@@ -58,7 +78,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u2800_text {
+=======
+#u2801_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -66,7 +90,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2801 {
+=======
+#u2802 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -74,7 +102,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2802_img {
+=======
+#u2803_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -82,7 +114,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u2802 {
+=======
+#u2803 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1186px;
@@ -94,7 +130,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u2802_text {
+=======
+#u2803_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -102,7 +142,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2803_div {
+=======
+#u2804_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +165,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2803 {
+=======
+#u2804 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -133,7 +181,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2803_text {
+=======
+#u2804_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -141,7 +193,11 @@
   width:198px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2804_div {
+=======
+#u2805_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -157,7 +213,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2804 {
+=======
+#u2805 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1226px;
@@ -166,7 +226,11 @@
   height:22px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u2804_text {
+=======
+#u2805_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -174,7 +238,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2805 {
+=======
+#u2806 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -182,7 +250,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u2806_img {
+=======
+#u2807_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -190,7 +262,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2806 {
+=======
+#u2807 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:7px;
@@ -198,7 +274,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u2806_text {
+=======
+#u2807_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -207,7 +287,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2807_div {
+=======
+#u2808_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -225,7 +309,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2807 {
+=======
+#u2808 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -236,7 +324,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u2807_text {
+=======
+#u2808_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -244,7 +336,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2808_div {
+=======
+#u2809_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -263,7 +359,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2808 {
+=======
+#u2809 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -275,7 +375,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2808_text {
+=======
+#u2809_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -283,7 +387,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u2809_div {
+=======
+#u2810_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -300,7 +408,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2809 {
+=======
+#u2810 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:57px;
@@ -310,7 +422,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u2809_text {
+=======
+#u2810_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -318,7 +434,11 @@
   width:865px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u2810_div {
+=======
+#u2811_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -337,7 +457,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2810 {
+=======
+#u2811 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:21px;
@@ -349,7 +473,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u2810_text {
+=======
+#u2811_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -357,12 +485,20 @@
   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;
@@ -370,7 +506,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u2811_state0_content {
+=======
+#u2812_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +518,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u2812_div {
+=======
+#u2813_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -397,7 +541,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u2812 {
+=======
+#u2813 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -409,7 +557,11 @@
   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,7 +12,11 @@
   position:absolute;
   z-index:0;
 }
+<<<<<<< HEAD
 #u803 {
+=======
+#u804 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -20,7 +24,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u804_img {
+=======
+#u805_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -28,7 +36,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u804 {
+=======
+#u805 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:8px;
@@ -36,7 +48,11 @@
   width:8px;
   height:28px;
 }
+<<<<<<< HEAD
 #u804_text {
+=======
+#u805_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -45,7 +61,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u805_div {
+=======
+#u806_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -63,7 +83,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u805 {
+=======
+#u806 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -74,7 +98,11 @@
   font-weight:700;
   font-style:normal;
 }
+<<<<<<< HEAD
 #u805_text {
+=======
+#u806_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -82,7 +110,11 @@
   width:97px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u806_div {
+=======
+#u807_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -101,7 +133,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u806 {
+=======
+#u807 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -113,7 +149,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u806_text {
+=======
+#u807_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -121,7 +161,11 @@
   width:109px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u807_div {
+=======
+#u808_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -140,7 +184,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u807 {
+=======
+#u808 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -152,7 +200,11 @@
   font-style:normal;
   font-size:18px;
 }
+<<<<<<< HEAD
 #u807_text {
+=======
+#u808_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -160,7 +212,11 @@
   width:192px;
   white-space:nowrap;
 }
+<<<<<<< HEAD
 #u808_div {
+=======
+#u809_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -177,7 +233,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u808 {
+=======
+#u809 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:56px;
@@ -187,7 +247,11 @@
   font-size:16px;
   line-height:24px;
 }
+<<<<<<< HEAD
 #u808_text {
+=======
+#u809_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -195,7 +259,11 @@
   width:1121px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u809 {
+=======
+#u810 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -203,7 +271,11 @@
   width:0px;
   height:0px;
 }
+<<<<<<< HEAD
 #u810_img {
+=======
+#u811_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -211,7 +283,11 @@
   width:44px;
   height:44px;
 }
+<<<<<<< HEAD
 #u810 {
+=======
+#u811 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1187px;
@@ -223,7 +299,11 @@
   font-style:normal;
   font-size:26px;
 }
+<<<<<<< HEAD
 #u810_text {
+=======
+#u811_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -231,7 +311,11 @@
   width:30px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u811_div {
+=======
+#u812_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -251,7 +335,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u811 {
+=======
+#u812 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -264,7 +352,11 @@
   font-size:16px;
   color:#FF0000;
 }
+<<<<<<< HEAD
 #u811_text {
+=======
+#u812_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -272,7 +364,11 @@
   width:131px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u812_div {
+=======
+#u813_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -288,7 +384,11 @@
   box-shadow:none;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u812 {
+=======
+#u813 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1227px;
@@ -297,7 +397,11 @@
   height:88px;
   line-height:22px;
 }
+<<<<<<< HEAD
 #u812_text {
+=======
+#u813_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -305,7 +409,11 @@
   width:352px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u813 {
+=======
+#u814 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -315,7 +423,11 @@
   overflow:hidden;
   background-image:url('../../resources/images/transparent.gif');
 }
+<<<<<<< HEAD
 #u814_div {
+=======
+#u815_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -335,7 +447,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u814 {
+=======
+#u815 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1232px;
@@ -345,7 +461,11 @@
   text-align:left;
   line-height:18px;
 }
+<<<<<<< HEAD
 #u814_text {
+=======
+#u815_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -353,7 +473,11 @@
   width:322px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u815_img {
+=======
+#u816_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -361,7 +485,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u815 {
+=======
+#u816 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -369,7 +497,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u815_text {
+=======
+#u816_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -378,7 +510,11 @@
   visibility:hidden;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u816_img {
+=======
+#u817_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:-4px;
@@ -386,7 +522,11 @@
   width:30px;
   height:30px;
 }
+<<<<<<< HEAD
 #u816 {
+=======
+#u817 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:1121px;
@@ -399,7 +539,11 @@
   font-size:14px;
   color:#1E1E1E;
 }
+<<<<<<< HEAD
 #u816_text {
+=======
+#u817_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;
@@ -407,7 +551,11 @@
   width:16px;
   word-wrap:break-word;
 }
+<<<<<<< HEAD
 #u817_img {
+=======
+#u818_img {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -415,7 +563,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u817 {
+=======
+#u818 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:22px;
@@ -423,7 +575,11 @@
   width:1155px;
   height:583px;
 }
+<<<<<<< HEAD
 #u817_text {
+=======
+#u818_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -432,12 +588,20 @@
   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;
@@ -445,7 +609,11 @@
   height:40px;
   background-image:none;
 }
+<<<<<<< HEAD
 #u818_state0_content {
+=======
+#u819_state0_content {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -453,7 +621,11 @@
   width:1px;
   height:1px;
 }
+<<<<<<< HEAD
 #u819_div {
+=======
+#u820_div {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -472,7 +644,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u819 {
+=======
+#u820 {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:0px;
@@ -484,7 +660,11 @@
   font-style:normal;
   font-size:16px;
 }
+<<<<<<< HEAD
 #u819_text {
+=======
+#u820_text {
+>>>>>>> 0601optimize
   border-width:0px;
   position:absolute;
   left:2px;