|
@@ -1299,9 +1299,9 @@ export default defineComponent({
|
|
|
return '';
|
|
|
} else {
|
|
|
forms.code = code;
|
|
|
+ // 获取微信分享签名
|
|
|
+ weChatShare.getAppSignature()
|
|
|
}
|
|
|
- // 获取微信分享签名
|
|
|
- weChatShare.getAppSignature()
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1439,7 +1439,7 @@ export default defineComponent({
|
|
|
nextTick(() => {
|
|
|
// 一页展示(必买)才显示团购提示弹窗
|
|
|
if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin && !forms.showTips) {
|
|
|
- // if (forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
+ // if (forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
state.tipBoxPop = true
|
|
|
document.body.style.overflow = 'hidden';
|
|
|
tipCountdown(3)
|
|
@@ -1489,7 +1489,7 @@ export default defineComponent({
|
|
|
forms.giftVipDay <= 0 && styles.noSendDay
|
|
|
]}>
|
|
|
{
|
|
|
- forms.registerType === 'MUST_BUY_GOODS' &&
|
|
|
+ forms.registerType === 'MUST_BUY_GOODS' &&
|
|
|
<div class={styles.title1}></div>
|
|
|
}
|
|
|
<Form labelAlign="left" class={styles.registerForm}>
|
|
@@ -1761,7 +1761,7 @@ export default defineComponent({
|
|
|
</div> */}
|
|
|
|
|
|
{
|
|
|
- forms.registerType !== 'MUST_BUY_GOODS' &&
|
|
|
+ forms.registerType !== 'MUST_BUY_GOODS' &&
|
|
|
<div class={[styles.goodsExtra]}>
|
|
|
{/* <i class={styles.iconArrow}></i> */}
|
|
|
<Cell
|
|
@@ -1828,12 +1828,12 @@ export default defineComponent({
|
|
|
}}
|
|
|
</Cell>
|
|
|
|
|
|
- </div>
|
|
|
- }
|
|
|
-
|
|
|
+ </div>
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
{
|
|
|
- forms.registerType === 'MUST_BUY_GOODS' &&
|
|
|
+ forms.registerType === 'MUST_BUY_GOODS' &&
|
|
|
<div class={styles.giftBox}>
|
|
|
<img class={styles.titleIcon} src={giftBoxTitleIcon} />
|
|
|
<div class={styles.tools}>
|
|
@@ -1857,7 +1857,7 @@ export default defineComponent({
|
|
|
</div>
|
|
|
{/** 会员赠送 */}
|
|
|
{
|
|
|
- forms.detailVip.giftFlag &&
|
|
|
+ forms.detailVip.giftFlag &&
|
|
|
<div class={styles.extItem}>
|
|
|
<img class={styles.toolImg} src={forms.detailVip.giftGoodsUrl} />
|
|
|
<div class={styles.toolRight}>
|
|
@@ -1865,14 +1865,14 @@ export default defineComponent({
|
|
|
<div class={styles.trBottom}>
|
|
|
<span class={styles.tcPrice}>¥ 0.00</span>
|
|
|
<span class={styles.toPrice}>|原价 <i>¥ {Number(forms.detailVip.giftOriginalPrice).toFixed(2)}</i></span>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<img class={styles.toolZsIcon} src={giftZsIcon} />
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
}
|
|
|
{/** 乐器赠送,注册类型为MUST_BUY_GOODS,才显示赠送乐器 */}
|
|
|
{
|
|
|
- (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
+ (state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
<div class={styles.extItem}>
|
|
|
<img class={[styles.toolImg, styles.toolImgYq]} src={state.currentIntrument.img} />
|
|
|
<div class={styles.toolRight}>
|
|
@@ -1880,18 +1880,18 @@ export default defineComponent({
|
|
|
<div class={styles.trBottom}>
|
|
|
<span class={styles.tcPrice}>¥ 0.00</span>
|
|
|
<span class={styles.toPrice}>|原价 <i>¥ {Number(state.currentIntrument.originalPrice).toFixed(2)}</i></span>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<img class={styles.toolZsIcon} src={giftZsIcon} />
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
}
|
|
|
{
|
|
|
- (!state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
+ (!state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
<img src={selectZsTip} class={styles.extTip} />
|
|
|
}
|
|
|
</div>
|
|
|
}
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1972,7 +1972,7 @@ export default defineComponent({
|
|
|
<div class={[styles.paymentContainer, forms.registerType === 'MUST_BUY_GOODS' && styles.paymentContainer2]}>
|
|
|
<div class={styles.payemntPrice}>
|
|
|
{
|
|
|
- forms.registerType === 'SELECT_BUY_GOODS' &&
|
|
|
+ forms.registerType === 'SELECT_BUY_GOODS' &&
|
|
|
<img src={giftTip} class={styles.giftTip} />
|
|
|
}
|
|
|
<div>
|
|
@@ -1980,10 +1980,10 @@ export default defineComponent({
|
|
|
<i style="font-style: normal">¥ </i>
|
|
|
<span>{moneyFormat(calcPrice.value.amount)}</span>
|
|
|
{
|
|
|
- forms.registerType === 'SELECT_BUY_GOODS' &&
|
|
|
+ forms.registerType === 'SELECT_BUY_GOODS' &&
|
|
|
<i class={styles.unit} style="font-style: normal">
|
|
|
/年
|
|
|
- </i>
|
|
|
+ </i>
|
|
|
}
|
|
|
</span>
|
|
|
{calcPrice.value.originAmount > calcPrice.value.amount &&
|
|
@@ -2008,7 +2008,7 @@ export default defineComponent({
|
|
|
disabled={forms.submitLoading}
|
|
|
loading={forms.submitLoading}>
|
|
|
立即购买
|
|
|
- </Button> :
|
|
|
+ </Button> :
|
|
|
<Button
|
|
|
round
|
|
|
disabled={forms.submitLoading}
|
|
@@ -2016,7 +2016,7 @@ export default defineComponent({
|
|
|
{forms.joinType === 'digitalize'
|
|
|
? '报名与支付'
|
|
|
: '提交报名'}
|
|
|
- </Button>
|
|
|
+ </Button>
|
|
|
}
|
|
|
|
|
|
</div>
|
|
@@ -2095,10 +2095,10 @@ export default defineComponent({
|
|
|
// 更换年级班级后,判断是否需要更换赠送的乐器
|
|
|
if (forms.schoolInstrumentSetType === 'GRADE' && forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
|
|
|
- }
|
|
|
+ }
|
|
|
if (forms.schoolInstrumentSetType === 'CLASS' && forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
state.currentIntrument = null
|
|
|
- }
|
|
|
+ }
|
|
|
console.log('选择111',state.currentIntrument)
|
|
|
}}
|
|
|
/>
|
|
@@ -2133,7 +2133,7 @@ export default defineComponent({
|
|
|
// 更换年级班级后,判断是否需要更换赠送的乐器
|
|
|
if (forms.schoolInstrumentSetType === 'CLASS' && forms.registerType === 'MUST_BUY_GOODS') {
|
|
|
state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
|
|
|
- }
|
|
|
+ }
|
|
|
console.log('选择222',state.currentIntrument)
|
|
|
}}
|
|
|
/>
|
|
@@ -2388,7 +2388,7 @@ export default defineComponent({
|
|
|
</Popup>
|
|
|
|
|
|
{
|
|
|
- state.tipBoxPop &&
|
|
|
+ state.tipBoxPop &&
|
|
|
<div class={styles.tipBoxPop}>
|
|
|
<div class={[styles.tipBox, !state.giftDesc && styles.tipBox2]}>
|
|
|
<img class={styles.tipTitle} src={tipTitleIcon} />
|
|
@@ -2398,11 +2398,11 @@ export default defineComponent({
|
|
|
<p>开课时赠送<span>全新乐器一支</span></p>
|
|
|
</li>
|
|
|
{
|
|
|
- state.giftDesc &&
|
|
|
+ state.giftDesc &&
|
|
|
<li class={styles.tipItem}>
|
|
|
<img src={tipIcon2} />
|
|
|
<p v-html={state.giftDesc}></p>
|
|
|
- </li>
|
|
|
+ </li>
|
|
|
}
|
|
|
<li class={styles.tipItem}>
|
|
|
<img src={state.giftDesc ? tipIcon3 : tipIcon2} />
|
|
@@ -2424,7 +2424,7 @@ export default defineComponent({
|
|
|
</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
}
|
|
|
|
|
|
</div>
|