Merge pull request #6 from Gavin-AG/master

订单流程修改
add base Activity