|
@@ -1363,13 +1363,13 @@ export default defineComponent({
|
|
|
const matchSwitchInstrument = (val: any) => {
|
|
|
if (forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
// 学校
|
|
|
- if (forms.schoolInstrumentSetType === 'SCHOOL') {
|
|
|
- state.currentIntrument = state.intrumentList.find((item: any) => item.schoolId === val.schoolId)
|
|
|
- }
|
|
|
- if (!state.intrumentList.find((item: any) => item.schoolId === val.schoolId)) {
|
|
|
- state.currentIntrument = null;
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (forms.schoolInstrumentSetType === 'SCHOOL') {
|
|
|
+ // state.currentIntrument = state.intrumentList.find((item: any) => item.schoolId === val.schoolId)
|
|
|
+ // }
|
|
|
+ // if (!state.intrumentList.find((item: any) => item.schoolId === val.schoolId)) {
|
|
|
+ // state.currentIntrument = null;
|
|
|
+ // return
|
|
|
+ // }
|
|
|
// 年级
|
|
|
if (forms.schoolInstrumentSetType === 'GRADE') {
|
|
|
state.currentIntrument = state.intrumentList.find((item: any) => item.gradeNum === val.currentGradeNum)
|
|
@@ -1845,7 +1845,7 @@ export default defineComponent({
|
|
|
{
|
|
|
forms.detailVip.giftFlag &&
|
|
|
<div class={styles.extItem}>
|
|
|
- <img class={styles.toolImg} src={giftCard2Icon} />
|
|
|
+ <img class={styles.toolImg} src={forms.detailVip.giftGoodsUrl} />
|
|
|
<div class={styles.toolRight}>
|
|
|
<p>乐器AI学练工具{forms.detailVip.giftPeriod === 'YEAR' ? convertToChineseNumber(forms.detailVip.giftVipDay) : forms.detailVip.giftVipDay}{forms.detailVip.zsUnit}卡</p>
|
|
|
<div class={styles.trBottom}>
|
|
@@ -2373,7 +2373,7 @@ export default defineComponent({
|
|
|
{
|
|
|
state.tipBoxPop &&
|
|
|
<div class={styles.tipBoxPop}>
|
|
|
- <div class={styles.tipBox}>
|
|
|
+ <div class={[styles.tipBox, !state.giftDesc && styles.tipBox2]}>
|
|
|
<img class={styles.tipTitle} src={tipTitleIcon} />
|
|
|
<ul>
|
|
|
<li class={styles.tipItem}>
|