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

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -1089,6 +1089,7 @@ const LANG_EN_US = {
         copyUrl: 'Copy Link',
         joinMessage1: "Allowed to join the course",
         joinMessage2: "Prohibited to join the course",
+        defaultDesc:'Personal Course on the TEAM Model Cloud',
         inviteInfo1: 'Invite to join the IES Teacher Personal Course on the TEAM Model Cloud',
         inviteInfo2: 'Course Name：',
         inviteInfo3: 'Course List：',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -1089,6 +1089,7 @@ const LANG_ZH_CN = {
         copyUrl: '复制链接',
         joinMessage1: "允许加入课程",
         joinMessage2: "禁止加入课程",
+        defaultDesc:'云端个人课程',
         inviteInfo1: '邀请加入醍摩豆云平台IES教师个人课程',
         inviteInfo2: '课程名称：',
         inviteInfo3: '课程名单：',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -1089,6 +1089,7 @@ const LANG_ZH_TW = {
         copyUrl: '複製網址',
         joinMessage1: "允許加入課程",
         joinMessage2: "禁止加入課程",
+        defaultDesc:'雲端個人課程',
         inviteInfo1: '邀請加入醍摩豆雲平臺IES教師個人課程',
         inviteInfo2: '課程名稱：',
         inviteInfo3: '課程名單：',

TEAMModelOS/ClientApp/src/view/joinclass/JoinClass.vue

@@ -14,7 +14,7 @@
 				</p>
 				<Icon type="md-checkmark-circle-outline" color="#19be6b" size="120" />
 				<p v-if="isJoin" class="success-tips">{{ userName }}, {{ $t("cusMgt.join.hasJoin") }}</p>
-				<p v-else-if="isRep" class="success-tips">{{ $t("cusMgt.join.repJoin") }}</p>
+				<p v-else-if="isRep" class="success-tips">{{ userName }}, {{ $t("cusMgt.join.repJoin") }}</p>
 			</div>
 			<p v-show="!isJoin && !isRep" class="course-name">{{ cusName || $t("cusMgt.join.errorInfo") }}</p>
 			<div style="width: fit-content; margin: auto">

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.vue

@@ -849,7 +849,7 @@
 				let listId = this.teaClassList[index].groupId;
 				let listName = this.teaClassList[index].name;
 				let cusName = this.courseInfo.name;
-				let cusDesc = this.courseInfo.desc || this.$t('evaluation.noData');
+				let cusDesc = this.courseInfo.desc || this.$t('cusMgt.defaultDesc');
 				let cusId = this.courseInfo.id;
 				let stulistInfo = this.courseGroupList.find((item) => {
 					return item.id == listId;