修改接口

dist/assets/index-legacy.2ae28dc5.js

@@ -13143,7 +13143,7 @@
                                   (e.loading = !0),
                                   (n.prev = 7),
                                   (n.next = 10),
-                                  xp.get(zv.platformApi + '/appLoginUser/getUserInfo', {
+                                  xp.get(zv.platformApi + '/user/getUserInfo', {
                                     initRequest: !0,
                                     requestType: 'form'
                                   })
@@ -13407,7 +13407,7 @@
                                   (e.loading = !0),
                                   (n.prev = 7),
                                   (n.next = 10),
-                                  Gp.get('/api-student/appLoginUser/getUserInfo', {
+                                  Gp.get('/api-student/user/getUserInfo', {
                                     initRequest: !0,
                                     requestType: 'form'
                                   })

src/components/o-empty/index.module.less

@@ -7,6 +7,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-direction: column;
   .tips {
     font-size: 14px;
     color: #333;

src/helpers/request.ts

@@ -54,7 +54,7 @@ request.interceptors.request.use(
       Authorization &&
       ![
         '/api-oauth/userlogin',
-        // `${state.platformApi}/appLoginUser/getUserInfo`,
+        // `${state.platformApi}/user/getUserInfo`,
         '/api-oauth/open/sendSms'
       ].includes(url)
     ) {

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

@@ -12,6 +12,7 @@ import eiditICon from '../images/eidit-icon.png'
 import questICon from '../images/quest-icon.png'
 import StudentCourseItem from './student-course-item'
 import dayjs from 'dayjs'
+import ODialog from '@/components/o-dialog'
 const activeName = ref('wait')
 const item = ref({} as any)
 const courseScheduleList = ref([] as any)
@@ -22,7 +23,10 @@ export default defineComponent({
   setup() {
     const router = useRouter()
     const route = useRoute()
-    const state = reactive({})
+    const state = reactive({
+      dialogStatus: false,
+      dialogMessage: ''
+    })
 
     const getLeaveDetail = async () => {
       try {
@@ -51,15 +55,20 @@ export default defineComponent({
         return
       }
       try {
-        const { data } = await request.post(`/api-school/userApproveRecord/approval`, {
+        const res = await request.post(`/api-school/userApproveRecord/approval`, {
           data: {
             id: route.query.id,
             approvalComments: leaveReason.value,
             status: val
           }
         })
-        showToast('提交成功')
-        router.push('/approval-manage')
+        if (res.code === 999) {
+          state.dialogStatus = true
+          state.dialogMessage = res.message
+        } else {
+          showToast('提交成功')
+          router.push('/approval-manage')
+        }
       } catch (e: any) {
         showToast(e.message || '提交失败')
       }
@@ -162,6 +171,16 @@ export default defineComponent({
               </Button>
             </div>
           )}
+
+          <ODialog
+            title="提示"
+            v-model:show={state.dialogStatus}
+            message={state.dialogMessage}
+            confirmButtonText="确定"
+            onConfirm={() => {
+              router.back()
+            }}
+          />
         </div>
       </>
     )

src/school/practice-rewards/detail.tsx

@@ -14,7 +14,7 @@ export default defineComponent({
     const route = useRoute()
     const state = reactive({
       subjectStatus: false,
-      subjectList: [],
+      subjectList: [] as any,
       isClick: false,
       list: [] as any,
       listState: {
@@ -24,8 +24,10 @@ export default defineComponent({
         refreshing: false,
         height: 0 // 页面头部高度，为了处理下拉刷新用的
       },
+      subjectName: '全部声部',
       params: {
         type: null,
+        subjectId: null,
         page: 1,
         rows: 20
       }
@@ -40,7 +42,12 @@ export default defineComponent({
             rows: 50
           }
         })
+
         state.subjectList = data.rows || []
+        state.subjectList.unshift({
+          subjectId: '',
+          subjectName: '全部声部'
+        })
       } catch {
         //
       }
@@ -156,7 +163,7 @@ export default defineComponent({
               state.subjectStatus = !state.subjectStatus
             }}
           >
-            <div>全部声部</div>
+            <div>{state.subjectName}</div>
           </span>
         </div>
         {state.listState.dataShow ? (
@@ -212,7 +219,14 @@ export default defineComponent({
           <Picker
             columns={state.subjectList}
             onCancel={() => (state.subjectStatus = false)}
-            onConfirm={(val: any) => {}}
+            onConfirm={(val: any) => {
+              console.log(val)
+              const selectOptions = val.selectedOptions[0]
+              state.subjectName = selectOptions.subjectName
+              state.params.subjectId = selectOptions.subjectId
+              onRefresh()
+              state.subjectStatus = false
+            }}
             columnsFieldNames={{ text: 'subjectName', value: 'subjectId' }}
           />
         </Popup>

src/school/practice-rewards/index.tsx

@@ -11,7 +11,9 @@ import { moneyFormat } from '@/helpers/utils'
 export default defineComponent({
   name: 'practice-rewards',
   setup() {
+    const seeType = localStorage.getItem('practice-rewards-see-type')
     const state = reactive({
+      seeType: seeType || 'see',
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -76,9 +78,23 @@ export default defineComponent({
           <div class={styles.headerContainer}>
             <div class={styles.headerContent}>
               {/* closed-eye eye-o */}
-              <Icon class={styles.iconEye} name="eye-o" />
+              <Icon
+                class={styles.iconEye}
+                name={state.seeType === 'see' ? 'eye-o' : 'closed-eye'}
+                onClick={() => {
+                  if (state.seeType === 'see') {
+                    localStorage.setItem('practice-rewards-see-type', 'hide')
+                    state.seeType = 'hide'
+                  } else {
+                    localStorage.setItem('practice-rewards-see-type', 'see')
+                    state.seeType = 'see'
+                  }
+                }}
+              />
               <div class={styles.priceTitle}>待结算金额 (元)</div>
-              <div class={styles.priceCount}>{moneyFormat(state.statistics.waitSalary)}</div>
+              <div class={styles.priceCount}>
+                {state.seeType === 'see' ? moneyFormat(state.statistics.waitSalary) : '******'}
+              </div>
               <Progress
                 color="#fff"
                 trackColor="#E7441A"
@@ -87,7 +103,12 @@ export default defineComponent({
                 strokeWidth={8}
               />
               <div class={styles.countRewards}>
-                累计奖励 (元) ：<span>{moneyFormat(state.statistics.totalTrainingSalary)}</span>
+                累计奖励 (元) ：
+                <span>
+                  {state.seeType === 'see'
+                    ? moneyFormat(state.statistics.totalTrainingSalary)
+                    : '******'}
+                </span>
               </div>
             </div>
           </div>

src/student/music-group/layout/auth.tsx

@@ -46,7 +46,7 @@ export default defineComponent({
       if (state.user.status === 'init' || state.user.status === 'error') {
         this.loading = true
         try {
-          const res = await request.get('/api-student/appLoginUser/getUserInfo', {
+          const res = await request.get('/api-student/user/getUserInfo', {
             initRequest: true, // 初始化接口
             requestType: 'form'
           })

src/student/music-group/layout/login.tsx

@@ -158,7 +158,7 @@ export default defineComponent({
 
         setAuth(data.token_type + ' ' + data.access_token)
 
-        const userCash = await request.get('/api-student/appLoginUser/getUserInfo', {
+        const userCash = await request.get('/api-student/user/getUserInfo', {
           initRequest: true // 初始化接口
         })
         setLogin(userCash.data)

src/views/layout/auth.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
       if (state.user.status === 'init' || state.user.status === 'error') {
         this.loading = true
         try {
-          const res = await request.get(state.platformApi + '/appLoginUser/getUserInfo', {
+          const res = await request.get(state.platformApi + '/user/getUserInfo', {
             initRequest: true, // 初始化接口
             requestType: 'form',
             hideLoading: true

src/views/layout/login.tsx

@@ -84,7 +84,7 @@ export default defineComponent({
 
         setAuth(data.token_type + ' ' + data.access_token)
 
-        const userCash = await request.get(state.platformApi + '/appLoginUser/getUserInfo', {
+        const userCash = await request.get(state.platformApi + '/user/getUserInfo', {
           initRequest: true // 初始化接口
         })
         // 初始化学校信息