Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/planeTicketInquiry.vue

@@ -229,43 +229,43 @@
   height: 100%;
   display: flex;
 }
-.TK_SeatList {
+.PlaneTicket .TK_SeatList {
   /* width: 245px; */
   height: 60px;
   background-color: #f9f9f9;
   /* margin-top: 9px; */
   padding-right: 10px;
 }
-.TK_SeatList > ul > li:nth-child(1) {
+.PlaneTicket .TK_SeatList > ul > li:nth-child(1) {
   margin-left: 5px;
 }
-.TK_SeatList > ul > li {
+.PlaneTicket .TK_SeatList > ul > li {
   float: left;
   text-align: center;
   margin: 5px 13px 0 0;
 }
-.TK_SeatList > ul > li:last-child {
+.PlaneTicket .TK_SeatList > ul > li:last-child {
   margin-right: 0;
 }
-.TK_SeatList .iconfont {
+.PlaneTicket .TK_SeatList .iconfont {
   color: #d1d1d1;
   display: inline-block;
   margin-top: 5px;
 }
-.TK_SeatList ._num1 {
+.PlaneTicket .TK_SeatList ._num1 {
   font-size: 18px;
   color: #333333;
   height: 28px;
   font-family: PingFangSC-Semibold, sans-serif;
 }
-.TK_SeatList ._num2 {
+.PlaneTicket .TK_SeatList ._num2 {
   font-size: 18px;
   color: #47bf8c;
   height: 28px;
   font-family: PingFangSC-Semibold, sans-serif;
   cursor: pointer;
 }
-.TK_SeatList ._num3 {
+.PlaneTicket .TK_SeatList ._num3 {
   font-size: 18px;
   color: #e95252;
   height: 28px;
@@ -940,7 +940,7 @@
   vertical-align: top;
   padding-top: 14px;
 }
-.vmiddle {
+.PlaneTicket .vmiddle {
   display: flex;
   align-items: Center;
   /* height: 78px; */
@@ -987,7 +987,7 @@
   left: 27px;
   top: 5px;
 }
-.TCID_cont {
+.PlaneTicket .TCID_cont {
   min-height: 28px;
   line-height: 28px;
   border-top: 1px dashed #ccc;
@@ -1023,7 +1023,7 @@
 .FinaDetailContent{
   height:25px;overflow:auto;
 }
-.TK_raduis ul li{margin-right:14px;float:left;}
+.PlaneTicket .TK_raduis ul li{margin-right:14px;float:left;}
 .FinaceDanList{cursor: pointer;}
 
 .planeTicketSignUp{overflow: auto; position:fixed;height:500px;z-index:100;bottom:0;left: 50px;border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px 10px 0;min-width: 1316px}

src/components/Ticketing/TicketManager.vue

@@ -275,34 +275,34 @@
     padding-right: 3px;
   }
 
-  .TK_SeatList > ul > li:nth-child(1) {
+  .TicketManager .TK_SeatList > ul > li:nth-child(1) {
     margin-left: 5px;
   }
 
-  .TK_SeatList > ul > li {
+  .TicketManager .TK_SeatList > ul > li {
     float: left;
     text-align: center;
     margin: 5px 4px 0 0;
   }
 
-  .TK_SeatList > ul > li:last-child {
+  .TicketManager .TK_SeatList > ul > li:last-child {
     margin-right: 0;
   }
 
-  .TK_SeatList .iconfont {
+  .TicketManager .TK_SeatList .iconfont {
     color: #d1d1d1;
     display: inline-block;
     margin-top: 5px;
   }
 
-  .TK_SeatList ._num1 {
+  .TicketManager .TK_SeatList ._num1 {
     font-size: 18px;
     color: #333333;
     height: 28px;
     font-family: PingFangSC-Semibold, sans-serif;
   }
 
-  .TK_SeatList ._num2 {
+  .TicketManager .TK_SeatList ._num2 {
     font-size: 18px;
     color: #47bf8c;
     height: 28px;
@@ -310,8 +310,8 @@
     cursor: pointer;
   }
 
-  .TK_SeatList ._num3 {
-    font-size: 17px;
+  .TicketManager .TK_SeatList ._num3 {
+    font-size: 16px;
     color: #e95252;
     height: 28px;
     font-family: PingFangSC-Semibold, sans-serif;
@@ -1126,7 +1126,7 @@
     padding-top: 14px;
   }
 
-  .vmiddle {
+  .TicketManager .vmiddle {
     display: flex;
     align-items: Center;
     /* height: 78px; */
@@ -1183,7 +1183,7 @@
     top: 5px;
   }
 
-  .TCID_cont {
+  .TicketManager .TCID_cont {
     min-height: 28px;
     border-top: 1px dashed #ccc;
   }
@@ -1227,8 +1227,8 @@
     overflow: auto;
   }
 
-  .TK_raduis ul li {
-    margin-left: 12px;
+  .TicketManager .TK_raduis ul li {
+    margin-left:10px;
     float: left;
   }
 

src/components/Ticketing/individualTicket.vue

@@ -136,38 +136,38 @@
     border-radius: 2px;
   }
 
-  .TMN_Seat {
+  .individualTicket .TMN_Seat {
     height: 100%;
     display: flex;
   }
 
-  .TK_SeatList {
+  .individualTicket .TK_SeatList {
     height: 60px;
     background-color: #f9f9f9;
     margin-top: 9px;
     padding-right: 10px;
   }
 
-  .TK_SeatList > ul > li:nth-child(1) {
+  .individualTicket .TK_SeatList > ul > li:nth-child(1) {
     margin-left: 5px;
   }
 
-  .TK_SeatList > ul > li {
+  .individualTicket .TK_SeatList > ul > li {
     float: left;
     text-align: center;
     margin: 5px 10px 0 0;
   }
 
-  .TK_SeatList > ul > li:last-child {
+  .individualTicket .TK_SeatList > ul > li:last-child {
     margin-right: 0;
   }
 
-  .TK_SeatList .iconfont {
+  .individualTicket .TK_SeatList .iconfont {
     color: #d1d1d1;
     display: inline-block;
     margin-top: 5px;
   }
-  .TK_SeatList ._wz {
+  .individualTicket .TK_SeatList ._wz {
     color: #666666;
   }
   .TMA_raduis > ul > li._head {
@@ -236,7 +236,7 @@
     padding-top: 14px;
   }
 
-  .vmiddle {
+  .individualTicket .vmiddle {
     display: flex;
     align-items: Center;
     height: 78px;
@@ -247,7 +247,7 @@
     top: 5px;
   }
 
-  .TCID_cont {
+  .individualTicket .TCID_cont {
     min-height: 28px;
     border-top: 1px dashed #ccc;
   }
@@ -271,7 +271,7 @@
     color: #ff0066;
     font-weight: bold;
   }
-  .TK_SeatList ._num3 {
+  individualTicket .TK_SeatList ._num3 {
     font-size: 17px;
     color: #e95252;
     height: 28px;

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -501,7 +501,7 @@
 .TravelMyTicket .query-box ul .el-input {
   width: 150px;
 }
-.vmiddle {
+.TravelMyTicket .vmiddle {
   display: flex;
   align-items: Center;
   height: 78px;
@@ -519,7 +519,7 @@
   left: 25px;
   top: 5px;
 }
-.TCID_cont {
+.TravelMyTicket .TCID_cont {
   height: 28px;
   line-height: 28px;
   border-top: 1px dashed #ccc;

src/components/TravelManager/Ticket/TravelSwapSeat.vue

@@ -573,7 +573,7 @@
 .yiquxiao{color:#E95252;font-size:14px;}
 .yiqueren i,.yiquxiao i{margin-right:5px;}
 .SureDateStr{margin:5px 0 0 20px;color:#666666;}
-.vmiddle {
+.PlaneTicket_flex_none .vmiddle {
   display: flex;
   align-items: Center;
   height: 78px;

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -468,7 +468,7 @@
 .TravelticketManager .query-box ul .el-input {
   width: 150px;
 }
-.vmiddle {
+.TravelticketManager .vmiddle {
   display: flex;
   align-items: Center;
   height: 78px;
@@ -481,7 +481,7 @@
   left: 25px;
   top: 5px;
 }
-.TCID_cont{height: 28px; line-height: 28px; border-top: 1px dashed #ccc; text-indent: 20px;}
+.TravelticketManager .TCID_cont{height: 28px; line-height: 28px; border-top: 1px dashed #ccc; text-indent: 20px;}
 .Ticket_TCID{margin-right:2px;}
 .TravelticketManager .disClick {
 	background-color: #d1d1d1;