Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/signupActivity/infoComponent/updateScore.vue

@@ -120,7 +120,7 @@ export default {
         },
         'scoreInfo.levelType': {
             handler(n, o) {
-                this.scoreLevels = []
+                this.scoreLevels = n === this.scoreSet.levelType ? this.scoreSet.scoreLevels : []
                 this.levelInfo = {
                     lable: '',
                     max: 1,
@@ -189,6 +189,8 @@ export default {
             }
             this.$api.areaActivity.manageAct(params).then(res => {
                 if(res.code === 200) {
+                    let nowDate = new Date().getTime()
+                    params.actState = nowDate < params.stime ? 'notStart' : (nowDate > params.etime ? 'finish' : 'going')
                     this.$Message.success(this.$t('cusMgt.setOk'))
                     this.$emit('scoreLevelChange', params)
                 } else {