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

src/school/attendance/components/teacher-attendDetail.module.less

@@ -2,7 +2,7 @@
   margin: 12px 13px 12px;
   font-size: 14px;
   .itemWrapTopCard {
-    padding: 12px 15px 15px;
+    padding: 12px 15px 20px;
     border-radius: 10px;
     background-color: #fff;
     margin-bottom: 12px;
@@ -56,7 +56,7 @@
       display: flex;
       flex-direction: row;
       align-items: center;
-      padding-bottom: 15px;
+      // padding-bottom: 15px;
       .headImgs {
         width: 42px;
         height: 42px;

src/school/ranking-list/components/day-bang.tsx

@@ -191,7 +191,7 @@ export default defineComponent({
 
             <div style={{ padding: '0 13px', background: '#FFF' }}>
               <div
-                class={styles.searchBand}
+                class={[styles.searchBand, styles.orchestraBand]}
                 onClick={() => {
                   state.showPopoverOrchestra = true
                 }}

src/school/ranking-list/components/timer-bang.module.less

@@ -7,6 +7,18 @@
   color: #333;
   font-weight: 500;
   padding: 12px 0;
+  font-size: 14px;
+  .orchestraBand {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    p {
+      max-width: 120px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 
 .searchBand {

src/school/ranking-list/index.module.less

@@ -24,7 +24,7 @@
   :global {
     .van-tabs__line {
       bottom: 20px;
-      width: 20px;
+      width: 15px;
     }
   }
 }

src/school/school-detail/eidt-school.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
                 ></Image>
                 <div class={styles.schoolBtnWrap}>
                   <p>修改校徽</p>
-                  <Icon name="arrow" size="20px" color="#aaa"></Icon>
+                  <Icon name="arrow" size="12px" color="#aaa"></Icon>
                 </div>
               </div>
             </CellGroup>
@@ -175,11 +175,9 @@ export default defineComponent({
               {/*    onClick={() => (state.showArea = true)} */}
               <Field
                 label-align="top"
-                rows={3}
                 v-model={forms.address}
                 maxlength={50}
                 placeholder="请选择地址"
-                type="textarea"
                 disabled
                 onClick={() => setAddress()}
               >

src/student/ranking-list/components/timer-bang.module.less

@@ -7,4 +7,5 @@
   color: #333;
   font-weight: 500;
   padding: 12px 0;
+  font-size: 14px;
 }

src/student/ranking-list/index.module.less

@@ -24,7 +24,7 @@
   :global {
     .van-tabs__line {
       bottom: 20px;
-      width: 20px;
+      width: 15px;
     }
   }
 }

src/teacher/attendance/index.module.less

@@ -21,6 +21,18 @@
   background-color: #f8f8f8;
   color: #333;
   font-weight: 500;
+  font-size: 14px;
+  .orchestraBand {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    p {
+      max-width: 120px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
 }
 
 .searchBand {

src/teacher/attendance/index.tsx

@@ -176,7 +176,7 @@ export default defineComponent({
 
             <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
               <div
-                class={styles.searchBand}
+                class={[styles.searchBand, styles.orchestraBand]}
                 onClick={() => {
                   state.showPopoverOrchestra = true
                 }}

src/teacher/attendance/modals/teacherAtt-item.module.less

@@ -71,15 +71,17 @@
       color: #fff;
       background: #ff8057;
       border-radius: 4px;
-      line-height: 17px;
+      line-height: 20px;
       font-weight: 500;
+      font-size: 12px;
     }
     .typeTagNo {
+      font-size: 12px;
       padding: 0 6px;
       color: #fff;
       background: #d2d2d2;
       border-radius: 4px;
-      line-height: 17px;
+      line-height: 20px;
       font-weight: 500;
     }
     .attInfo {