Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -179,8 +179,8 @@ export default {
     defaultClassTime: 'Wednesday 13:30-16:30 (Sections 7-9)',
     defaultClassPlace: 'F504 classroom in the fifth teaching building',
     todaydeadlineList: 'Today deadline event reminder',
-    endsToday: "Today",
-    endsTodayTime: 'ends today at 23:59',
+    endsToday: "ends today at ",
+    endsTodayTime: '',
     addCourse: "Enter the course invitation code to join it",
     courseType: {
         success: "Join the course successfully",

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -180,7 +180,7 @@ export default {
     defaultClassPlace: '第五教學樓 F504 教室',
     todaydeadlineList: '今日截止活動提醒 ',
     endsToday: "今日",
-    endsTodayTime: '今日23:59截止',
+    endsTodayTime: '截止',
     addCourse: "輸入課程邀請碼，加入課程",
     courseType: {
         success: "課程加入成功",

TEAMModelOS/ClientApp/src/view/trainList/Join.vue

@@ -67,12 +67,12 @@
                         <Input v-special-char v-model="item.groupName" class="group-name-tag" :placeholder="$t('cusMgt.groupNameHolder')" :title="$t('cusMgt.edtiGroupName')" @on-change="$jsFn.debounce(setGroupName,1000)(index)" />
                         <Icon type="md-close" :color="item.groupName ?  '' : '#fff'" class="close-group-icon" @click="delGroup(index)" />
                     </div>
+                    <div class="add-member-wrap" @click="showAddMember(item)">
+                        <span>添加成员</span>
+                    </div>
                     <div class="list-box">
                         <vuescroll>
                             <Draggable ghost-class="ghost" group="teachers" class="list-group" :list="item.teachers" :animation='200' @end="groupToList">
-                                <div class="add-member-wrap" @click="showAddMember(item)">
-                                    <span>添加成员</span>
-                                </div>
                                 <div :class="['student-info-item',tItem.tag === 'leader' ? 'leader-item':'']" v-for="(tItem,index) in item.teachers" :key="index">
                                     <span>{{tItem.name}}</span>
                                     <span>{{'('+tItem.id+')'}}</span>