lex-xin преди 2 години
родител
ревизия
5d7b55ab6e
променени са 5 файла, в които са добавени 124 реда и са изтрити 62 реда
  1. 3 3
      index.html
  2. 52 14
      public/flexible.js
  3. 4 4
      src/business-components/calendar/index.module.less
  4. 24 4
      src/teacher/practice-class/practice-setting.tsx
  5. 41 37
      teacher.html

+ 3 - 3
index.html

@@ -32,14 +32,14 @@
   <meta name="apple-touch-fullscreen" content="yes">
   <!-- windows phone 点击无高光 -->
   <meta name="msapplication-tap-highlight" content="no">
-  <title>酷乐秀-学生端</title>
+  <title>酷乐秀</title>
   <script src="/flexible.js" charset="UTF-8"></script>
 </head>
 
 <body>
   <div id="app"></div>
-  <!-- <script type="module" src="/src/student/main.ts"></script> -->
-  <script type="module" src="/src/teacher/main.ts"></script>
+  <script type="module" src="/src/student/main.ts"></script>
+  <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
 </body>
 
 </html>

+ 52 - 14
public/flexible.js

@@ -1,14 +1,52 @@
-!function(a,b){function c(){var b=f.getBoundingClientRect().width;b/i>540&&(b=540*i);var c=b/10;f.style.fontSize=c+"px",k.rem=a.rem=c}var d,e=a.document,f=e.documentElement,g=e.querySelector('meta[name="viewport"]'),h=e.querySelector('meta[name="flexible"]'),i=0,j=0,k=b.flexible||(b.flexible={});if(g){console.warn("将根据已有的meta标签来设置缩放比例");var l=g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);l&&(j=parseFloat(l[1]),i=parseInt(1/j))}else if(h){var m=h.getAttribute("content");if(m){var n=m.match(/initial\-dpr=([\d\.]+)/),o=m.match(/maximum\-dpr=([\d\.]+)/);n&&(i=parseFloat(n[1]),j=parseFloat((1/i).toFixed(2))),o&&(i=parseFloat(o[1]),j=parseFloat((1/i).toFixed(2)))}}if(!i&&!j){var p=a.navigator.userAgent,q=(!!p.match(/android/gi),!!p.match(/iphone/gi)),r=q&&!!p.match(/OS 9_3/),s=a.devicePixelRatio;i=q&&!r?s>=3&&(!i||i>=3)?3:s>=2&&(!i||i>=2)?2:1:1,j=1/i}if(f.setAttribute("data-dpr",i),!g)if(g=e.createElement("meta"),g.setAttribute("name","viewport"),g.setAttribute("content","initial-scale="+j+", maximum-scale="+j+", minimum-scale="+j+", user-scalable=no"),f.firstElementChild)f.firstElementChild.appendChild(g);else{var t=e.createElement("div");t.appendChild(g),e.write(t.innerHTML)}a.addEventListener("resize",function(){clearTimeout(d),d=setTimeout(c,300)},!1),a.addEventListener("pageshow",function(a){a.persisted&&(clearTimeout(d),d=setTimeout(c,300))},!1),"complete"===e.readyState?e.body.style.fontSize=12*i+"px":e.addEventListener("DOMContentLoaded",function(){e.body.style.fontSize=12*i+"px"},!1),c(),k.dpr=a.dpr=i,k.refreshRem=c,k.rem2px=function(a){var b=parseFloat(a)*this.rem;return"string"==typeof a&&a.match(/rem$/)&&(b+="px"),b},k.px2rem=function(a){var b=parseFloat(a)/this.rem;return"string"==typeof a&&a.match(/px$/)&&(b+="rem"),b}}(window,window.lib||(window.lib={}));
-
-
-
-
-
-
-
-
-
-
-
-
-
+! function (a, b) {
+  function c() {
+    var b = f.getBoundingClientRect().width;
+    b / i > 420 && (b = 420 * i);
+    var c = b / 10;
+    f.style.fontSize = c + "px", k.rem = a.rem = c
+  }
+  var d, e = a.document,
+    f = e.documentElement,
+    g = e.querySelector('meta[name="viewport"]'),
+    h = e.querySelector('meta[name="flexible"]'),
+    i = 0,
+    j = 0,
+    k = b.flexible || (b.flexible = {});
+  if (g) {
+    console.warn("将根据已有的meta标签来设置缩放比例");
+    var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+    l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+  } else if (h) {
+    var m = h.getAttribute("content");
+    if (m) {
+      var n = m.match(/initial\-dpr=([\d\.]+)/),
+        o = m.match(/maximum\-dpr=([\d\.]+)/);
+      n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((1 / i).toFixed(2)))
+    }
+  }
+  if (!i && !j) {
+    var p = a.navigator.userAgent,
+      q = (!!p.match(/android/gi), !!p.match(/iphone/gi)),
+      r = q && !!p.match(/OS 9_3/),
+      s = a.devicePixelRatio;
+    i = q && !r ? s >= 3 && (!i || i >= 3) ? 3 : s >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+  }
+  if (f.setAttribute("data-dpr", i), !g)
+    if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content", "initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f.firstElementChild) f.firstElementChild.appendChild(g);
+    else {
+      var t = e.createElement("div");
+      t.appendChild(g), e.write(t.innerHTML)
+    } a.addEventListener("resize", function () {
+    clearTimeout(d), d = setTimeout(c, 300)
+  }, !1), a.addEventListener("pageshow", function (a) {
+    a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+  }, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener("DOMContentLoaded", function () {
+    e.body.style.fontSize = 12 * i + "px"
+  }, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+    var b = parseFloat(a) * this.rem;
+    return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+  }, k.px2rem = function (a) {
+    var b = parseFloat(a) / this.rem;
+    return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+  }
+}(window, window.lib || (window.lib = {}));

+ 4 - 4
src/business-components/calendar/index.module.less

@@ -123,13 +123,13 @@
     padding: 8px 10px;
     margin-bottom: 10px;
     font-size: 12px;
-    color: #333333;
-    border-color: #d8d8d8;
+    color: #333333 !important;
+    border-color: #d8d8d8 !important;
 
     &.active {
-      color: var(--van-primary);
+      color: var(--van-primary) !important;
       background: #e0f7f3;
-      border-color: var(--van-primary);
+      border-color: var(--van-primary) !important;
     }
   }
 

+ 24 - 4
src/teacher/practice-class/practice-setting.tsx

@@ -14,7 +14,8 @@ import {
   ActionSheet,
   CheckboxGroup,
   Checkbox,
-  Dialog
+  Dialog,
+  Toast
 } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './practice-setting.module.less'
@@ -97,6 +98,27 @@ export default defineComponent({
       this.form.courseMinutes = item.courseMinutes
       this.form.freeMinutes = item.freeMinutes
     },
+    async onTimer() {
+      try {
+        const form = this.form
+        if (!form.courseMinutes) {
+          Toast('请选择单课时时长')
+          return
+        }
+        // const res = await request.post(
+        //   '/api-teacher/teacherFreeTime/getDetail',
+        //   {
+        //     data: {
+        //       courseMinutes: form.courseMinutes,
+        //       freeMinutes: form.freeMinutes
+        //     }
+        //   }
+        // )
+        // console.log(res)
+
+        this.timerStatus = true
+      } catch {}
+    },
     onChoiceTimer(item: any) {
       console.log(item)
       this.timerStatus = false
@@ -122,13 +144,11 @@ export default defineComponent({
         const index = tempItem.findIndex(
           (subjectId: any) => subjectId === item.id
         )
-        console.log(index)
         if (index === -1) {
           subjectPriceList.splice(subjectPriceList.indexOf(item), 1)
         }
       })
       this.form.subjectPrice = subjectPriceList
-      console.log(this.form.subjectPrice)
       this.subjectStatus = false
     },
     getSubjectName(id: any) {
@@ -255,7 +275,7 @@ export default defineComponent({
               name="singleMins"
               readonly
               isLink
-              onClick={() => (this.timerStatus = true)}
+              onClick={this.onTimer}
               rules={[{ required: true, message: '请选择可陪练时间段' }]}
               placeholder="未设置"
             />

+ 41 - 37
teacher.html

@@ -1,40 +1,44 @@
 <!DOCTYPE html>
 <html lang="zh">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <!-- 设置苹果工具栏颜色 -->
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <!-- 忽略页面中的数字识别为电话,忽略email识别 -->
-    <meta name="format-detection" content="telphone=no, email=no" />
-    <!-- 启用360浏览器的极速模式(webkit) -->
-    <meta name="renderer" content="webkit">
-    <!-- 避免IE使用兼容模式 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="HandheldFriendly" content="true">
-    <!-- uc强制竖屏 -->
-    <meta name="screen-orientation" content="portrait">
-    <!-- QQ强制竖屏 -->
-    <meta name="x5-orientation" content="portrait">
-    <!-- UC强制全屏 -->
-    <meta name="full-screen" content="yes">
-    <!-- QQ强制全屏 -->
-    <meta name="x5-fullscreen" content="true">
-    <!-- UC应用模式 -->
-    <meta name="browsermode" content="application">
-    <!-- QQ应用模式 -->
-    <meta name="x5-page-mode" content="app">
-    <!-- 设置在apple上以应用模式启动时,是否全屏 -->
-    <meta name="apple-touch-fullscreen" content="yes">
-    <!-- windows phone 点击无高光 -->
-    <meta name="msapplication-tap-highlight" content="no">
-    <title>酷乐秀-老师端</title>
-    <script src="/flexible.js" charset="UTF-8"></script>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/teacher/main.ts"></script>
-  </body>
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" href="/favicon.ico" />
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <!-- 设置苹果工具栏颜色 -->
+  <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+  <!-- 忽略页面中的数字识别为电话,忽略email识别 -->
+  <meta name="format-detection" content="telphone=no, email=no" />
+  <!-- 启用360浏览器的极速模式(webkit) -->
+  <meta name="renderer" content="webkit">
+  <!-- 避免IE使用兼容模式 -->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="HandheldFriendly" content="true">
+  <!-- uc强制竖屏 -->
+  <meta name="screen-orientation" content="portrait">
+  <!-- QQ强制竖屏 -->
+  <meta name="x5-orientation" content="portrait">
+  <!-- UC强制全屏 -->
+  <meta name="full-screen" content="yes">
+  <!-- QQ强制全屏 -->
+  <meta name="x5-fullscreen" content="true">
+  <!-- UC应用模式 -->
+  <meta name="browsermode" content="application">
+  <!-- QQ应用模式 -->
+  <meta name="x5-page-mode" content="app">
+  <!-- 设置在apple上以应用模式启动时,是否全屏 -->
+  <meta name="apple-touch-fullscreen" content="yes">
+  <!-- windows phone 点击无高光 -->
+  <meta name="msapplication-tap-highlight" content="no">
+  <title>酷乐秀</title>
+  <script src="/flexible.js" charset="UTF-8"></script>
+</head>
+
+<body>
+  <div id="app"></div>
+  <script type="module" src="/src/teacher/main.ts"></script>
+</body>
+
 </html>