Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

src/router/routes-common.ts

@@ -134,7 +134,15 @@ export const router: RouteRecordRaw[] = [
     meta: {
       title: '测试详情'
     }
-  }
+  },
+  {
+    path: '/approval-manage-subsidy',
+    name: 'approval-manage-subsidy',
+    component: () => import('@/school/approval-manage/subsidy/index'),
+    meta: {
+      title: '补助确认'
+    }
+  },
 ]
 
 // 不需要登录的路由

src/router/routes-school.ts

@@ -303,14 +303,6 @@ export default [
         }
       },
       {
-        path: '/approval-manage-subsidy',
-        name: 'approval-manage-subsidy',
-        component: () => import('@/school/approval-manage/subsidy/index'),
-        meta: {
-          title: '补助确认'
-        }
-      },
-      {
         path: '/subsidy-exercise-detail',
         name: 'subsidy-exercise-detail',
         component: () => import('@/school/approval-manage/subsidy/exercise-detail'),

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

@@ -152,7 +152,6 @@ export default defineComponent({
           <div class={styles.topWrap}>
             <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight}>
               <OHeader
-                isBack
                 border={false}
                 background={state.heightV > state.scrollTop ? 'transparent' : '#fff'}
               >

src/views/exercise-record/modals/detail-item.module.less

@@ -62,7 +62,7 @@
         line-height: 30px;
         margin-bottom: 4px;
         font-family: 'DINA';
-        font-weight: bold;
+        font-weight: normal;
 
         span {
           margin-left: 1px;