liushengqiang 1 year ago
parent
commit
4481ef08fb

+ 46 - 29
src/views/courseware-list/component/book/index.module.less

@@ -34,28 +34,6 @@
             box-shadow: 0 0 20px 0 rgba(0, 0, 0, .4);
         }
 
-        .even .gradient {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background-image: url(./pics/right-border.png);
-            background-position: right top;
-            background-repeat: repeat-y;
-        }
-
-        .odd .gradient {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            background-image: url(./pics/left-border.png);
-            background-position: left top;
-            background-repeat: repeat-y;
-        }
-
         .page-wrapper {
             perspective: 2000px;
         }
@@ -67,31 +45,70 @@
     padding: 14Px;
     height: 100%;
     overflow: hidden;
+    background-color: #FFD8A1;
+
+    .wrapItem {
+        padding: 10Px;
+        height: 100%;
+        background-color: #fff;
+        border-radius: 3Px;
+        overflow: hidden;
+    }
 
     .item {
         display: flex;
-        justify-content: space-between;
         font-size: 14px;
         font-weight: 600;
         color: #333;
-        line-height: 20Px;
+        line-height: 22Px;
         padding: 6Px 0;
-        word-break:break-all;
+        word-break: break-all;
     }
 
     .des {
-        padding-left: 10px;
         font-size: 12px;
     }
 
     .icon {
-        width: 22px;
-        height: 22px;
+        width: 22Px;
+        height: 22Px;
+        margin-right: 6Px;
     }
-    .last{
+
+    .last {
         font-size: 12Px;
         color: #FF5A56;
         margin-left: 6px;
         font-weight: 400;
     }
+}
+
+:global(.odd) {
+    .wrap {
+        padding-left: 0;
+
+    }
+
+    .wrapItem {
+        padding-left: 14Px;
+        background-image: url('./pics/right-border.png');
+        background-position: left top;
+        background-repeat: no-repeat;
+        background-size: 24Px 100%;
+    }
+}
+
+:global(.even) {
+    .wrap {
+        padding-right: 0;
+
+    }
+
+    .wrapItem {
+        padding-right: 14Px;
+        background-image: url('./pics/left-border.png');
+        background-position: right top;
+        background-repeat: no-repeat;
+        background-size: 24Px 100%;
+    }
 }

+ 34 - 32
src/views/courseware-list/component/book/index.tsx

@@ -9,7 +9,7 @@ import {
 } from 'vue';
 import styles from './index.module.less';
 import icon_back from '../../image/icon_back.svg';
-import icon_play from '../../image/icon_play.svg';
+import icon_play from '../../image/icon_class.png';
 import { useRouter } from 'vue-router';
 import { listenerMessage, postMessage } from '@/helpers/native-message';
 import { showToast } from 'vant';
@@ -35,7 +35,7 @@ export default defineComponent({
   emits: ['close'],
   setup(props, { emit }) {
     const router = useRouter();
-    
+
     const data = reactive({
       show: false,
       width: 0,
@@ -142,8 +142,8 @@ export default defineComponent({
     onMounted(async () => {
       await init();
       listenerMessage('webViewOnResume', () => {
-        data.lastTime = localStorage.getItem('lastTime')
-      })
+        data.lastTime = localStorage.getItem('lastTime');
+      });
     });
     const getList = () => {
       if (!props.bookData?.lessonList) return;
@@ -229,35 +229,37 @@ export default defineComponent({
                   <div class="page">
                     <div class="gradient"></div>
                     <div class={styles.wrap}>
-                      {list.map((item: any, index: number) => {
-                        return (
-                          <>
-                            <div
-                              class={[styles.item, item.id && styles.des]}
-                              onTouchstart={(e: TouchEvent) => {
-                                e.stopPropagation();
-                              }}
-                              onClick={(e: Event) => {
-                                e.stopPropagation();
-                                handleOpenPlay(item);
-                              }}>
-                              <div class={styles.name}>
-                                {item.name}
-                                {data.lastTime === item.id && (
-                                  <span class={styles.last}>上次观看</span>
-                                )}
+                      <div class={styles.wrapItem}>
+                        {list.map((item: any, index: number) => {
+                          return (
+                            <>
+                              <div
+                                class={[styles.item, item.id && styles.des]}
+                                onTouchstart={(e: TouchEvent) => {
+                                  e.stopPropagation();
+                                }}
+                                onClick={(e: Event) => {
+                                  e.stopPropagation();
+                                  handleOpenPlay(item);
+                                }}>
+                                {item.id ? (
+                                  <img
+                                    id={index == 1 ? 'coursewareDetail-0' : ''}
+                                    class={styles.icon}
+                                    src={icon_play}
+                                  />
+                                ) : null}
+                                <div class={styles.name}>
+                                  {item.name}
+                                  {data.lastTime === item.id && (
+                                    <span class={styles.last}>上次观看</span>
+                                  )}
+                                </div>
                               </div>
-                              {item.id ? (
-                                <img
-                                  id={index == 1 ? 'coursewareDetail-0' : ''}
-                                  class={styles.icon}
-                                  src={icon_play}
-                                />
-                              ) : null}
-                            </div>
-                          </>
-                        );
-                      })}
+                            </>
+                          );
+                        })}
+                      </div>
                     </div>
                   </div>
                 );

BIN
src/views/courseware-list/component/book/pics/left-border.png


BIN
src/views/courseware-list/component/book/pics/preview.jpg


BIN
src/views/courseware-list/component/book/pics/right-border.png


BIN
src/views/courseware-list/image/icon_class.png


+ 2 - 0
src/views/school-register/index.tsx

@@ -390,9 +390,11 @@ export default defineComponent({
                   </Field>
                   <Field
                     class={styles.codeWrap}
+                    center
                     border
                     name="code"
                     label="验证码"
+                    labelWidth={70}
                     placeholder="请输入验证码"
                     v-model={forms.code}
                     onUpdate:modelValue={(val: string) => {

+ 10 - 2
src/views/teaher-register/component/success/index.module.less

@@ -23,7 +23,7 @@
     position: relative;
     width: 80vw;
     margin: 0 auto;
-    padding: 48Px 0 60Px 0;
+    padding: 48Px 0 50Px 0;
 
     &>img {
         display: block;
@@ -46,7 +46,7 @@
     .group {
         border-radius: 14Px;
         overflow: hidden;
-        padding: 14Px 0 20Px;
+        padding: 32Px 0;
         min-height: 256Px;
         display: flex;
         flex-direction: column;
@@ -76,6 +76,7 @@
 }
 
 .submit {
+    position: relative;
     padding: 20Px 15Px 0;
 
     :global {
@@ -87,4 +88,11 @@
             border: none;
         }
     }
+}
+.icon_head{
+    position: absolute;
+    display: block;
+    right: 20px;
+    bottom: -30px;
+    width: 60px;
 }

+ 3 - 1
src/views/teaher-register/component/success/index.tsx

@@ -7,6 +7,7 @@ import icon_pcTeacher from '../../images/icon_pcTeacher.png';
 import icon_url from '../../images/icon_url.png';
 import icon_chrome from '../../images/icon_chrome.png';
 import MHeader from '@/components/m-header';
+import icon_head from '../../images/icon_head.png';
 
 export default defineComponent({
   name: 'SchoolRegister',
@@ -44,8 +45,9 @@ export default defineComponent({
                 </div>
                 <div class={styles.submit}>
                   <Button block onClick={copyTo}>
-                    复制链接
+                    一键复制链接
                   </Button>
+                  <img class={styles.icon_head} src={icon_head} />
                 </div>
               </CellGroup>
             </Form>

BIN
src/views/teaher-register/images/icon_head.png


+ 4 - 1
src/views/teaher-register/index.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
       tenantId: route.query.tenantId || '', // 机构
       phone: null as any,
       schoolId: route.query.schoolId || '', // 学校id
-      nickname: null,
+      nickname: '',
       gender: 1
     });
     const data = reactive({
@@ -193,6 +193,9 @@ export default defineComponent({
                   placeholder="请输入老师姓名"
                   maxlength={20}
                   v-model={forms.nickname}
+                  onUpdate:modelValue={(val: string) => {
+                    forms.nickname = val.trim();
+                  }}
                 />
                 <Field
                   border={false}