修改更新默认图大小和样式调整

src/components/o-empty/index.module.less

@@ -11,6 +11,12 @@
     width: 55%;
     margin: 0 auto;
   }
+  :global {
+    .van-empty__image {
+      width: 210px;
+      height: 210px;
+    }
+  }
   .SMALL {
     :global {
       .van-empty__image {

src/components/o-empty/index.tsx

@@ -27,13 +27,17 @@ export default defineComponent({
       type: String as PropType<'CERT' | 'SMALL'>,
       default: ''
     },
+    imageSize: {
+      type: Number,
+      default: 0
+    },
     plain: {
       type: Boolean,
       default: false
     },
     btnStatus: {
       type: Boolean,
-      default: true
+      default: false
     },
     buttonText: {
       type: String,
@@ -79,7 +83,12 @@ export default defineComponent({
   render() {
     return (
       <div class={[styles['col-result'], 'col-result-container']}>
-        <Empty image={this.image} class={styles[this.classImgSize]} description={this.tips} />
+        <Empty
+          image={this.image}
+          imageSize={this.imageSize || ''}
+          class={styles[this.classImgSize]}
+          description={this.tips}
+        />
 
         {this.btnStatus ? (
           <Button

src/school/companion-teacher/companion-detail.module.less

@@ -13,6 +13,14 @@
     margin-right: 10px;
   }
 }
+.sectionCellGroup {
+  :global {
+    .van-cell {
+      padding: 18px 15px;
+      font-size: 16px;
+    }
+  }
+}
 
 .detailCell {
   padding: 15px 13px;
@@ -153,6 +161,7 @@
     line-height: 22px;
   }
   .musicName {
+    padding-top: 6px;
     font-size: 14px;
     color: #777777;
     line-height: 20px;

src/school/companion-teacher/companion-detail.tsx

@@ -137,23 +137,25 @@ export default defineComponent({
               )
             }}
           </Cell>
-          <Cell center>
-            {{
-              title: () => (
-                <div class={styles.subjectContainer}>
-                  <span>声部：</span>
-                  <div style={{ display: 'flex', alignItems: 'center' }}>
-                    {state.detail.subjectNames &&
-                      state.detail.subjectNames.map((subject: any) => (
-                        <Tag type="primary" class={styles.tagSubject}>
-                          {subject}
-                        </Tag>
-                      ))}
+          {state.detail.subjectNames && state.detail.subjectNames.legnth > 0 && (
+            <Cell center>
+              {{
+                title: () => (
+                  <div class={styles.subjectContainer}>
+                    <span>声部：</span>
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                      {state.detail.subjectNames &&
+                        state.detail.subjectNames.map((subject: any) => (
+                          <Tag type="primary" class={styles.tagSubject}>
+                            {subject}
+                          </Tag>
+                        ))}
+                    </div>
                   </div>
-                </div>
-              )
-            }}
-          </Cell>
+                )
+              }}
+            </Cell>
+          )}
         </CellGroup>
 
         <div class={styles.sectionTitle}>
@@ -161,7 +163,7 @@ export default defineComponent({
           基本信息
         </div>
 
-        <CellGroup inset class={styles.detailCellGroup}>
+        <CellGroup inset class={[styles.detailCellGroup, styles.sectionCellGroup]}>
           <Cell title="手机号码" value={state.detail.phone}></Cell>
           <Cell
             title="性别"
@@ -174,7 +176,7 @@ export default defineComponent({
           <i></i>
           所在班级
         </div>
-        <CellGroup inset class={styles.detailCellGroup}>
+        <CellGroup inset class={[styles.detailCellGroup, styles.sectionCellGroup]}>
           {state.classList.map((item: any) => (
             <Cell center class={styles.companionCell}>
               {{

src/school/companion-teacher/compontent/teacher.tsx

@@ -132,7 +132,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无伴学老师" />
+          <OEmpty btnStatus={false} tips="暂无伴学老师" />
         )}
       </>
     )

src/school/companion-teacher/index.tsx

@@ -372,7 +372,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无伴学老师" />
+          <OEmpty btnStatus={false} tips="暂无伴学老师" />
         )}
 
         <Popup

src/school/manage-teacher/index.tsx

@@ -290,7 +290,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无管理老师" />
+          <OEmpty btnStatus={false} tips="暂无管理老师" />
         )}
 
         <Popup

src/school/manage-teacher/manage-detail.module.less

@@ -4,6 +4,15 @@
   border-radius: 10px;
 }
 
+.sectionCellGroup {
+  :global {
+    .van-cell {
+      padding: 18px 15px;
+      font-size: 16px;
+    }
+  }
+}
+
 .detailCell {
   padding: 15px 13px;
 

src/school/manage-teacher/manage-detail.tsx

@@ -7,6 +7,7 @@ import { useRoute } from 'vue-router'
 import styles from './manage-detail.module.less'
 import MenuFunction from './menu-function'
 import iconTeacher from '@common/images/icon_teacher.png'
+import OSticky from '@/components/o-sticky'
 
 export default defineComponent({
   name: 'manage-detail',
@@ -84,7 +85,7 @@ export default defineComponent({
           基本信息
         </div>
 
-        <CellGroup inset class={styles.detailCellGroup}>
+        <CellGroup inset class={[styles.detailCellGroup, styles.sectionCellGroup]}>
           <Cell title={'手机号码'} value={detail.value.nickname}></Cell>
           <Cell
             title={'性别'}
@@ -114,21 +115,26 @@ export default defineComponent({
           </>
         )}
 
-        <div class={['btnGroup', 'btnMore']} style={{ paddingLeft: '13px', paddingRight: '13px' }}>
-          <Button type="primary" round onClick={() => (state.menuStatus = true)}>
-            修改权限
-          </Button>
-          <Button
-            type="primary"
-            round
-            color="#64A9FF"
-            onClick={() => (state.status = true)}
-            // disabled={ ? false : true}
+        <OSticky position="bottom">
+          <div
+            class={['btnGroup', 'btnMore']}
+            style={{ paddingLeft: '13px', paddingRight: '13px' }}
           >
-            {detail.value.status === 'ACTIVATION' && '冻结账号'}
-            {detail.value.status === 'LOCKED' && '解冻账号'}
-          </Button>
-        </div>
+            <Button type="primary" round onClick={() => (state.menuStatus = true)}>
+              修改权限
+            </Button>
+            <Button
+              type="primary"
+              round
+              color="#64A9FF"
+              onClick={() => (state.status = true)}
+              // disabled={ ? false : true}
+            >
+              {detail.value.status === 'ACTIVATION' && '冻结账号'}
+              {detail.value.status === 'LOCKED' && '解冻账号'}
+            </Button>
+          </div>
+        </OSticky>
 
         <OPopup v-model:modelValue={state.menuStatus} destroy>
           <MenuFunction

src/school/mass-message/component/class-list/index.tsx

@@ -244,7 +244,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无班级" />
+          <OEmpty btnStatus={false} tips="暂无班级" />
         )}
 
         <Popup v-model:show={forms.showPopover} position="bottom" round>

src/school/mass-message/component/manage-list/index.tsx

@@ -196,7 +196,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无老师" />
+          <OEmpty btnStatus={false} tips="暂无老师" />
         )}
       </div>
     )

src/school/mass-message/component/student-list/index.tsx

@@ -192,7 +192,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无老师" />
+          <OEmpty btnStatus={false} tips="暂无老师" />
         )}
       </div>
     )

src/school/mass-message/component/teacher-list/teacher-list.tsx

@@ -214,7 +214,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无老师" />
+          <OEmpty btnStatus={false} tips="暂无老师" />
         )}
       </div>
     )

src/school/mass-message/index.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无群发消息" />
+          <OEmpty btnStatus={false} tips="暂无群发消息" />
         )}
       </div>
     )

src/school/orchestra/compontent/information.tsx

@@ -398,30 +398,28 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无班级" />
+          <OEmpty btnStatus={false} tips="暂无班级" />
         )}
 
         {/*  */}
-        {(state.orchestraInfo.deliveryType === 'SINGLE_DELIVERY' ||
-          state.orchestraInfo.deliveryType === 'MULTIPLE_DELIVERY') &&
-          ['REGISTER', 'DOING', 'DONE'].includes(state.orchestraInfo.status) && (
-            <OSticky position="bottom">
-              <div class={'btnGroup'}>
-                <Button
-                  round
-                  block
-                  type="primary"
-                  onClick={() => {
-                    state.showQrcode = true
-                    state.qrcodeUrl =
-                      window.location.origin + '/orchestra-student/#/preApply?id=' + route.query.id
-                  }}
-                >
-                  报名二维码
-                </Button>
-              </div>
-            </OSticky>
-          )}
+        {state.orchestraInfo.canSignUp && (
+          <OSticky position="bottom">
+            <div class={'btnGroup'}>
+              <Button
+                round
+                block
+                type="primary"
+                onClick={() => {
+                  state.showQrcode = true
+                  state.qrcodeUrl =
+                    window.location.origin + '/orchestra-student/#/preApply?id=' + route.query.id
+                }}
+              >
+                报名二维码
+              </Button>
+            </div>
+          </OSticky>
+        )}
 
         <Popup
           v-model:show={state.showQrcode}

src/school/orchestra/compontent/photo-detail.tsx

@@ -324,7 +324,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无相片" />
+          <OEmpty btnStatus={false} tips="暂无相片" />
         )}
 
         {state.isEdit && (

src/school/orchestra/compontent/photo.tsx

@@ -223,7 +223,7 @@ export default defineComponent({
             </div>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无相册" />
+          <OEmpty btnStatus={false} tips="暂无相册" />
         )}
 
         <Popup v-model:show={state.status} round style={{ width: '80%' }}>

src/school/orchestra/compontent/plan.tsx

@@ -232,7 +232,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无班级" />
+          <OEmpty btnStatus={false} tips="暂无班级" />
         )}
 
         <Popup v-model:show={state.timeShow} position="bottom" round>

src/school/orchestra/index.tsx

@@ -166,7 +166,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无乐团" />
+          <OEmpty btnStatus={false} tips="暂无乐团" />
         )}
       </>
     )

src/school/orchestra/modal/student-list.tsx

@@ -249,7 +249,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无学生" />
+          <OEmpty btnStatus={false} tips="暂无学生" />
         )}
 
         <OSticky position="bottom">

src/school/orchestra/modal/teacher-list.tsx

@@ -167,7 +167,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无老师" />
+          <OEmpty btnStatus={false} tips="暂无老师" />
         )}
       </div>
     )

src/school/orchestra/orchestra-information.tsx

@@ -187,7 +187,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无资讯" />
+          <OEmpty btnStatus={false} tips="暂无资讯" />
         )}
 
         <OPopup v-model:modelValue={state.addStatus} style={{ background: '#f8f8f8' }} destroy>

src/school/train-planning/component/train-content/index.tsx

@@ -148,7 +148,7 @@ export default defineComponent({
         ))}
 
         {base.contentList && base.contentList.length <= 0 && (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无训练内容" />
+          <OEmpty btnStatus={false} tips="暂无训练内容" />
         )}
 
         <OSticky position="bottom">

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

@@ -104,9 +104,7 @@ export default defineComponent({
           </Cell>
         ))}
         {/* 判断是否有班级没有设置伴学指导 */}
-        {props.classList.length <= 0 && (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无班级" />
-        )}
+        {props.classList.length <= 0 && <OEmpty btnStatus={false} tips="暂无班级" />}
 
         <Sticky position="bottom">
           <div class={'btnGroup'}>

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

@@ -231,7 +231,7 @@ export default defineComponent({
             </CheckboxGroup>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无班级" />
+          <OEmpty btnStatus={false} tips="暂无班级" />
         )}
 
         <OSticky position="bottom">

src/student/coupons/list.tsx

@@ -69,7 +69,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          // <ColResult btnStatus={false} classImgSize="SMALL" tips="暂无优惠券" />
+          // <ColResult btnStatus={false}   tips="暂无优惠券" />
           <span>11</span>
         )}
       </>

src/student/music-group/layout/auth.tsx

@@ -93,6 +93,7 @@ export default defineComponent({
               tips="加载失败，请稍后重试"
               buttonText="重新加载"
               plain={true}
+              btnStatus={true}
               onClick={this.setAuth}
             />
           </div>

src/student/music-group/pre-apply/component/order.tsx

@@ -241,7 +241,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无订单" />
+          <OEmpty btnStatus={false} tips="暂无订单" />
         )}
 
         <Popup v-model:show={form.refundStatus} round style={{ width: '90%' }}>

src/student/music-group/shop-address/index.tsx

@@ -160,7 +160,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无收货地址" />
+          <OEmpty btnStatus={false} tips="暂无收货地址" />
         )}
         <OSticky position="bottom">
           <div class={'btnGroup'}>

src/student/my-orchestra/index.tsx

@@ -252,11 +252,11 @@ export default defineComponent({
                 </div>
               </List>
             ) : (
-              <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无训练相片" />
+              <OEmpty btnStatus={false} tips="暂无训练相片" />
             )}
           </>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无乐团" />
+          <OEmpty btnStatus={false} tips="暂无乐团" />
         )}
 
         <Popup v-model:show={state.orchestraStatus} position="bottom" round>

src/student/my-orchestra/photo-detail.tsx

@@ -97,7 +97,7 @@ export default defineComponent({
             </div>
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无相片" />
+          <OEmpty btnStatus={false} tips="暂无相片" />
         )}
       </div>
     )

src/student/trade-record/component/paid-list.tsx

@@ -261,7 +261,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无订单" />
+          <OEmpty btnStatus={false} tips="暂无订单" />
         )}
 
         <Popup v-model:show={form.timeShow} position="bottom" round>

src/student/trade-record/component/refund-list.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无订单" />
+          <OEmpty btnStatus={false} tips="暂无订单" />
         )}
 
         <Popup v-model:show={form.timeShow} position="bottom" round>

src/student/trade-record/component/wait-pay.tsx

@@ -240,7 +240,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无订单" />
+          <OEmpty btnStatus={false} tips="暂无订单" />
         )}
 
         <Popup v-model:show={form.timeShow} position="bottom" round>

src/views/adapay/use-coupons/choice-coupon.tsx

@@ -162,7 +162,7 @@ export default defineComponent({
                   ))}
                 </>
               ) : (
-                <OEmpty btnStatus={false} tips="暂无优惠券" classImgSize="SMALL" />
+                <OEmpty btnStatus={false} tips="暂无优惠券" />
               )}
             </>
           ) : (

src/views/information/help-center/index.tsx

@@ -88,7 +88,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty btnStatus={false} classImgSize="SMALL" tips="暂无数据" />
+          <OEmpty btnStatus={false} tips="暂无数据" />
         )}
       </>
     )

src/views/layout/auth.tsx

@@ -100,6 +100,7 @@ export default defineComponent({
               tips="加载失败，请稍后重试"
               buttonText="重新加载"
               plain={true}
+              btnStatus={true}
               onClick={this.setAuth}
             />
           </div>