试图写了booking_history的js代码
Merge branch 'master' into czh

Conflicts:
template/index.html
test.py
Merge branch 'master' into czh
index

新增 index
，

，
Merge remote-tracking branch 'origin/czh'

Conflicts:
	template/index.html