Merge remote-tracking branch 'origin/master'

pagesActivity/activityDetail.vue

@@ -169,7 +169,7 @@ import {activityDetail, addApplication, pay} from "../api/activity/index.js"
               })
             } else {
               uni.showToast({
-                title: '下单成功！',
+                title: '报名成功！',
                 icon: 'none'
               })
             }