integrate new page
integrate new pages
Merge branch 'master' of https://github.com/wjf3121/ShareTheTraining
Merge branch 'master' of https://github.com/wjf3121/ShareTheTraining
add order view
Merge branch 'master' of https://github.com/wjf3121/ShareTheTraining