1

1

src/school/approval-manage/batch-adjust.tsx

@@ -170,24 +170,26 @@ export default defineComponent({
           />
         </CellGroup>
 
-        <div class={['btnGroup btnMore']} style={{ marginTop: '20px' }}>
-          <Button
-            color="#ccc"
-            round
-            onClick={() => {
-              if (browser().isApp) {
-                postMessage({ api: 'back' })
-              } else {
-                router.back()
-              }
-            }}
-          >
-            取消
-          </Button>
-          <Button color="#FF8057" round onClick={onSubmit}>
-            下一步
-          </Button>
-        </div>
+        <OPopup position="bottom">
+          <div class={['btnGroup btnMore']} style={{ marginTop: '20px' }}>
+            <Button
+              color="#ccc"
+              round
+              onClick={() => {
+                if (browser().isApp) {
+                  postMessage({ api: 'back' })
+                } else {
+                  router.back()
+                }
+              }}
+            >
+              取消
+            </Button>
+            <Button color="#FF8057" round onClick={onSubmit}>
+              下一步
+            </Button>
+          </div>
+        </OPopup>
 
         {/* 乐团列表 */}
         <Popup v-model:show={forms.orchestraStatus} position="bottom" round>

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/mass-message/create-message.tsx

@@ -316,6 +316,7 @@ export default defineComponent({
             }}
             readonly
             isLink={!formDisabled.value}
+            class={styles.inputForm}
           />
           {/* 定时发送才会有时间 */}
           {forms.sendType === 'SCHEDULED' && (
@@ -330,6 +331,7 @@ export default defineComponent({
               }}
               readonly
               isLink
+              class={styles.inputForm}
             />
           )}
           <Cell title="发送内容">
@@ -369,6 +371,7 @@ export default defineComponent({
             label="发送对象"
             readonly
             inputAlign="right"
+            class={styles.sendObjPlaceholder}
             placeholder={formDisabled.value ? '' : '请选择发送对象'}
             isLink={!formDisabled.value}
             border={false}

src/school/mass-message/index.module.less

@@ -68,6 +68,13 @@
       // padding-bottom: 3px;
     }
   }
+  .inputForm {
+    :global {
+      input {
+        color: #f67146;
+      }
+    }
+  }
 }
 .cellGroup {
   margin-top: 12px;
@@ -79,6 +86,11 @@
       font-size: 16px;
       color: #333333;
     }
+    .van-cell__right-icon {
+      font-size: 13px;
+      font-weight: bold;
+      color: #d8d8d8;
+    }
   }
 }
 
@@ -97,3 +109,11 @@
     margin-right: 12px;
   }
 }
+
+.sendObjPlaceholder {
+  :global {
+    .van-field__body {
+      font-size: 14px;
+    }
+  }
+}

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

@@ -191,12 +191,13 @@ export default defineComponent({
 
             <div style={{ padding: '0 13px', background: '#FFF' }}>
               <div
-                class={styles.searchBand}
+                class={[styles.searchBand, styles.orchestraBand]}
                 onClick={() => {
                   state.showPopoverOrchestra = true
                 }}
               >
-                {forms.orchestraName}
+                <p> {forms.orchestraName}</p>
+
                 <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>

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

@@ -7,4 +7,16 @@
   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;
+    }
+  }
 }

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/school/school-detail/index.module.less

@@ -63,6 +63,9 @@
         font-weight: 500;
         color: #333333;
         line-height: 21px;
+        &:last-child {
+          margin-bottom: 0;
+        }
       }
       // .eidtIcon {
       // }

src/school/train-planning/modal/calendar/index.module.less

@@ -29,20 +29,36 @@
     }
   }
   :global {
+    .van-calendar__top-info {
+      position: relative !important;
+      height: 8px;
+      display: block;
+      width: 100%;
+    }
     .van-calendar__header {
       box-shadow: none;
     }
     .van-calendar__selected-day {
-      width: 40px !important;
+      background: transparent !important;
+      display: block;
+      width: 100% !important;
       height: 54px !important;
       border-radius: 5px;
       overflow: hidden;
       align-items: flex-start;
-      background: linear-gradient(45deg, #ffa357 0%, #ff6736 100%) !important;
+
       .van-calendar__bottom-info {
         color: #fff !important;
+
         background: #ff945c;
         box-shadow: 1px 2px 4px 0px #ff6221;
+        border-radius: 4px;
+      }
+    }
+    .van-calendar__day--selected {
+      &::after {
+        content: ' ';
+        background: linear-gradient(45deg, #ffa357 0%, #ff6736 100%) !important;
       }
     }
     .van-calendar__weekday {
@@ -51,9 +67,11 @@
     }
     .van-calendar__day {
       font-size: 20px;
+      line-height: 24px;
       font-weight: bold;
       color: #333;
-      align-items: flex-start;
+      display: block;
+      // align-items: flex-start;
       // padding-top: 6px;
 
       &::after {
@@ -80,7 +98,7 @@
       padding: 12px 0;
     }
     .van-calendar__bottom-info {
-      bottom: 6px;
+      bottom: 8px;
       background: #ffe7c8;
       border-radius: 4px;
       font-size: 11px;

src/school/train-planning/modal/calendar/index.tsx

@@ -185,6 +185,7 @@ export default defineComponent({
           formatter={this.formatter}
           onSelect={this.onDateSelect}
           v-slots={{
+            'top-info': () => <div class={styles.topInfo}></div>,
             subtitle: () => (
               <div class={styles.subtitle}>
                 <span>{this.subtitle}</span>

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,4 +21,16 @@
   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;
+    }
+  }
 }

src/teacher/attendance/index.tsx

@@ -176,12 +176,13 @@ export default defineComponent({
 
             <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
               <div
-                class={styles.searchBand}
+                class={[styles.searchBand, styles.orchestraBand]}
                 onClick={() => {
                   state.showPopoverOrchestra = true
                 }}
               >
-                {forms.orchestraName}
+                <p> {forms.orchestraName}</p>
+
                 <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>

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 {

src/views/information/help-center/index.module.less

@@ -12,4 +12,34 @@
       }
     }
   }
+
+  .containerInformation {
+    .img {
+      width: 142px;
+      height: 80px;
+      border-radius: 10px;
+      overflow: hidden;
+      margin-right: 15px;
+      flex-shrink: 0;
+    }
+
+    .title {
+      font-size: 14px;
+      font-weight: 500;
+      color: #333333;
+      line-height: 21px;
+      padding-top: 5px;
+    }
+    .content {
+      font-size: 12px;
+      color: #777777;
+      line-height: 17px;
+    }
+    .time {
+      padding-bottom: 5px;
+      font-size: 12px;
+      color: #aaaaaa;
+      line-height: 17px;
+    }
+  }
 }

src/views/information/index.tsx

@@ -2,9 +2,9 @@ import OEmpty from '@/components/o-empty'
 import OSearch from '@/components/o-search'
 import OSticky from '@/components/o-sticky'
 import request from '@/helpers/request'
-import { forms } from '@/school/train-planning/create'
 import { state } from '@/state'
-import { Cell, CellGroup, List } from 'vant'
+import dayjs from 'dayjs'
+import { Cell, CellGroup, List, Image } from 'vant'
 import { defineComponent, onMounted, reactive } from 'vue'
 import { useRouter } from 'vue-router'
 import styles from './help-center/index.module.less'
@@ -94,17 +94,34 @@ export default defineComponent({
             v-model:loading={form.listState.loading}
             finished={form.listState.finished}
             finishedText=" "
-            class={styles.container}
+            class={[styles.container, styles.containerInformation]}
             onLoad={getList}
             immediateCheck={false}
           >
             {form.list.map((item: any) => (
               <Cell
-                titleClass={[styles.title, 'van-ellipsis']}
-                title={item.title}
-                isLink
+                class={styles.cell}
                 onClick={() => onDetail(item)}
-              ></Cell>
+                titleStyle={{
+                  display: 'flex',
+                  flexDirection: 'column',
+                  justifyContent: 'space-between'
+                }}
+              >
+                {{
+                  icon: () => <Image src={item.coverImage} class={styles.img} />,
+                  title: () => (
+                    <>
+                      <div class={[styles.title, 'van-ellipsis']}>{item.title}</div>
+                      {/* <div class={[styles.content, 'van-multi-ellipsis--l2']}>{item.memo}</div> */}
+
+                      <div class={styles.time}>
+                        {item.createTime ? dayjs(item.createTime).format('YYYY年MM月DD日') : ''}
+                      </div>
+                    </>
+                  )
+                }}
+              </Cell>
             ))}
           </List>
         ) : (