Merge branch 'master' of http://git.dayaedu.com/lex/mschool

src/views/mass-message/components/contacts.tsx

@@ -149,7 +149,7 @@ export default defineComponent({
           position="top"
           offsetTop={props.headerHeight + forms.height}
           style={{ width: '100%' }}>
-          <MSearch placeholder="请输入群聊名称" />
+          <MSearch placeholder="请输入联系人名称" />
         </Sticky>
         <CheckboxGroup v-model={forms.check}>
           {forms.dataShow ? (
@@ -178,7 +178,7 @@ export default defineComponent({
                           src={formatterImage(item.roleType)}
                           class={[
                             styles.iconBadge,
-                            item.roleType === 'SCHOOL_LEADER'
+                            item.roleType === 'SCHOOLMASTER'
                               ? styles.iconBadge2
                               : ''
                           ]}

src/views/site-management/site-settings.tsx

@@ -11,7 +11,8 @@ import {
   Image,
   List,
   Picker,
-  Popup
+  Popup,
+  showToast
 } from 'vant';
 import iconMusic from '@/common/images/icon-music.png';
 import iconTeacher from '@/common/images/icon-teacher-default.png';
@@ -54,6 +55,10 @@ export default defineComponent({
 
     const onSubmitUpdateSite = async () => {
       try {
+        if (!forms.siteName) {
+          showToast('请输入场地名称');
+          return;
+        }
         await request.post('/api-web/classGroup/teachingPoint', {
           hideLoading: false,
           data: {
@@ -190,7 +195,7 @@ export default defineComponent({
                         title: () => (
                           <div>
                             <div class={styles.classname}>
-                              {item.courseName}
+                              {item.classGroupName}
                             </div>
                             <div class={styles.name}>{item.teacherName}</div>
                           </div>