|
@@ -74,9 +74,11 @@ import tipIcon3 from './images/tip3-icon.png';
|
|
|
import tipBtnIcon from './images/tip-btn-icon.png';
|
|
|
import giftBoxTitleIcon from './images/gift-box-title.png';
|
|
|
import giftExtraTitleIcon from './images/gift-tip-icon.png';
|
|
|
+import giftExtraTitleIcon2 from './images/gift-tip-icon2.png';
|
|
|
import giftCard1Icon from './images/gift_card1.png';
|
|
|
import giftCard2Icon from './images/gift_card2.png';
|
|
|
import giftZsIcon from './images/gift_zs_icon.png';
|
|
|
+import selectZsTip from './images/select_zs_tip.png';
|
|
|
import useWeChatShare from '@/hooks/useWeChatShare';
|
|
|
|
|
|
const classList: any = [];
|
|
@@ -1436,8 +1438,9 @@ export default defineComponent({
|
|
|
await getRegisterGoods();
|
|
|
nextTick(() => {
|
|
|
// 一页展示(必买)才显示团购提示弹窗
|
|
|
- if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin) {
|
|
|
+ if (forms.registerType === 'MUST_BUY_GOODS' && browser().weixin && !forms.activeOverStatus) {
|
|
|
state.tipBoxPop = true
|
|
|
+ document.body.style.overflow = 'hidden';
|
|
|
tipCountdown(3)
|
|
|
}
|
|
|
})
|
|
@@ -1849,7 +1852,7 @@ export default defineComponent({
|
|
|
(forms.detailVip.giftFlag || state.currentIntrument?.instrumentId) &&
|
|
|
<div class={styles.extraTools}>
|
|
|
<div class={styles.exTitle}>
|
|
|
- <img src={giftExtraTitleIcon} />
|
|
|
+ <img src={(state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') ? giftExtraTitleIcon : giftExtraTitleIcon2} />
|
|
|
</div>
|
|
|
{/** 会员赠送 */}
|
|
|
{
|
|
@@ -1870,7 +1873,7 @@ export default defineComponent({
|
|
|
{
|
|
|
(state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
<div class={styles.extItem}>
|
|
|
- <img class={styles.toolImg} src={state.currentIntrument.img} />
|
|
|
+ <img class={[styles.toolImg, styles.toolImgYq]} src={state.currentIntrument.img} />
|
|
|
<div class={styles.toolRight}>
|
|
|
<p>{state.currentIntrument.instrumentName}</p>
|
|
|
<div class={styles.trBottom}>
|
|
@@ -1881,7 +1884,10 @@ export default defineComponent({
|
|
|
<img class={styles.toolZsIcon} src={giftZsIcon} />
|
|
|
</div>
|
|
|
}
|
|
|
-
|
|
|
+ {
|
|
|
+ (!state.currentIntrument?.instrumentId && forms.registerType === 'MUST_BUY_GOODS') &&
|
|
|
+ <img src={selectZsTip} class={styles.extTip} />
|
|
|
+ }
|
|
|
</div>
|
|
|
}
|
|
|
</div>
|
|
@@ -1962,7 +1968,7 @@ export default defineComponent({
|
|
|
|
|
|
{forms.joinType && (
|
|
|
<MSticky position="bottom" ref={mstickyRef}>
|
|
|
- <div class={styles.paymentContainer}>
|
|
|
+ <div class={[styles.paymentContainer, forms.registerType === 'MUST_BUY_GOODS' && styles.paymentContainer2]}>
|
|
|
<div class={styles.payemntPrice}>
|
|
|
{
|
|
|
forms.registerType === 'SELECT_BUY_GOODS' &&
|
|
@@ -2407,6 +2413,7 @@ export default defineComponent({
|
|
|
<span onClick={() => {
|
|
|
if (state.hideSecondsNum) {
|
|
|
state.tipBoxPop = false
|
|
|
+ document.body.style.overflow = '';
|
|
|
}
|
|
|
}}>
|
|
|
我知道了
|