Merge branch 'master' of github.com:MonsterTan/12306

config/configCommon.py

@@ -26,6 +26,7 @@ seat_conf = {'商务座': 32,
              '软座': 24,
              '硬座': 29,
              '无座': 26,
+             '动卧': 33,
              }
 if sys.version_info.major == 2:
     seat_conf_2 = dict([(v, k) for (k, v) in seat_conf.iteritems()])

config/ticket_config.yaml

@@ -41,8 +41,15 @@ set:
   to_station: "邵阳"
 
   # 座位(list) 多个座位ex:
-  # - "二等座"
+  # - "商务座"
   # - "一等座"
+  # - "二等座"
+  # - "特等座"
+  # - "软卧"
+  # - "硬卧"
+  # - "硬座"
+  # - "无座"
+  # - "动卧"
   set_type:
   - "二等座"
 

inter/GetPassengerDTOs.py

@@ -57,6 +57,7 @@ class getPassengerDTOs:
             '软座': 2,
             '软卧': 4,
             '硬卧': 3,
+            '动卧': 1,
         }
         return str(passengerTicketStr[set_type.replace(' ', '')])
 

inter/Query.py

@@ -53,6 +53,7 @@ class query:
                 '硬卧': 28,
                 '硬座': 29,
                 '无座': 26,
+                '动卧': 33,
                 }
         return seat[index]