Merge branch 'iteration-0918' into jenkins-main

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

@@ -10,7 +10,8 @@ import {
   Radio,
   RadioGroup,
   showToast,
-  Tag
+  Tag,
+  Image
 } from 'vant'
 import { defineComponent, onMounted, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
@@ -287,6 +288,10 @@ export default defineComponent({
             />
           </CellGroup>
 
+          {props.registerInfo?.orchestraRegisterType === 'PARENT_CONFERENCES' && (
+            <Image src={props.registerInfo?.instrumentPriceImg} class={styles.instrumentPriceImg} />
+          )}
+
           <div class={styles.applyTitle}>声部信息</div>
           <div class={styles.applyTips}>(请务必按照学生的录取声部填报)</div>
           <CellGroup inset class={styles.applyCellGroup}>

src/student/music-group/pre-apply/index.module.less

@@ -80,6 +80,18 @@
   }
 }
 
+.instrumentPriceImg {
+  padding: 12px 13px 0;
+  width: 100%;
+  min-height: 100px;
+  box-sizing: border-box;
+  border-radius: var(--van-cell-group-inset-radius);
+
+  img {
+    width: 100%;
+  }
+}
+
 .applyTitle {
   display: flex;
   align-items: center;

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.lexiaoya.cn/';
-// const proxyUrl = 'https://test.lexiaoya.cn/';
+// const proxyUrl = 'https://test.lexiaoya.cn/'
 const proxyUrl = 'https://dev.lexiaoya.cn/'
 // const proxyUrl = 'http://47.98.131.38:8989/'
 // const proxyUrl = 'http://192.168.3.20:8989/' // 邹旋