修改样式

src/components/o-upload-all/index.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
     },
     bucket: {
       type: String,
-      default: 'daya'
+      default: 'gyt'
     },
     path: {
       type: String,

src/school/mass-message/create-message.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
     const forms = reactive({
       id: route.query.id,
       type: 'ADD',
-      bucket: 'gyt',
+      bucket: 'i-m',
       sendStatus: false,
       sendType: 'IMMEDIATELY' as any,
       textMessage: null,

src/school/orchestra-story/story-operation/index.tsx

@@ -342,6 +342,8 @@ export default defineComponent({
                     style={{ marginBottom: '12px' }}
                     v-model:modelValue={forms.attachments}
                     maxCount={9}
+                    bucket="gyt"
+                    path="/orchestra"
                     uploadIcon={iconUpload}
                   />
                 )
@@ -361,6 +363,8 @@ export default defineComponent({
                       uploadType="VIDEO"
                       uploadIcon={iconUploadVideo}
                       deletable={false}
+                      bucket="gyt"
+                      path="/orchestra"
                     />
 
                     <OUploadAll
@@ -368,6 +372,8 @@ export default defineComponent({
                       style={{ marginBottom: '12px' }}
                       v-model:modelValue={forms.videoCover}
                       uploadIcon={iconUploadVideoCover}
+                      bucket="gyt"
+                      path="/orchestra"
                     />
                   </>
                 )

src/school/train-planning/modal/class-list/index.tsx

@@ -98,7 +98,15 @@ export default defineComponent({
                   <div class={[styles.name, 'van-ellipsis']}>{item.orchestraName}</div>
                 </div>
               ),
-              value: () => <>{item.teacherName}</>
+              value: () => (
+                <div
+                  style={{
+                    color: item.teacherName ? '' : 'var(--van-primary)'
+                  }}
+                >
+                  {item.teacherName ? item.teacherName : '去设置'}
+                </div>
+              )
             }}
           </Cell>
         ))}

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

@@ -11,6 +11,28 @@
   border-radius: 8px;
   overflow: hidden;
 
+  .cellIcon {
+    font-size: 18px;
+    margin-right: 6px;
+  }
+
+  .cellTimers {
+    h3 {
+      font-size: 16px;
+      font-weight: 500;
+      color: #333333;
+      padding-bottom: 6px;
+    }
+    span {
+      padding-top: 6px;
+      display: inline-block;
+      width: 35%;
+      font-size: 14px;
+      font-weight: 500;
+      color: #777777;
+      line-height: 20px;
+    }
+  }
   :global {
     .van-cell {
       padding: 18px 12px;

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

@@ -3,9 +3,12 @@ import item from '@/student/coupons/item'
 import dayjs from 'dayjs'
 // import isBetween from 'dayjs/plugin/isBetween'
 // dayjs.extend(isBetween)
-import { Button, Cell, CellGroup, Popup, showToast, Sticky, TimePicker } from 'vant'
+import { Button, Cell, CellGroup, Icon, Popup, showToast, Sticky, TimePicker } from 'vant'
 import { defineComponent, onMounted, reactive, watch } from 'vue'
 import styles from './index.module.less'
+import iconSuccessPlan from '../../images/icon-success-plan.png'
+import iconErrorPlan from '../../images/icon-error-plan.png'
+import iconPayingPlan from '../../images/icon-paying-plan.png'
 
 export default defineComponent({
   name: 'timer',
@@ -190,28 +193,48 @@ export default defineComponent({
 
         {/* <div class={styles.selectTimer}>{dayjs(state.calendarDate).format('YYYY年MM月DD日')}</div> */}
 
-        <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
-          {state.useTimer.map((item: any) => (
-            <Cell
-              center
-              title={`${dayjs(item.startTime).format('HH:mm')}~${dayjs(item.endTime).format(
-                'HH:mm'
-              )}`}
-              value="可排课时间段"
-            ></Cell>
-          ))}
-
-          {state.usedTimer.map((item: any) => (
-            <Cell
-              center
-              value="冲突时间"
-              title={`${dayjs(item.startTime).format('HH:mm')}~${dayjs(item.endTime).format(
-                'HH:mm'
-              )}`}
-              class={styles.noTime}
-            ></Cell>
-          ))}
-        </CellGroup>
+        {state.useTimer && state.useTimer.length > 0 && (
+          <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
+            <Cell>
+              {{
+                icon: () => <Icon name={iconSuccessPlan} class={styles.cellIcon} />,
+                title: () => (
+                  <div class={styles.cellTimers}>
+                    <h3>可排课时间段</h3>
+                    <div>
+                      {state.useTimer.map((item: any) => (
+                        <span>{`${dayjs(item.startTime).format('HH:mm')}~${dayjs(
+                          item.endTime
+                        ).format('HH:mm')}`}</span>
+                      ))}
+                    </div>
+                  </div>
+                )
+              }}
+            </Cell>
+          </CellGroup>
+        )}
+        {state.usedTimer && state.usedTimer.length > 0 && (
+          <CellGroup inset class={styles.cellGroup} style={{ marginTop: '12px' }}>
+            <Cell>
+              {{
+                icon: () => <Icon name={iconErrorPlan} class={styles.cellIcon} />,
+                title: () => (
+                  <div class={styles.cellTimers}>
+                    <h3>冲突时间</h3>
+                    <div>
+                      {state.usedTimer.map((item: any) => (
+                        <span>{`${dayjs(item.startTime).format('HH:mm')}~${dayjs(
+                          item.endTime
+                        ).format('HH:mm')}`}</span>
+                      ))}
+                    </div>
+                  </div>
+                )
+              }}
+            </Cell>
+          </CellGroup>
+        )}
 
         <CellGroup inset class={styles.cellGroup}>
           <Cell
@@ -220,7 +243,9 @@ export default defineComponent({
             value={state.selectTime ? dayjs(state.selectTime).format('HH:mm') : ''}
             isLink
             onClick={() => (state.selectTimeStatus = true)}
-          ></Cell>
+          >
+            {{ icon: () => <Icon name={iconPayingPlan} class={styles.cellIcon} /> }}
+          </Cell>
         </CellGroup>
 
         <Sticky position="bottom">

src/styles/index.less

@@ -192,6 +192,7 @@ body {
   --van-overlay-background: rgba(0, 0, 0, 0.4);
 }
 
+// 加载动画
 .appRootToast {
   .van-overlay {
     // background: rgba(0, 0, 0, 0.4);
@@ -225,6 +226,7 @@ body {
   }
 }
 
+// 加载动画
 .appRootToastCenter {
   .van-overlay {
     background: rgba(0, 0, 0, 0.4);
@@ -279,7 +281,7 @@ body {
   font-family: 'DINA';
   src: url('./font/DIN_Alternate_Bold.ttf');
 }
-
+// 数据为空时，空样式居中显示
 .emptyRootContainer {
   display: flex;
   align-items: center;
@@ -310,3 +312,17 @@ input {
     transform: translateY(-15%);
   }
 }
+
+// grid item 右边的一根线
+.gridBorderRight::after {
+  content: ' ';
+  position: absolute;
+  box-sizing: border-box;
+  height: 40px;
+  pointer-events: none;
+  top: 50%;
+  margin-top: -20px;
+  right: 0;
+  border: 1px solid var(--van-border-color);
+  transform: scale(0.5);
+}

src/views/unit-test/unit-create/modals/newspaper-item.module.less

@@ -20,7 +20,8 @@
     text-align: center;
     padding: 0 12px;
     .itemBottomDot {
-      width: 25%;
+      flex-basis: 33.33%;
+      position: relative;
       .dotMain {
         font-size: 26px;
         color: #333333;

src/views/unit-test/unit-create/modals/newspaper-item.tsx

@@ -21,14 +21,14 @@ export default defineComponent({
           <div class={styles.itemWrap} onClick={gotoDetail}>
             <div class={styles.titleWrap}>{props.item?.unitExaminationName}</div>
             <div class={styles.itemBottom}>
-              <div class={styles.itemBottomDot}>
+              <div class={[styles.itemBottomDot, 'gridBorderRight']}>
                 <p class={styles.dotMain}>
                   {props.item?.totalScore || 0}
                   {/* <span>分</span> */}
                 </p>
                 <p class={styles.dotSub}> 总分</p>
               </div>
-              <div class={styles.itemBottomDot}>
+              <div class={[styles.itemBottomDot, 'gridBorderRight']}>
                 <p class={styles.dotMain} style={{ color: '#F67146' }}>
                   {props.item?.passScore || 0}
                   {/* <span>分</span> */}

src/views/unit-test/unit-create/uni-last.module.less

@@ -18,7 +18,7 @@
   .infoWrap {
     background-color: #fff;
     border-radius: 10px;
-    padding: 15px 12px;
+    padding: 8px 0px;
     p {
       font-size: 15px;
       font-weight: 500;
@@ -29,9 +29,24 @@
     .loctionIconWrap {
       margin-left: 5px;
     }
+    .wrapValue {
+      font-weight: 500;
+      color: #333333;
+      line-height: 21px;
+    }
+    .heightValue {
+      padding-bottom: 15px !important;
+      margin-bottom: 8px;
+    }
+    input::-webkit-input-placeholder,
+    input::-ms-input-placeholder {
+      font-size: 15px;
+    }
+
     :global {
       .van-cell {
-        padding: 0 !important;
+        padding: 8px 12px;
+        font-size: 15px;
       }
       .van-cell__title {
         font-size: 15px;
@@ -39,6 +54,7 @@
         color: #333333;
         line-height: 21px;
         margin-bottom: 15px;
+        flex: 0 auto;
       }
       .van-field__control {
         color: #f67146;
@@ -79,7 +95,7 @@
     padding: 0 25px 30px;
     p {
       font-size: 16px;
-      line-height: 22px;
+      line-height: 26px;
       color: #333;
     }
   }

src/views/unit-test/unit-create/uni-last.tsx

@@ -2,6 +2,7 @@ import request from '@/helpers/request'
 import { state } from '@/state'
 import {
   Button,
+  Cell,
   Dialog,
   Empty,
   Field,
@@ -177,23 +178,40 @@ export default defineComponent({
             {forms.value?.coursewareName}-{forms.value?.testName}
           </h4>
           <div class={styles.infoWrap}>
-            <p>乐团：{forms.value?.orchestraName}</p>
-            <p>班级：{forms.value?.classGroupName}</p>
-            <p>学生人数：{forms.value?.preStudentNum}人</p>
+            <Cell
+              center
+              valueClass={styles.wrapValue}
+              value={forms.value?.orchestraName}
+              title="乐团："
+              border={false}
+            />
+            <Cell
+              center
+              valueClass={styles.wrapValue}
+              value={forms.value?.classGroupName}
+              title="班级："
+              border={false}
+            />
+            <Cell
+              center
+              class={styles.heightValue}
+              valueClass={styles.wrapValue}
+              value={(forms.value?.preStudentNum || 0) + '人'}
+              title="学生人数："
+            />
             <Field
               v-model={forms.value.expiryDate}
               type="number"
               placeholder="请输入截止日期"
               input-align="right"
+              label="截止时间"
             >
               {{
                 extra: () => (
                   <div class={styles.loctionIconWrap}>
                     <span style={{ color: '#777' }}> 天后截止</span>
-                    {/* <Image width={19} height={18} src={locIcon}></Image> */}
                   </div>
-                ),
-                label: () => <span class={styles.addP}>截止时间</span>
+                )
               }}
             </Field>
           </div>

src/views/unit-test/unit-list/index.module.less

@@ -107,7 +107,7 @@
     padding: 0 25px 30px;
     p {
       font-size: 16px;
-      line-height: 22px;
+      line-height: 26px;
       color: #333;
       span {
         width: 80px;