jinql
/
12306
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into test 

# Conflicts:
#	.idea/workspace.xml
#	config/ticket_config.yaml
#	init/select_ticket_info.py
#	tkcode
test
wenxianping 2018-01-13 09:32:10 +08:00
parent a6983a0422 339c22b5e2
commit 91b0c471ee
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
damatuCode/damatuWeb.py
View File

@ -124,4 +124,3 @@ class DamatuApi():
# print(dmt.decode('tkcode', 287)) # 上传打码 # print(dmt.decode('tkcode', 287)) # 上传打码
# # print(dmt.decodeUrl('https://kyfw.12306.cn/otn/passcodeNew/getPassCodeNew?module=login&rand=sjrand&0.7586344633015405', 310)) # 上传打码 # # print(dmt.decodeUrl('https://kyfw.12306.cn/otn/passcodeNew/getPassCodeNew?module=login&rand=sjrand&0.7586344633015405', 310)) # 上传打码
# # print(dmt.reportError('894657096')) # 上报错误 # # print(dmt.reportError('894657096')) # 上报错误

2
init/select_ticket_info.py
View File

@ -533,7 +533,7 @@ class select:
elif "messages" in queryOrderWaitTimeResult and queryOrderWaitTimeResult["messages"]: elif "messages" in queryOrderWaitTimeResult and queryOrderWaitTimeResult["messages"]:
print("排队等待失败： " + queryOrderWaitTimeResult["messages"]) print("排队等待失败： " + queryOrderWaitTimeResult["messages"])
else: else:
print("第{}排队中,请耐心等待".format(num)) print("第{}次排队中,请耐心等待".format(num))
else: else:
print("排队中") print("排队中")
time.sleep(2) time.sleep(2)