Merge branch 'master' into jenkins

public/project/css/initiation.css

@@ -138,11 +138,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/i-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.82rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/css/preRegister.css

@@ -139,11 +139,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/p-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.87rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/css/schoolRegister.css

@@ -285,11 +285,13 @@ span {
   margin: 0 auto;
   background: url('../images/initiation/s-popup-banner.png') no-repeat top center;
   background-size: cover;
-  width: 8rem;
-  height: 9.38rem;
+  /* width: 8rem;
+  height: 9.38rem; */
+  width: 7.5rem;
+  height: 8.7rem;
 }
 .submit-title {
-  padding-top: 5.7rem;
+  padding-top: 5.2rem;
   padding-bottom: 10px;
   font-size: 18px;
   font-weight: 500;

public/project/initiation.html

@@ -273,8 +273,8 @@
       <van-picker show-toolbar :columns="classList" @cancel="classPicker = false" @confirm="onConfirmClass" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">您已完成乐团启蒙调查</p>
@@ -495,9 +495,9 @@
             })
             console.log(res)
             if (res.data.code === 200) {
-              // this.submitStatus = true
-              window.location.href =
-                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+              this.submitStatus = true
+              // window.location.href =
+              //   'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
             } else {
               vant.showToast(res.data.message)
             }

public/project/preRegister.html

@@ -298,8 +298,8 @@
       <van-picker show-toolbar :columns="subjectList" @cancel="subjectPicker2 = false" @confirm="onConfirmSubject2" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">您已完成乐团报名</p>
@@ -567,9 +567,9 @@
               code: this.code
             })
             if (res.data.code === 200) {
-              // this.submitStatus = true
-              window.location.href =
-                'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+              this.submitStatus = true
+              // window.location.href =
+              //   'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
             } else {
               vant.showToast(res.data.message)
             }

public/project/schoolRegister.html

@@ -141,8 +141,8 @@
         :columns-field-names="{ text: 'name', value: 'code', children: 'areas' }" />
     </van-popup>
 
-    <van-popup v-model:show="submitStatus" round style="width: 100%;background-color: transparent;"
-      :close-on-click-overlay="false">
+    <van-popup v-model:show="submitStatus" round
+      style="width: 100%;background-color: transparent;transform: translateY(-60%);" :close-on-click-overlay="false">
       <div class="submit-container">
         <p class="submit-title">提交成功</p>
         <p class="submit-tips">感谢您的参与!</p>

src/components/o-upload-all/index.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
     },
     bucket: {
       type: String,
-      default: 'daya'
+      default: 'gyt'
     },
     path: {
       type: String,

src/school/approval-manage/agency/index.tsx

@@ -76,7 +76,7 @@ export default defineComponent({
       }
       try {
         const res: any = await request.post(`${state.platformApi}/schoolWeekSalaryRecord/manage`, {
-          hideLoading: refreshing.value
+          // hideLoading: refreshing.value
         })
         if (Array.isArray(res?.data?.salaryRecordList)) {
           data.salaryRecordList = res.data.salaryRecordList.map((n: any) => {

src/school/approval-manage/components/end-approval.tsx

@@ -32,8 +32,8 @@ export default defineComponent({
         }
 
         const res = await request.post('/api-school/userApproveRecord/page', {
-          data: { ...forms, hasHandle: true },
-          hideLoading: refreshing.value
+          data: { ...forms, hasHandle: true }
+          // hideLoading: refreshing.value
         })
 
         if (Array.isArray(res?.data?.rows)) {

src/school/approval-manage/components/student-leave.tsx

@@ -56,6 +56,7 @@ export default defineComponent({
       }
       try {
         const res = await request.post(`/api-school/userApproveRecord/approval`, {
+          hideLoading: false,
           data: {
             id: route.query.id,
             approvalComments: leaveReason.value,

src/school/approval-manage/components/wait-approval.tsx

@@ -32,8 +32,8 @@ export default defineComponent({
       }
       try {
         const res = await request.post('/api-school/userApproveRecord/page', {
-          data: { ...forms, hasHandle: false },
-          hideLoading: refreshing.value
+          data: { ...forms, hasHandle: false }
+          // hideLoading: refreshing.value
         })
 
         if (Array.isArray(res?.data?.rows)) {

src/school/approval-manage/course-adjust.tsx

@@ -14,6 +14,7 @@ import Calendar from '../train-planning/modal/calendar'
 import Timer from '../train-planning/modal/timer'
 import TeacherList from '../orchestra/modal/teacher-list'
 import OSticky from '@/components/o-sticky'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'course-adjust',
@@ -36,7 +37,9 @@ export default defineComponent({
       trainTimer: 0,
       selectItem: {} as any,
       arrangeType: 'STANDARD', // 标准排课还是加课
-      isBack: route.query.isBack
+      isBack: route.query.isBack,
+      dialogStatus: false,
+      dialogMessage: ''
     })
     const forms = reactive({
       classDate: '',
@@ -136,19 +139,25 @@ export default defineComponent({
           return
         }
 
-        await request.post(`/api-school/courseSchedule/adjust`, {
+        const res = await request.post(`/api-school/courseSchedule/adjust`, {
+          hideLoading: false,
           data: {
             ...forms,
             cacheId: state.cacheId
           }
         })
 
-        setTimeout(() => {
-          showSuccessToast('调整成功')
-        }, 100)
-        setTimeout(() => {
-          reset()
-        }, 1100)
+        if (res.code === 999) {
+          state.dialogStatus = true
+          state.dialogMessage = res.message
+        } else {
+          setTimeout(() => {
+            showSuccessToast('调整成功')
+          }, 100)
+          setTimeout(() => {
+            reset()
+          }, 1100)
+        }
       } catch (e: any) {
         showToast(e.message)
       }
@@ -297,6 +306,16 @@ export default defineComponent({
               }}
             />
           </OPopup>
+
+          <ODialog
+            title="提示"
+            v-model:show={state.dialogStatus}
+            message={state.dialogMessage}
+            confirmButtonText="确定"
+            onConfirm={() => {
+              router.back()
+            }}
+          />
         </div>
       </>
     )

src/school/approval-manage/subsidy/details.tsx

@@ -77,7 +77,7 @@ export default defineComponent({
                 center
                 class={styles.listItem}
                 title="补助标准"
-                value={`${state.record.standardSalary}元/天`}
+                value={`${state.record.standardSalary || 0}元/天`}
               />
               <Cell
                 border={false}
@@ -102,7 +102,7 @@ export default defineComponent({
                 center
                 class={styles.listItem}
                 title="实际补助金额"
-                value={`${state.record.actualSalary}元`}
+                value={`${state.record.actualSalary || 0}元`}
               />
             </div>
 

src/school/approval-manage/subsidy/index.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
         const res: any = await request.post(
           `${state.platformApi}/schoolWeekSalaryRecord/manageConfirm/${route.query.salaryId}`,
           {
-            hideLoading: refreshing.value
+            // hideLoading: refreshing.value
           }
         )
         if (res?.data) {
@@ -74,7 +74,10 @@ export default defineComponent({
       }).then(() => {
         request
           .post(
-            `${state.platformApi}/schoolWeekSalaryRecord/manageConfirmed/${route.query.salaryId}`
+            `${state.platformApi}/schoolWeekSalaryRecord/manageConfirmed/${route.query.salaryId}`,
+            {
+              hideLoading: false
+            }
           )
           .then((res: any) => {
             if (res?.code == 200) {

src/school/attendance/student-att-day.tsx

@@ -141,7 +141,7 @@ export default defineComponent({
         ) : (
           <OEmpty />
         )}
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

src/school/companion-teacher/companion-detail.tsx

@@ -75,7 +75,9 @@ export default defineComponent({
       try {
         const { data } = await request.post(
           '/api-school/classGroup/teacherHandoverList/' + route.query.id,
-          {}
+          {
+            hideLoading: false
+          }
         )
         const classList = data || []
 

src/school/companion-teacher/companion-teacher-register.module.less

@@ -246,6 +246,13 @@ span {
   font-size: 13px;
   color: #f67146;
   padding: 9px 10px;
+  display: flex;
+  align-items: center;
+  :global {
+    .van-icon {
+      margin-right: 5px;
+    }
+  }
 }
 
 .wxPopupDialog {

src/school/companion-teacher/companion-teacher-register.tsx

@@ -100,6 +100,7 @@ export default defineComponent({
       try {
         const forms = state.forms
         await request.post('/api-school/open/schoolTeacherStudent/registerTeacher', {
+          hideLoading: false,
           data: {
             ...forms,
             code: state.code,
@@ -432,7 +433,7 @@ export default defineComponent({
             ></Field>
             <div class={styles.phoneTips}>
               <Icon name="warning" size="16" />
-              提示：手机号将成为您管乐团伴学指导端登录账号
+              提示：手机号将成为您管乐团伴学端登录账号
             </div>
             <Field
               label="真实姓名"

src/school/companion-teacher/unbind.tsx

@@ -113,6 +113,7 @@ export default defineComponent({
           }
         })
         const res = await request.post('/api-school/classGroup/handoverTeacher', {
+          hideLoading: false,
           data: {
             teacherId: route.query.id,
             courseUpdateList: [...courseInfo]

src/school/manage-teacher/manage-detail.tsx

@@ -40,7 +40,9 @@ export default defineComponent({
         // }
 
         const query = route.query
-        await request.post('/api-school/schoolStaff/freeze/' + query.id)
+        await request.post('/api-school/schoolStaff/freeze/' + query.id, {
+          hideLoading: false
+        })
         setTimeout(() => {
           if (detail.value.status === 'ACTIVATION') {
             detail.value.status = 'LOCKED'

src/school/manage-teacher/manage-teacher-register.module.less

@@ -245,8 +245,16 @@ span {
   background: #ffebdd;
   border-radius: 6px;
   font-size: 13px;
+  line-height: 16px;
   color: #f67146;
   padding: 9px 10px;
+  display: flex;
+  align-items: center;
+  :global {
+    .van-icon {
+      margin-right: 5px;
+    }
+  }
 }
 
 .wxPopupDialog {

src/school/manage-teacher/menu-function.tsx

@@ -70,18 +70,14 @@ export default defineComponent({
             }
           })
         await request.post('/api-school/schoolStaff/updateButton', {
+          hideLoading: false,
           data: {
             teacherId: props.teacherId,
             menuButtons: [...tempMnus]
           }
         })
-        setTimeout(() => {
-          showToast('修改成功')
-          setTimeout(() => {
-            emit('close')
-            emit('success')
-          }, 1000)
-        }, 100)
+        emit('close')
+        emit('success')
       } catch {
         //
       }

src/school/mass-message/create-message.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
     const forms = reactive({
       id: route.query.id,
       type: 'ADD',
-      bucket: 'gyt',
+      bucket: 'i-m',
       sendStatus: false,
       sendType: 'IMMEDIATELY' as any,
       textMessage: null,
@@ -196,10 +196,12 @@ export default defineComponent({
         if (forms.id) {
           params.id = forms.id
           await request.post('/api-school/imMessageBatchSending/update', {
+            hideLoading: false,
             data: params
           })
         } else {
           await request.post('/api-school/imMessageBatchSending/save', {
+            hideLoading: false,
             data: params
           })
         }
@@ -280,6 +282,7 @@ export default defineComponent({
         forms.closeLoading = true
         await request.post('/api-school/imMessageBatchSending/remove', {
           requestType: 'form',
+          hideLoading: false,
           data: {
             id: forms.id
           }

src/school/orchestra-story/index.tsx

@@ -155,7 +155,7 @@ export default defineComponent({
           {{
             right: () => (
               <span
-                style={{ color: '#777777' }}
+                style={{ color: 'var(--van-primary)' }}
                 onClick={() => {
                   router.push('/story-operation')
                 }}

src/school/orchestra-story/story-operation/index.tsx

@@ -178,6 +178,7 @@ export default defineComponent({
 
         if (forms.id) {
           await request.post('/api-school/orchestraStory/update', {
+            hideLoading: false,
             data: {
               ...params,
               id: forms.id
@@ -190,6 +191,7 @@ export default defineComponent({
           router.back()
         } else {
           await request.post('/api-school/orchestraStory/save', {
+            hideLoading: false,
             data: params
           })
 
@@ -340,6 +342,8 @@ export default defineComponent({
                     style={{ marginBottom: '12px' }}
                     v-model:modelValue={forms.attachments}
                     maxCount={9}
+                    bucket="gyt"
+                    path="/orchestra"
                     uploadIcon={iconUpload}
                   />
                 )
@@ -359,6 +363,8 @@ export default defineComponent({
                       uploadType="VIDEO"
                       uploadIcon={iconUploadVideo}
                       deletable={false}
+                      bucket="gyt"
+                      path="/orchestra"
                     />
 
                     <OUploadAll
@@ -366,6 +372,8 @@ export default defineComponent({
                       style={{ marginBottom: '12px' }}
                       v-model:modelValue={forms.videoCover}
                       uploadIcon={iconUploadVideoCover}
+                      bucket="gyt"
+                      path="/orchestra"
                     />
                   </>
                 )
@@ -386,6 +394,7 @@ export default defineComponent({
           <DatePicker
             maxDate={new Date()}
             v-model={forms.currentDate}
+            onCancel={() => (forms.createTimeStatus = false)}
             onConfirm={(val: any) => {
               const selectedValues = val.selectedValues.join('-')
               forms.createTime = dayjs(selectedValues).toDate()

src/school/orchestra/create-orchestra/select-teacher.tsx

@@ -45,6 +45,7 @@ export default defineComponent({
           console.log(tempSelects, 'tempselects')
           // return
           await request.post('/api-school/orchestra/addOrchestra', {
+            hideLoading: false,
             data: {
               schoolId: baseState.user.data.school.id,
               name: state.orchestraName,

src/school/practice-rewards/index.tsx

@@ -14,7 +14,7 @@ export default defineComponent({
   setup() {
     const seeType = localStorage.getItem('practice-rewards-see-type')
     const state = reactive({
-      seeType: seeType || 'see',
+      seeType: seeType || 'hide',
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -114,7 +114,7 @@ export default defineComponent({
               />
               <div class={styles.priceTitle}>待结算金额 (元)</div>
               <div class={styles.priceCount}>
-                {state.seeType === 'see' ? moneyFormat(state.statistics.waitSalary) : '******'}
+                {state.seeType === 'see' ? moneyFormat(state.statistics.waitSalary) : '****'}
               </div>
               <Progress
                 color="#fff"
@@ -128,7 +128,7 @@ export default defineComponent({
                 <span>
                   {state.seeType === 'see'
                     ? moneyFormat(state.statistics.totalTrainingSalary)
-                    : '******'}
+                    : '****'}
                 </span>
               </div>
             </div>

src/school/ranking-list/components/day-bang.tsx

@@ -243,7 +243,7 @@ export default defineComponent({
           <OEmpty />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

src/school/ranking-list/components/timer-bang.tsx

@@ -243,7 +243,7 @@ export default defineComponent({
           <OEmpty />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

src/school/school-detail/eidt-school.tsx

@@ -75,6 +75,7 @@ export default defineComponent({
       }
       try {
         const { data } = await request.post('/api-school/school/update', {
+          hideLoading: false,
           data: {
             ...forms
           }

src/school/train-planning/component/course-preview/index.tsx

@@ -51,15 +51,20 @@ export default defineComponent({
     // 获取所有
     const getClasses = async (loading = true) => {
       try {
-        const { data } = await request.post('/api-school/orchestra/trainingPlanListCache', {
+        const res = await request.post('/api-school/orchestra/trainingPlanListCache', {
           requestType: 'form',
-          hideLoading: !loading,
+          // hideLoading: !loading,
           data: {
             cacheId: route.query.cacheId
           }
         })
+        if (res.code === 999) {
+          state.dialogStatus = true
+          state.dialogMessage = res.message
+          return
+        }
         // 初始化数据
-        formatClasses(data)
+        formatClasses(res.data)
 
         if (forms.planList.orchestra.length > 0) {
           const selectOrchestra = forms.selectOrchestraId
@@ -172,7 +177,10 @@ export default defineComponent({
     const onSubmit = async () => {
       try {
         state.isClick = true
-        const res = await request.post('/api-school/orchestra/trainingPlan/' + route.query.cacheId)
+        const res = await request.post(
+          '/api-school/orchestra/trainingPlan/' + route.query.cacheId,
+          { hideLoading: false }
+        )
 
         // 判断数据是否已经过期
         if (res.code === 999) {

src/school/train-planning/component/practice-detail/index.tsx

@@ -147,6 +147,7 @@ export default defineComponent({
         console.log(params)
 
         const { data } = await request.post('/api-school/orchestra/trainingPlanList', {
+          hideLoading: false,
           data: {
             ...params
           }

src/school/train-planning/component/train-content/index.tsx

@@ -89,6 +89,7 @@ export default defineComponent({
         }
 
         const res = await request.post('/api-school/orchestra/trainingPlanList', {
+          hideLoading: false,
           data: {
             ...params
           }

src/school/train-planning/modal/class-list/index.tsx

@@ -98,7 +98,15 @@ export default defineComponent({
                   <div class={[styles.name, 'van-ellipsis']}>{item.orchestraName}</div>
                 </div>
               ),
-              value: () => <>{item.teacherName}</>
+              value: () => (
+                <div
+                  style={{
+                    color: item.teacherName ? '' : 'var(--van-primary)'
+                  }}
+                >
+                  {item.teacherName ? item.teacherName : '去设置'}
+                </div>
+              )
             }}
           </Cell>
         ))}

src/school/train-planning/modal/practice-class/index.tsx

@@ -85,6 +85,8 @@ export default defineComponent({
         if (s.length > 0) {
           forms.orchestraId = s[0].value
           forms.orchestraName = s[0].text
+
+          await getList()
         }
       } catch {
         //
@@ -111,10 +113,16 @@ export default defineComponent({
         forms.listState.loading = false
         const result = data || {}
         // 处理重复请求数据
+
         if (forms.list.length > 0 && result.current === 1) {
           return
         }
-        forms.list = forms.list.concat(result.rows || [])
+        const tempList = forms.list.concat(result.rows || [])
+        tempList.forEach((item: any) => {
+          if (item.preStudentNum > 0) {
+            forms.list.push(item)
+          }
+        })
         forms.listState.finished = result.current >= result.pages
         forms.params.page = result.current + 1
         forms.listState.dataShow = forms.list.length > 0
@@ -152,14 +160,9 @@ export default defineComponent({
       // 判断是否有乐团编号
       if (!props.orchestraId) {
         await getOrchestras()
+      } else {
+        await getList()
       }
-      // 判断是否有乐团编号
-      setTimeout(
-        async () => {
-          await getList()
-        },
-        props.orchestraId ? 0 : 100
-      )
     })
 
     return () => (
@@ -187,78 +190,68 @@ export default defineComponent({
             immediateCheck={false}
           >
             <CheckboxGroup class={[styles.gridContainer, styles.gridClass]} v-model={forms.check}>
-              {forms.list.map(
-                (item: any) =>
-                  item.preStudentNum > 0 && (
-                    <CellGroup
-                      class={styles.classCellGroup}
-                      onClick={() => {
-                        if (item.teacherId) {
-                          onSelect(item.id)
-                        }
-                      }}
-                      border={false}
-                    >
-                      <Cell
-                        center
-                        titleStyle={{ flex: '0 auto' }}
-                        valueClass={styles.classCheckbox}
-                      >
-                        {{
-                          icon: () => <Image src={iconTeacher} class={styles.img} />,
-                          title: () => (
-                            <div class={styles.content}>
-                              <div class={styles.teacherName}>
-                                {item.teacherName ? (
-                                  <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
-                                    {item.teacherName}
-                                  </div>
-                                ) : (
-                                  <div
-                                    class={[styles.name, 'van-ellipsis']}
-                                    style={{ color: 'red' }}
-                                  >
-                                    暂未设置伴学指导
-                                  </div>
-                                )}
-                                <Tag type="primary">{item.name}</Tag>
+              {forms.list.map((item: any) => (
+                <CellGroup
+                  class={styles.classCellGroup}
+                  onClick={() => {
+                    if (item.teacherId) {
+                      onSelect(item.id)
+                    }
+                  }}
+                  border={false}
+                >
+                  <Cell center titleStyle={{ flex: '0 auto' }} valueClass={styles.classCheckbox}>
+                    {{
+                      icon: () => <Image src={iconTeacher} class={styles.img} />,
+                      title: () => (
+                        <div class={styles.content}>
+                          <div class={styles.teacherName}>
+                            {item.teacherName ? (
+                              <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
+                                {item.teacherName}
                               </div>
-                              <div class={[styles.orchestraName, 'van-ellipsis']}>
-                                {item.orchestraName}
+                            ) : (
+                              <div class={[styles.name, 'van-ellipsis']} style={{ color: 'red' }}>
+                                暂未设置伴学指导
                               </div>
-                            </div>
-                          ),
-                          value: () => (
-                            <Checkbox
-                              name={item.id}
-                              ref={(el: any) => (forms.checkboxRefs[item.id] = el)}
-                              disabled={item.teacherId ? false : true}
-                              onClick={(e: any) => {
-                                e.stopPropagation()
-                              }}
-                            ></Checkbox>
-                          )
-                        }}
-                      </Cell>
-                      <Grid border={false} columnNum={3}>
-                        <GridItem>
-                          <p class={styles.title}>{item.preStudentNum}</p>
-                          <p class={styles.name}>学生人数</p>
-                        </GridItem>
-                        <GridItem>
-                          <p class={[styles.title]}>
-                            {item.courseScheduleNum - item.completeCourseScheduleNum}
-                          </p>
-                          <p class={styles.name}>剩余课时</p>
-                        </GridItem>
-                        <GridItem>
-                          <p class={styles.title}>{item.courseScheduleNum}</p>
-                          <p class={styles.name}>总课时</p>
-                        </GridItem>
-                      </Grid>
-                    </CellGroup>
-                  )
-              )}
+                            )}
+                            <Tag type="primary">{item.name}</Tag>
+                          </div>
+                          <div class={[styles.orchestraName, 'van-ellipsis']}>
+                            {item.orchestraName}
+                          </div>
+                        </div>
+                      ),
+                      value: () => (
+                        <Checkbox
+                          name={item.id}
+                          ref={(el: any) => (forms.checkboxRefs[item.id] = el)}
+                          disabled={item.teacherId ? false : true}
+                          onClick={(e: any) => {
+                            e.stopPropagation()
+                          }}
+                        ></Checkbox>
+                      )
+                    }}
+                  </Cell>
+                  <Grid border={false} columnNum={3}>
+                    <GridItem>
+                      <p class={styles.title}>{item.preStudentNum}</p>
+                      <p class={styles.name}>学生人数</p>
+                    </GridItem>
+                    <GridItem>
+                      <p class={[styles.title]}>
+                        {item.courseScheduleNum - item.completeCourseScheduleNum}
+                      </p>
+                      <p class={styles.name}>剩余课时</p>
+                    </GridItem>
+                    <GridItem>
+                      <p class={styles.title}>{item.courseScheduleNum}</p>
+                      <p class={styles.name}>总课时</p>
+                    </GridItem>
+                  </Grid>
+                </CellGroup>
+              ))}
             </CheckboxGroup>
           </List>
         ) : (

src/school/train-planning/modal/timer/index.module.less

@@ -11,6 +11,28 @@
   border-radius: 8px;
   overflow: hidden;
 
+  .cellIcon {
+    font-size: 18px;
+    margin-right: 6px;
+  }
+
+  .cellTimers {
+    h3 {
+      font-size: 16px;
+      font-weight: 500;
+      color: #333333;
+      padding-bottom: 6px;
+    }
+    span {
+      padding-top: 6px;
+      display: inline-block;
+      width: 35%;
+      font-size: 14px;
+      font-weight: 500;
+      color: #777777;
+      line-height: 20px;
+    }
+  }
   :global {
     .van-cell {
       padding: 18px 12px;

src/school/train-planning/modal/timer/index.tsx

@@ -3,9 +3,12 @@ import item from '@/student/coupons/item'
 import dayjs from 'dayjs'
 // import isBetween from 'dayjs/plugin/isBetween'
 // dayjs.extend(isBetween)
-import { Button, Cell, CellGroup, Popup, showToast, Sticky, TimePicker } from 'vant'
+import { Button, Cell, CellGroup, Icon, Popup, showToast, Sticky, TimePicker } from 'vant'
 import { defineComponent, onMounted, reactive, watch } from 'vue'
 import styles from './index.module.less'
+import iconSuccessPlan from '../../images/icon-success-plan.png'
+import iconErrorPlan from '../../images/icon-error-plan.png'
+import iconPayingPlan from '../../images/icon-paying-plan.png'
 
 export default defineComponent({
   name: 'timer',
@@ -190,28 +193,48 @@ export default defineComponent({
 
         {/* <div class={styles.selectTimer}>{dayjs(state.calendarDate).format('YYYY年MM月DD日')}</div> */}
 
-        <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
-          {state.useTimer.map((item: any) => (
-            <Cell
-              center
-              title={`${dayjs(item.startTime).format('HH:mm')}~${dayjs(item.endTime).format(
-                'HH:mm'
-              )}`}
-              value="可排课时间段"
-            ></Cell>
-          ))}
-
-          {state.usedTimer.map((item: any) => (
-            <Cell
-              center
-              value="冲突时间"
-              title={`${dayjs(item.startTime).format('HH:mm')}~${dayjs(item.endTime).format(
-                'HH:mm'
-              )}`}
-              class={styles.noTime}
-            ></Cell>
-          ))}
-        </CellGroup>
+        {state.useTimer && state.useTimer.length > 0 && (
+          <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
+            <Cell>
+              {{
+                icon: () => <Icon name={iconSuccessPlan} class={styles.cellIcon} />,
+                title: () => (
+                  <div class={styles.cellTimers}>
+                    <h3>可排课时间段</h3>
+                    <div>
+                      {state.useTimer.map((item: any) => (
+                        <span>{`${dayjs(item.startTime).format('HH:mm')}~${dayjs(
+                          item.endTime
+                        ).format('HH:mm')}`}</span>
+                      ))}
+                    </div>
+                  </div>
+                )
+              }}
+            </Cell>
+          </CellGroup>
+        )}
+        {state.usedTimer && state.usedTimer.length > 0 && (
+          <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
+            <Cell>
+              {{
+                icon: () => <Icon name={iconErrorPlan} class={styles.cellIcon} />,
+                title: () => (
+                  <div class={styles.cellTimers}>
+                    <h3>冲突时间</h3>
+                    <div>
+                      {state.usedTimer.map((item: any) => (
+                        <span>{`${dayjs(item.startTime).format('HH:mm')}~${dayjs(
+                          item.endTime
+                        ).format('HH:mm')}`}</span>
+                      ))}
+                    </div>
+                  </div>
+                )
+              }}
+            </Cell>
+          </CellGroup>
+        )}
 
         <CellGroup inset class={styles.cellGroup}>
           <Cell
@@ -220,7 +243,9 @@ export default defineComponent({
             value={state.selectTime ? dayjs(state.selectTime).format('HH:mm') : ''}
             isLink
             onClick={() => (state.selectTimeStatus = true)}
-          ></Cell>
+          >
+            {{ icon: () => <Icon name={iconPayingPlan} class={styles.cellIcon} /> }}
+          </Cell>
         </CellGroup>
 
         <Sticky position="bottom">

src/student/member-center/index.tsx

@@ -324,14 +324,18 @@ export default defineComponent({
                 </div>
               )}
             </div>
-            <Button
-              color="linear-gradient(220deg, #DFA164 0%, #FAC87E 100%)"
-              round
-              class={styles.btn}
-              onClick={this.onSubmit}
-            >
-              {this.userInfo.isVip ? '立即续费' : '立即开通'}
-            </Button>
+            {this.userInfo.id ? (
+              <Button
+                color="linear-gradient(220deg, #DFA164 0%, #FAC87E 100%)"
+                round
+                class={styles.btn}
+                onClick={this.onSubmit}
+              >
+                {this.userInfo.isVip ? '立即续费' : '立即开通'}
+              </Button>
+            ) : (
+              ''
+            )}
           </div>
         ) : (
           ''

src/student/music-group/pre-apply/component/apply.tsx

@@ -159,6 +159,7 @@ export default defineComponent({
           params.id = state.detail.id
         }
         await request.post('/api-student/orchestraRegister/save', {
+          hideLoading: false,
           data: {
             ...params,
             code: props.code

src/student/music-group/pre-apply/component/payment.tsx

@@ -230,6 +230,7 @@ export default defineComponent({
         })
         // 创建订单
         const { data } = await request.post('/api-student/userPaymentOrder/executeOrder', {
+          hideLoading: false,
           data: {
             bizId: route.query.id, // 乐团编号
             orderType: 'ORCHESTRA',

src/student/music-group/shop-address/address-operation.tsx

@@ -69,6 +69,7 @@ export default defineComponent({
         }
         if (route.query.id) {
           await request.post('/api-student/userReceiveAddress/update', {
+            hideLoading: false,
             data: {
               id: route.query.id,
               ...params
@@ -76,6 +77,7 @@ export default defineComponent({
           })
         } else {
           await request.post('/api-student/userReceiveAddress/save', {
+            hideLoading: false,
             data: {
               ...params
             }

src/student/my-orchestra/apply-withdrawal.tsx

@@ -109,8 +109,7 @@ export default defineComponent({
           </div>
         </div>
         <div class={styles.content}>
-          <span>在乐团训练的日子里，</span>
-          有付出有汗水，有从0到1的喜悦也有攻克难关的坚持。你的付出为你带来成长，你的成长让老师感到欣喜。
+          在乐团训练的日子里，有付出有汗水，有从0到1的喜悦也有攻克难关的坚持。你的付出为你带来成长，你的成长让老师感到欣喜。
         </div>
 
         <div class={styles.resion}>

src/student/payment-result/index.tsx

@@ -69,7 +69,9 @@ export default defineComponent({
         message: '您是否确定撤销退费?'
       }).then(async () => {
         try {
-          await request.post('/api-student/userPaymentOrder/cancelRefund/' + route.query.orderNo)
+          await request.post('/api-student/userPaymentOrder/cancelRefund/' + route.query.orderNo, {
+            hideLoading: false
+          })
           getDetails()
         } catch {
           //
@@ -145,6 +147,7 @@ export default defineComponent({
         const refundReason = form.resionList.find((item: any) => item.value === form.checked)
 
         await request.post('/api-student/userPaymentOrder/refundPayment', {
+          hideLoading: false,
           data: {
             merOrderNo: route.query.orderNo,
             refundReason: form.checked === 999 ? form.resion : refundReason.text

src/student/trade-record/component/paid-list.tsx

@@ -79,7 +79,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,

src/student/trade-record/component/refund-list.tsx

@@ -47,7 +47,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,

src/student/trade-record/component/wait-pay.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         if (form.isClick) return
         form.isClick = true
         const res = await request.post('/api-student/userPaymentOrder/page', {
-          hideLoading: hideLoading,
+          // hideLoading: hideLoading,
           data: {
             ...form.params,
             orderType: form.currentType === 'ALL' ? null : form.currentType,
@@ -112,7 +112,9 @@ export default defineComponent({
         confirmButtonText: '确定'
       }).then(async () => {
         try {
-          await request.post('/api-student/userPaymentOrder/cancelPayment/' + item.orderNo)
+          await request.post('/api-student/userPaymentOrder/cancelPayment/' + item.orderNo, {
+            hideLoading: false
+          })
           onSearch()
         } catch {
           //
@@ -123,6 +125,7 @@ export default defineComponent({
     const onConfirmOrder = async (item: any) => {
       try {
         const { data } = await request.get('/api-student/userPaymentOrder/unpaid', {
+          hideLoading: false,
           params: {
             orderNo: item.orderNo,
             paymentType: item.orderType

src/styles/index.less

@@ -192,12 +192,13 @@ body {
   --van-overlay-background: rgba(0, 0, 0, 0.4);
 }
 
+// 加载动画
 .appRootToast {
   .van-overlay {
     // background: rgba(0, 0, 0, 0.4);
     background: #fff;
     // transition: all 0 ease;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .van-fade-enter-from,
   .van-fade-enter-active {
@@ -217,7 +218,7 @@ body {
     // background-color: rgba(0, 0, 0, 0.9);
     background-color: transparent;
     // box-shadow: 0px 8px 20px 2px #f0f0f0;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .toastAnimate {
     width: 70px;
@@ -225,12 +226,13 @@ body {
   }
 }
 
+// 加载动画
 .appRootToastCenter {
   .van-overlay {
     background: rgba(0, 0, 0, 0.4);
     // background: #fff;
     // transition: all 0 ease;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .van-fade-enter-from,
   .van-fade-enter-active {
@@ -250,7 +252,7 @@ body {
     // background-color: rgba(0, 0, 0, 0.9);
     // background-color: transparent;
     // box-shadow: 0px 8px 20px 2px #f0f0f0;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .toastAnimate {
     width: 70px;
@@ -279,7 +281,7 @@ body {
   font-family: 'DINA';
   src: url('./font/DIN_Alternate_Bold.ttf');
 }
-
+// 数据为空时，空样式居中显示
 .emptyRootContainer {
   display: flex;
   align-items: center;
@@ -310,3 +312,17 @@ input {
     transform: translateY(-15%);
   }
 }
+
+// grid item 右边的一根线
+.gridBorderRight::after {
+  content: ' ';
+  position: absolute;
+  box-sizing: border-box;
+  height: 40px;
+  pointer-events: none;
+  top: 50%;
+  margin-top: -20px;
+  right: 0;
+  border: 1px solid var(--van-border-color);
+  transform: scale(0.5);
+}

src/teacher/attendance/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
     const refreshing = ref(false)
     const loading = ref(false)
     const finished = ref(false)
-    const showContact = ref(false)
+    const showContact = ref(true)
     const list = ref([])
 
     const getList = async () => {
@@ -225,7 +225,7 @@ export default defineComponent({
           <OEmpty tips="暂无考勤" />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

src/views/adapay/pay-define/index.tsx

@@ -40,6 +40,7 @@ export default defineComponent({
         }
         console.log(payMap, 'payMap')
         const { data } = await request.post('/api-student/open/userOrder/executePayment', {
+          hideLoading: false,
           data: {
             ...payMap
           }

src/views/exercise-record/exercis-detail.tsx

@@ -271,7 +271,7 @@ export default defineComponent({
           )}
         </div>
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

src/views/mine-orchestra/index.tsx

@@ -33,7 +33,7 @@ export default defineComponent({
       data.loading = true
       request
         .post(`${state.platformApi}/orchestra/studentOrchestra`, {
-          hideLoading: data.reshLoading
+          // hideLoading: data.reshLoading
         })
         .then((res: any) => {
           if (Array.isArray(res?.data)) {
@@ -57,7 +57,7 @@ export default defineComponent({
       data.loading = true
       request
         .post(`${state.platformApi}/orchestra/teacherOrchestra`, {
-          hideLoading: data.reshLoading
+          // hideLoading: data.reshLoading
         })
         .then((res: any) => {
           if (Array.isArray(res?.data)) {
@@ -105,6 +105,7 @@ export default defineComponent({
                       {(modelData.orchestra?.status === 'REGISTER' ||
                         modelData.orchestra?.status === 'LEARNING') && (
                         <span
+                          style={{ color: 'var(--van-primary)' }}
                           onClick={() => {
                             router.push({
                               path: '/apply-withdrawal',

src/views/unit-test/examination-mode/index.tsx

@@ -215,6 +215,7 @@ export default defineComponent({
         const { data } = await request.post(
           '/api-student/studentUnitExamination/completionExamination',
           {
+            hideLoading: false,
             data: {
               answers: userAnswerList,
               studentUnitExaminationId: state.id

src/views/unit-test/index.tsx

@@ -105,6 +105,7 @@ export default defineComponent({
             '/api-student/studentUnitExamination/getExaminationDetail',
             {
               requestType: 'form',
+              hideLoading: false,
               data: {
                 studentUnitExaminationId: item.id
               }
@@ -133,6 +134,7 @@ export default defineComponent({
       try {
         await request.post('/api-student/studentUnitExamination/startExamination', {
           requestType: 'form',
+          hideLoading: false,
           data: {
             studentUnitExaminationId: form.selectUnitExam.id
           }

src/views/unit-test/unit-create/modals/newspaper-item.module.less

@@ -20,7 +20,8 @@
     text-align: center;
     padding: 0 12px;
     .itemBottomDot {
-      width: 25%;
+      flex-basis: 33.33%;
+      position: relative;
       .dotMain {
         font-size: 26px;
         color: #333333;

src/views/unit-test/unit-create/modals/newspaper-item.tsx

@@ -21,14 +21,14 @@ export default defineComponent({
           <div class={styles.itemWrap} onClick={gotoDetail}>
             <div class={styles.titleWrap}>{props.item?.unitExaminationName}</div>
             <div class={styles.itemBottom}>
-              <div class={styles.itemBottomDot}>
+              <div class={[styles.itemBottomDot, 'gridBorderRight']}>
                 <p class={styles.dotMain}>
                   {props.item?.totalScore || 0}
                   {/* <span>分</span> */}
                 </p>
                 <p class={styles.dotSub}> 总分</p>
               </div>
-              <div class={styles.itemBottomDot}>
+              <div class={[styles.itemBottomDot, 'gridBorderRight']}>
                 <p class={styles.dotMain} style={{ color: '#F67146' }}>
                   {props.item?.passScore || 0}
                   {/* <span>分</span> */}

src/views/unit-test/unit-create/uni-last.module.less

@@ -18,7 +18,7 @@
   .infoWrap {
     background-color: #fff;
     border-radius: 10px;
-    padding: 15px 12px;
+    padding: 8px 0px;
     p {
       font-size: 15px;
       font-weight: 500;
@@ -29,9 +29,24 @@
     .loctionIconWrap {
       margin-left: 5px;
     }
+    .wrapValue {
+      font-weight: 500;
+      color: #333333;
+      line-height: 21px;
+    }
+    .heightValue {
+      padding-bottom: 15px !important;
+      margin-bottom: 8px;
+    }
+    input::-webkit-input-placeholder,
+    input::-ms-input-placeholder {
+      font-size: 15px;
+    }
+
     :global {
       .van-cell {
-        padding: 0 !important;
+        padding: 8px 12px;
+        font-size: 15px;
       }
       .van-cell__title {
         font-size: 15px;
@@ -39,6 +54,7 @@
         color: #333333;
         line-height: 21px;
         margin-bottom: 15px;
+        flex: 0 auto;
       }
       .van-field__control {
         color: #f67146;
@@ -79,7 +95,7 @@
     padding: 0 25px 30px;
     p {
       font-size: 16px;
-      line-height: 22px;
+      line-height: 26px;
       color: #333;
     }
   }

src/views/unit-test/unit-create/uni-last.tsx

@@ -2,6 +2,7 @@ import request from '@/helpers/request'
 import { state } from '@/state'
 import {
   Button,
+  Cell,
   Dialog,
   Empty,
   Field,
@@ -148,6 +149,7 @@ export default defineComponent({
         await request.post(
           state.platformApi + `/classGroupUnitExamination/publishUnitExamination`,
           {
+            hideLoading: false,
             data: {
               classGroupId: forms.value.classGroupId,
               lessonCoursewareExaminationMapperId: forms.value.testId,
@@ -176,23 +178,40 @@ export default defineComponent({
             {forms.value?.coursewareName}-{forms.value?.testName}
           </h4>
           <div class={styles.infoWrap}>
-            <p>乐团：{forms.value?.orchestraName}</p>
-            <p>班级：{forms.value?.classGroupName}</p>
-            <p>学生人数：{forms.value?.preStudentNum}人</p>
+            <Cell
+              center
+              valueClass={styles.wrapValue}
+              value={forms.value?.orchestraName}
+              title="乐团："
+              border={false}
+            />
+            <Cell
+              center
+              valueClass={styles.wrapValue}
+              value={forms.value?.classGroupName}
+              title="班级："
+              border={false}
+            />
+            <Cell
+              center
+              class={styles.heightValue}
+              valueClass={styles.wrapValue}
+              value={(forms.value?.preStudentNum || 0) + '人'}
+              title="学生人数："
+            />
             <Field
               v-model={forms.value.expiryDate}
               type="number"
               placeholder="请输入截止日期"
               input-align="right"
+              label="截止时间"
             >
               {{
                 extra: () => (
                   <div class={styles.loctionIconWrap}>
                     <span style={{ color: '#777' }}> 天后截止</span>
-                    {/* <Image width={19} height={18} src={locIcon}></Image> */}
                   </div>
-                ),
-                label: () => <span class={styles.addP}>截止时间</span>
+                )
               }}
             </Field>
           </div>

src/views/unit-test/unit-list/index.module.less

@@ -107,7 +107,7 @@
     padding: 0 25px 30px;
     p {
       font-size: 16px;
-      line-height: 22px;
+      line-height: 26px;
       color: #333;
       span {
         width: 80px;