Merge pull request '代码更新' (#81) from main into prod

Reviewed-on: #81
This commit is contained in:
charles 2026-03-27 14:56:21 +08:00
commit 01396a032d

View File

@ -5,8 +5,8 @@
<!-- 统一显示logo和导航 --> <!-- 统一显示logo和导航 -->
<div class="logo"> <div class="logo">
<!-- Logo图片点击跳转首页 - 使用与goHome相同的逻辑 --> <!-- Logo图片点击跳转首页 - 使用与goHome相同的逻辑 -->
<img v-if="JSON.stringify(logoInfoNew) !== '{}'" @click="goHome" style="cursor:pointer;" class="logoImg" <img v-if="JSON.stringify(logoInfoNew) !== '{}'" @click="goHome" style="cursor:pointer;"
:src="logoInfoNew.home.logoImg || ''" alt=""> class="logoImg" :src="logoInfoNew.home.logoImg || ''" alt="">
<!-- 主导航菜单 --> <!-- 主导航菜单 -->
<nav class="main-nav"> <nav class="main-nav">
@ -159,8 +159,12 @@
</div> </div>
<!-- 消息中心组件 --> <!-- 消息中心组件 -->
<message-center ref="messageCenter" :visible.sync="messageCenterVisible" :userId="userId" <message-center
@unread-count-update="handleUnreadCountUpdate" /> ref="messageCenter"
:visible.sync="messageCenterVisible"
:userId="userId"
@unread-count-update="handleUnreadCountUpdate"
/>
</div> </div>
</template> </template>
@ -249,7 +253,7 @@ export default Vue.extend({
}, },
// ncmatch.cn // ncmatch.cn
isNcmatchDomain() { isNcmatchDomain() {
return window.location.hostname.includes('ncmatch') || window.Location.href.includes('ncmatch'); return window.location.hostname.includes('ncmatch.cn');
}, },
// //
isActiveHome() { isActiveHome() {
@ -663,10 +667,12 @@ export default Vue.extend({
// - // -
goHome() { goHome() {
console.log('当前域名:', window.location.href);
if (this.isNcmatchDomain) { if (this.isNcmatchDomain) {
window.location.href = '/#/ncmatchHome/index'; // hash/history this.$router.push('/ncmatchHome/index');
} else { } else {
window.location.href = '/#/homePage/index'; this.$router.push('/homePage/index');
} }
} }
}, },