Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-mer

src/views/active/getActive.vue

@@ -3,8 +3,8 @@
   <el-card class="activityCardPage">
     <div slot="header">
       <span>活动列表/报名</span>
-      <el-button v-if="active !== 3" type="primary" size="small" class="cardNext" @click="next">
-        下一步
+      <el-button v-if="active !== 3" type="primary" size="small" class="cardNext" @click="open">
+        报名
       </el-button>
       <el-button v-if="active === 3" type="primary" size="small" class="cardNext" @click="cancel">
         返回
@@ -305,6 +305,20 @@ export default {
       this.formInline.page = val
       this.getAll(this.formInline)
     },
+    open() {
+        this.$confirm('请问您是否需要报名参加此次活动?', '提示', {
+          confirmButtonText: '确定参加',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.next()
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消成功'
+          });          
+        });
+      },
     async next() {
       if (this.active === 2) {
         if (this.infoData.signCode === '') {