feat(活动-邀请好友赚星币): 修改活动状态提示

Jenkinsfile

@@ -80,7 +80,6 @@ pipeline {
           branch 'master'
           branch 'uat'
           branch 'develop'
-          branch 'feature/jenkinsfile'
         }
       }
       environment {
@@ -100,5 +99,30 @@ pipeline {
         build job: BUILD_DOCKER_JOB, parameters: [string(name: 'version', value: env.BUILD_TAG), extendedChoice(name: 'service', value: 'manage_H5')]
       }
     }
+    stage('发布docker镜像') {
+      when {
+        anyOf {
+          // branch 'master'
+          // branch 'uat'
+          branch 'develop'
+        }
+      }
+      environment {
+        PUBLISH_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+      }
+      steps {
+        // echo '开始构建docker镜像'
+        // script {
+        //   if ( env.BRANCH_NAME == 'master' ) {
+        //     PUBLISH_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+        //   } else if ( env.BRANCH_NAME == 'uat' ) {
+        //     PUBLISH_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+        //   } else {
+        //     PUBLISH_DOCKER_JOB = 'cloud_publish_docker_powerful_test'
+        //   }
+        // }
+        build job: PUBLISH_DOCKER_JOB, parameters: [extendedChoice(name: 'service', value: 'cloud-nginx'), string(name: 'version', value: env.BUILD_TAG), string(name: 'replicas', value: '3'), string(name: 'memory', value: '2G'), string(name: 'cpu', value: '2')]
+      }
+    }
   }
 }

pages/activity/invite-user/index.vue

@@ -166,8 +166,15 @@ export default {
     async share() {
       // console.log(this);
       if (this.data.status !== 1) {
-        throw new Error('当前活动已失效');
+        if (this.data.status === 0) {
+          throw new Error('当前活动已过期');
+        }
+        if (this.data.status === 2) {
+          throw new Error('当前活动未开启');
+        }
+        throw new Error('未知活动状态');
       }
+
       this.$tongji.trackEvent('活动', '分享', '', 0);
       const url =
         location.origin +