lex 2 gadi atpakaļ
vecāks
revīzija
162a4d34ab

+ 10 - 1
src/router/routes-common.ts

@@ -170,7 +170,16 @@ export const router: RouteRecordRaw[] = [
     meta: {
       title: '相册详情'
     }
-  }
+  },
+  // message-detail
+  {
+    path: '/message-detail',
+    name: 'message-detail',
+    component: () => import('@/views/information/message-detail'),
+    meta: {
+      title: '消息详情'
+    }
+  },
 ]
 
 // 不需要登录的路由

+ 1 - 1
src/school/attendance/index.tsx

@@ -25,7 +25,7 @@ export default defineComponent({
     return () => (
       <>
         <OSticky position="top" background="#F8F8F8" onGetHeight={getHeight} ref={stickyRef}>
-          <OHeader></OHeader>
+          <OHeader border={false}></OHeader>
         </OSticky>
 
         <Tabs v-model:active={activeName.value} sticky swipeable offsetTop={state.heightV}>

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

@@ -95,7 +95,7 @@ export default defineComponent({
     return () => (
       <>
         {/* </OSticky> */}
-        <OHeader>
+        <OHeader border={false}>
           {{
             title: () => (
               <div class={styles.NavTitle} onClick={() => (state.showPopoverTime = true)}>

+ 1 - 1
src/school/orchestra/modal/student-list.tsx

@@ -181,7 +181,7 @@ export default defineComponent({
     return () => (
       <div class={styles.studentList}>
         <OSticky position="top">
-          <OHeader title="选择学生" desotry={false} />
+          <OHeader title="选择学生" desotry={false} border={false} />
           <OSearch
             // inputBackground="white"
             // background="#F8F8F8"

+ 1 - 1
src/school/orchestra/modal/teacher-list.tsx

@@ -136,7 +136,7 @@ export default defineComponent({
         style={{ background: '#F8F8F8', minHeight: '100%' }}
       >
         <OSticky position="top" mode={props.mode}>
-          {props.header && <OHeader title="选择伴学指导" />}
+          {props.header && <OHeader title="选择伴学指导" border={false} />}
           <OSearch
             // inputBackground="white"
             // background="#F8F8F8"

+ 3 - 3
src/styles/index.less

@@ -359,11 +359,11 @@ input {
 
 .searchGroupInput {
   .van-search {
-    padding-bottom: 0;
+    padding-bottom: 0 !important;
   }
 }
 .searchGroup {
-  padding: 0 13px;
+  padding: 0 13px !important;
   line-height: 44px;
   background-color: #fff;
   display: flex;
@@ -418,7 +418,7 @@ input {
 }
 
 .searchGroup-single {
-  padding: 12px 13px;
+  padding: 12px 13px !important;
   .searchItem {
     position: relative;
     box-sizing: border-box;

+ 17 - 2
src/views/bind-wechat/index.tsx

@@ -18,8 +18,8 @@ export default defineComponent({
     const forms = reactive({
       showPopup: false,
       code: '',
-      phone: route.query.phone,
-      time: route.query.time,
+      phone: '' as any,
+      time: '' as any,
       // platform: route.query.platform,
       popupMessage: '请使用微信打开'
     })
@@ -93,6 +93,21 @@ export default defineComponent({
           forms.code = code
         }
       }
+      // 处理链接上面的参数
+      try {
+        const hash = window.location.hash ? window.location.hash.split('?')[1] : ''
+        const atob = window.atob(decodeURIComponent(hash))
+        const params = qs.parse(atob)
+        forms.phone = params.phone
+        forms.time = params.time
+        if (!forms.phone) {
+          forms.popupMessage = '链接已失效'
+          forms.showPopup = true
+          return
+        }
+      } catch {
+        //
+      }
 
       // t: route.query.t, // 过期时间
       try {

+ 39 - 0
src/views/information/message-detail.tsx

@@ -0,0 +1,39 @@
+import request from '@/helpers/request'
+import { state } from '@/state'
+import { defineComponent, onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
+import styles from './information-detail.module.less'
+
+export default defineComponent({
+  name: 'orchestra-information-detail',
+  setup() {
+    const route = useRoute()
+    const detail = ref<any>({})
+
+    const getDetails = async () => {
+      try {
+        const { data } = await request.get(
+          state.platformApi + '/sysMessage/detail/' + route.query.id
+        )
+        detail.value = data
+      } catch {
+        //
+      }
+    }
+
+    onMounted(() => {
+      getDetails()
+    })
+    return () => (
+      <div class={styles.detail}>
+        <div class={styles.title}>{detail.value.title}</div>
+        <div class={styles.who}>
+          <span>管乐团</span>
+          {detail.value.createTime}
+        </div>
+
+        <div class={styles.content} v-html={detail.value.content}></div>
+      </div>
+    )
+  }
+})

+ 8 - 1
src/views/unit-test/model/keep-look-question/index.tsx

@@ -277,7 +277,14 @@ export default defineComponent({
         // ctx.scale(dpr, dpr)
         // canvasRef.width = canvasRef.offsetWidth
         // canvasRef.height = canvasRef.offsetHeight
-        ctx.clearRect(0, 0, state.answerRect.width, state.answerRect.height)
+        // width={state.answerRect.width * state.dpr || 0}
+        // height={state.answerRect.height * state.dpr || 0}
+        ctx.clearRect(
+          0,
+          0,
+          state.answerRect.width * state.dpr || 0,
+          state.answerRect.height * state.dpr || 0
+        )
         state.drawLineList.forEach((item: any) => {
           drawLine(ctx, item.startPoint, item.endPoint)
         })

+ 8 - 3
src/views/unit-test/unit-list/index.tsx

@@ -111,9 +111,14 @@ export default defineComponent({
     }
     return () => (
       <div class={styles.unitTest}>
-        <OSticky position="top">
+        <OSticky
+          position="top"
+          onGetHeight={(height: any) => {
+            document.documentElement.style.setProperty('--header-height', height + 'px')
+          }}
+        >
           {/* */}
-          <OHeader>
+          <OHeader border={false}>
             {{
               right: () =>
                 platformApi == '/api-teacher' ? (
@@ -146,7 +151,7 @@ export default defineComponent({
           <OFullRefresh
             v-model:modelValue={refreshing.value}
             onRefresh={onRefresh}
-            style="min-height: 100vh;"
+            style="min-height: calc(100vh - var(--header-height));"
           >
             <List
               // v-model:loading={form.listState.loading}