diff --git a/src/packages/content/pages/scenic-detail.vue b/src/packages/content/pages/scenic-detail.vue index 35819ab..a8d74b2 100644 --- a/src/packages/content/pages/scenic-detail.vue +++ b/src/packages/content/pages/scenic-detail.vue @@ -306,19 +306,29 @@ async function onBookClick(card: CardBenefit) { url: `/packages/user/pages/reserve/index?cardNumber=${res.cardNumber}&resourceId=${res.resourceId}&cardModelId=${card.cardModelId}`, }) } else { - uni.showModal({ - title: '提示', - content: '暂无可用年卡,请先购买', - confirmText: '去购买', - cancelText: '取消', - success: (modalRes) => { - if (modalRes.confirm) { - uni.navigateTo({ - url: `/packages/user/pages/buy?goodsId=${card.goodsId}`, - }) - } - }, - }) + if (String(card.cardModelId) === '820093340659013') { + uni.showModal({ + title: '提示', + content: '暂无可用年卡', + showCancel: true, + cancelText: '取消', + confirmText: '确定' + }) + } else { + uni.showModal({ + title: '提示', + content: '暂无可用年卡,请先购买', + confirmText: '去购买', + cancelText: '取消', + success: (modalRes) => { + if (modalRes.confirm) { + uni.navigateTo({ + url: `/packages/user/pages/buy?goodsId=${card.goodsId}`, + }) + } + }, + }) + } } } catch (err: any) { uni.showToast({ title: err?.msg || err?.message || '检查失败', icon: 'none' }) diff --git a/src/packages/user/pages/bind.vue b/src/packages/user/pages/bind.vue index 1e5d596..82d60f1 100644 --- a/src/packages/user/pages/bind.vue +++ b/src/packages/user/pages/bind.vue @@ -658,6 +658,7 @@ function handleCancel() { display: flex; gap: 24rpx; padding: 0 24rpx; + margin-top: 48rpx; } .btn-confirm { diff --git a/src/pages.json b/src/pages.json index f73d441..a012215 100644 --- a/src/pages.json +++ b/src/pages.json @@ -39,7 +39,8 @@ { "path": "pages/profile/index", "style": { - "navigationBarTitleText": "个人中心" + // "navigationBarTitleText": "个人中心" + "navigationStyle": "custom" } } ], @@ -184,7 +185,7 @@ }, "tabBar": { "color": "#7A7E83", - "selectedColor": "#3c9cff", + "selectedColor": "#019FFF", "borderStyle": "white", "backgroundColor": "#ffffff", "list": [ diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 5a887d7..e3b0645 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -70,17 +70,17 @@ ¥3800+ - 立省3600+ + 立省1万+ - 42家景区全年免首道门票 - 含武功山/君澜温泉/方特/韶山,法定节假日通用 - 单次最高可省228元 | 单景区全年可免6次 + 一卡畅玩赣湘边核心景区 + 含武功山/君澜温泉/方特/橘子洲小火车/湘江游轮等 + 单次最高可省299 | 单景区全年最高可免6次 立即抢购|专属特惠 - 已售1.2万+ | 萍乡文旅官方联名卡 + 萍乡市文旅集团监制发行 diff --git a/src/pages/profile/index.vue b/src/pages/profile/index.vue index 104dc4b..cc57fdf 100644 --- a/src/pages/profile/index.vue +++ b/src/pages/profile/index.vue @@ -1,12 +1,13 @@