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

TEAMModelOS/ClientApp/src/view/signupActivity/createActivity.vue

@@ -172,6 +172,11 @@
                                                     <RadioGroup v-model="contestUpload.type">
                                                         <Radio label="file">{{ $t('studentWeb.courseContent.type.file') }}</Radio>
                                                         <Radio label="sokrates">{{ $t('auth.attr2') }}</Radio>
+                                                        <Radio label="lesson">{{ $t('schoolStatistics.class.lessonTitle') }}</Radio>
+                                                        <span v-show="contestUpload.type === 'lesson'">
+                                                            <Icon type="md-alert" color="#ffad16" size="17" />
+                                                            必须上传视频
+                                                        </span>
                                                     </RadioGroup>
                                                 </FormItem>
                                                 <FormItem :label="$t('studentWeb.homework.table3')" v-if="contestUpload.type === 'file'" prop="fileType">
@@ -531,6 +536,7 @@ export default {
                 poster: '',
                 attachment: [],
                 modules: [], //Contest/赛课活动 Training/教培活动 Research/教研活动 */
+                invitedSchools: [], //邀请的学校列表
             },
             actAllTime: [[], [], [], [], []],
             contestData: {
@@ -545,7 +551,7 @@ export default {
                 /* upload: {
                     stime: '',
                     etime: '',
-                    type: 'file', //file文件 sokrates苏格拉底作品
+                    type: 'file', //file文件 sokrates苏格拉底作品 lesson课例
                     fileType: [],
                     desc: '',
                     captainUpload: 0, //0个人 1队长
@@ -706,7 +712,7 @@ export default {
                     this.$api.areaActivity.manageAct(params).then(res => {
                         let host = this.$store.state.user.userProfile.blob_uri.split('/' + this.$store.state.userInfo.TEAMModelId)[0]
                         this.createData = this._.cloneDeep(res.activity)
-                        this.createData.posterShow = !this.createData.poster ? require('@/assets/image/no-poster-cn1.png') : `${host}/${this.createData.owner}${this.createData.poster}?${this.createData.sas}`
+                        this.createData.posterShow = !this.createData.poster ? '' : `${host}/${this.createData.owner}${this.createData.poster}?${this.createData.sas}`
                         this.createData.startTime = this.$tools.formatTime(this.createData.stime, 'yyyy-MM-dd hh:mm:ss')
                         this.createData.endTime = this.$tools.formatTime(this.createData.etime, 'yyyy-MM-dd hh:mm:ss')
                         this.createData.attachment.forEach(attach => {