Merge pull request 'main' (#49) from main into prod

Reviewed-on: #49

f/web-kboss/src/views/homePage/components/topBox/index.vue

@@ -13,8 +13,8 @@
           <div class="nav-list">
             <!-- 首页 -->
             <p :class="{ active: $route.path.includes('/index') }">
-              
+              <!-- 动态判断域名跳转首页 -->
-              <a @click="$router.push('/homePage/index')">{{ translations[language].home }}</a>
+              <a @click="goHome">{{ translations[language].home }}</a>
             </p>
             <!-- 产品与服务：鼠标移入显示子菜单 -->
             <p @mouseleave="sildeOut" @mouseenter="sildeIn(product_service)">
@@ -35,18 +35,13 @@
 
       <!-- 用户区域：登录/注册按钮和用户下拉菜单 -->
       <div class="user-area">
-        <!-- 中英互译 -->
-        <!-- <div class="language-toggle" @click="toggleLanguage">
-          <span class="iconfont icon-ditu_diqiu_o"></span>
-          <span class="language-text">{{ language === 'zh' ? 'English' : '中文' }}</span>
-        </div> -->
         <!-- AI -->
         <i class="iconfont icon-AIzhushou functions" @click="handleAIClick"></i>
         <!-- 客服 -->
         <i class="iconfont icon-kefu functions" @click="handleServiceClick"></i>
         <!-- 控制台按钮（已登录） -->
         <a @click="goB" v-if="loginState" class="login-btn">{{ translations[language].console }}</a>
-        <!-- 消息 - 修改这里：点击时打开消息中心 -->
+        <!-- 消息 -->
         <i class="iconfont icon-xiaoxi functions" @click="handleMessageClick"></i>
         <!-- 登录按钮（未登录） -->
         <a @click="$router.push({
@@ -62,29 +57,25 @@
         <!-- 用户下拉菜单（已登录） -->
         <el-dropdown v-if="loginState" @visible-change="handleShow"
           class="avatar-container right-menu-item hover-effect nick-name-style" style="margin-right: 0" trigger="click">
-          <div class="avatar-wrapper">
+          <!-- 头像区域：添加点击事件 -->
-            <!-- 显示用户名首字母头像和用户名 -->
+          <div class="avatar-wrapper" @click="goHome">
             <i
               style="font-size: 18px; color: #262626;font-weight: 400;cursor: pointer;display: flex;justify-content: flex-end;align-items: center">
               <div class="imgUser"><img src="../../../../assets/image/user.png" alt=""></div>
               {{ nick_name }}
-              <!-- 下拉箭头图标 -->
               <i id="resverIcon" class="el-icon-arrow-up el-icon--right resverIcon"></i>
             </i>
           </div>
           <!-- 用户信息下拉菜单内容 -->
           <el-dropdown-menu slot="dropdown" style="width: 230px;font-size: 16px;" divided>
-            <!-- 用户信息头部 -->
             <div style="display: flex;flex-direction: column;padding:15px 15px;background-color: #f0f2f5">
               <span style="font-weight: bold;font-size: 20px;margin-bottom: 5px;color: #333333">{{ nick_name }}</span>
               <span style="font-size: 12px;color:#666;display: flex;justify-content:flex-start;align-items: center"> ID:
-                <!-- 用户ID，点击复制按钮可复制 -->
                 <span ref="contentToCopy">
                   {{
                     userId
                   }}
                 </span>
-                <!-- 复制按钮 -->
                 <svg @click="copyBtn" class="copy-btn" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"
                   width="12" height="12" style="fill: #1019ab;">
                   <path
@@ -93,9 +84,7 @@
                 </svg>
               </span>
             </div>
-            <!-- 分割线 -->
             <el-divider style="margin: 0!important;"></el-divider>
-            <!-- 客户角色余额和充值按钮 -->
             <div v-if="role.includes('客户')"
               style="padding: 0 18px;  width: 100%;height: 60px;display: flex;justify-content: space-between;align-items: center">
               <span style="color:#666;display: block;font-size: 14px;" class="moneyNow"><span
@@ -107,11 +96,9 @@
                 {{ translations[language].recharge }}
               </el-button>
             </div>
-            <!-- 个人中心菜单项 -->
             <el-dropdown-item v-if="role.includes('客户')" @click.native="$router.push('/customer/customerInformation')">
               <span style="display: block">{{ translations[language].personalCenter }}</span>
             </el-dropdown-item>
-            <!-- 退出登录菜单项 -->
             <el-dropdown-item @click.native="logout">
               <span style="display: block">{{ translations[language].logout }}</span>
             </el-dropdown-item>
@@ -120,10 +107,9 @@
       </div>
     </div>
 
-    <!-- 悬浮面板：显示生态与合作的详细子菜单 -->
+    <!-- 悬浮面板 -->
     <div @mouseleave="sildeOut" @mouseenter="keepPanel" v-show="isShowPanel" class="panel">
       <div class="inPanel">
-        <!-- 左侧面板：一级和二级菜单 -->
         <div class="panelLeft">
           <ul class="outUl">
             <li style="cursor: default" class="outLi" v-for="item in showPanelData" :key="item.firTitle">
@@ -141,9 +127,7 @@
             </li>
           </ul>
         </div>
-        <!-- 分隔线 -->
         <span class="ge"></span>
-        <!-- 左侧面板：三级菜单（如果存在且不等于二级菜单标题） -->
         <div
           v-if="secMenuData.length > 0 && secMenuData[0].thrMenu && secMenuData[0].thrMenu.length > 0 && secMenuData[0].thrMenu[0].thrTitle != null && secMenuData[0].secTitle !== secMenuData[0].thrMenu[0].thrTitle"
           class="panelLeft">
@@ -154,11 +138,9 @@
             </li>
           </ul>
         </div>
-        <!-- 分隔线 -->
         <span
           v-if="secMenuData.length > 0 && secMenuData[0].thrMenu && secMenuData[0].thrMenu.length > 0 && secMenuData[0].thrMenu[0].thrTitle != null && secMenuData[0].secTitle !== secMenuData[0].thrMenu[0].thrTitle"
           class="ge"></span>
-        <!-- 右侧面板：最细粒度的菜单项 -->
         <div class="panelRight"
           v-if="showPanelRightData.length > 0 && showPanelRightData[0] && showPanelRightData[0].value">
           <ul class="leastMenu inBox">
@@ -169,7 +151,6 @@
             </li>
           </ul>
         </div>
-        <!-- 当没有数据时显示空状态 -->
         <div class="panelRight" v-else>
           <div style="text-align: center; color: #999; padding: 20px;">
             {{ translations[language].noData }}
@@ -190,23 +171,14 @@
 
 <script>
 import Vue from 'vue'
-// 导入测试数据（可能用于本地开发或模拟）
 import { computingData, networkData, storageData, testData } from "@/views/homePage/components/topBox/testData";
-// 导入API请求函数
 import { reqNavList, reqNewHomeFestival, reqNewHomeSync } from "@/api/newHome";
-// 导入Vuex辅助函数
 import { mapGetters, mapState } from "vuex";
-// 导入其他API函数
 import { getLogoAPI, getUserInfoAPI } from "@/api/login";
 import { reqApplyChannel } from "@/api/customer/channel";
-// 导入store实例
 import store from "@/store";
-// 导入工具函数
 import { getHomePath } from '@/views/setting/tools'
-// 导入语言管理
 import { languageStore, languageBus } from '@/utils/language'
-
-// 导入消息中心组件
 import MessageCenter from '@/components/MessageCenter/MessageCenter.vue'
 
 export default Vue.extend({
@@ -216,25 +188,25 @@ export default Vue.extend({
   },
   data() {
     return {
-      messageCenterVisible: false, // 控制消息中心显示
+      messageCenterVisible: false,
-      homePath: getHomePath(), // 首页路径
+      homePath: getHomePath(),
-      isShowKbossCharge: false, // 是否显示Kboss充值按钮
+      isShowKbossCharge: false,
-      role: sessionStorage.getItem("jueseNew") == "admin" ? [] : sessionStorage.getItem("jueseNew"), // 用户角色
+      role: sessionStorage.getItem("jueseNew") == "admin" ? [] : sessionStorage.getItem("jueseNew"),
-      userId: sessionStorage.getItem("userId"), // 用户ID
+      userId: sessionStorage.getItem("userId"),
-      firId: "", // 一级菜单ID
+      firId: "",
-      secId: "", // 二级菜单ID
+      secId: "",
-      nick_name: "", // 用户昵称
+      nick_name: "",
-      showTimer: null, // 显示面板的定时器
+      showTimer: null,
-      hideTimer: null, // 藏面板的定时器
+      hideTimer: null,
-      showPanelData: [], // 展示的面板数据
+      showPanelData: [],
-      secMenuData: [], // 二级菜单数据
+      secMenuData: [],
-      showPanelRightData: [], // 展示的右侧面板数据
+      showPanelRightData: [],
-      threeData: [], // 三级菜单数据
+      threeData: [],
-      fourData: [], // 四级菜单数据（未使用）
+      fourData: [],
-      product_service: [], // 产品服务数据
+      product_service: [],
-      language: 'zh', // 默认设置为中文
+      language: 'zh',
-      languageChangedHandler: null, // 语言变化事件处理器
+      languageChangedHandler: null,
-      messageCount: 0, // 未读消息数量
+      messageCount: 0,
       translations: {
         zh: {
           home: '首页',
@@ -253,17 +225,14 @@ export default Vue.extend({
           aiAssistant: 'AI助手',
           customerService: '在线客服',
           featureComingSoon: '功能即将上线，敬请期待！',
-          // 一级菜单翻译
           '云': '云',
           '算': '算',
           '网': '网',
           '用': '用',
-          // 二级菜单翻译
           '百度云': '百度云',
           '智算': '智算',
           '算力网络': '算力网络',
           'AI应用': 'AI应用',
-          // 三级菜单翻译
           '计算': '计算',
           '网络': '网络',
           '存储': '存储',
@@ -279,7 +248,6 @@ export default Vue.extend({
           '智能短信': '智能短信',
           '智慧医疗': '智慧医疗',
           '智慧客服': '智慧客服',
-          // 产品名称翻译
           '云服务器_GPU': '云服务器_GPU',
           '云服务器_BCC': '云服务器_BCC',
           '专属服务器': '专属服务器',
@@ -368,17 +336,14 @@ export default Vue.extend({
           aiAssistant: 'AI Assistant',
           customerService: 'Customer Service',
           featureComingSoon: 'Feature coming soon, stay tuned!',
-          // 一级菜单翻译
           '云': 'Cloud',
           '算': 'Computing',
           '网': 'Network',
           '用': 'Application',
-          // 二级菜单翻译
           '百度云': 'Baidu Cloud',
           '智算': 'Intelligent Computing',
           '算力网络': 'Computing Power Network',
           'AI应用': 'AI Application',
-          // 三级菜单翻译
           '计算': 'Compute',
           '网络': 'Network',
           '存储': 'Storage',
@@ -394,7 +359,6 @@ export default Vue.extend({
           '智能短信': 'Smart SMS',
           '智慧医疗': 'Smart Healthcare',
           '智慧客服': 'Smart Customer Service',
-          // 产品名称翻译
           '云服务器_GPU': 'Cloud Server GPU',
           '云服务器_BCC': 'Cloud Server BCC',
           '专属服务器': 'Dedicated Server',
@@ -470,30 +434,19 @@ export default Vue.extend({
     }
   },
   created() {
-    // 组件创建时初始化homePath
     this.homePath = getHomePath()
-    // 如果sessionStorage中有userId，则设置登录状态为true
     if (sessionStorage.getItem('userId')) {
-      this.$store.commit('setLoginState', true); // 同步到 Vuex
+      this.$store.commit('setLoginState', true);
     }
-    // 如果不需要显示注册按钮，则获取用户信息
     !this.showRegisterButton && this.getUserInfo();
-
-    // 初始化组件
     this.init()
-
-    // 修复：确保从共享状态获取当前语言
     this.initLanguage()
-
-    // 初始化导航数据
     this.initData()
   },
   mounted() {
-    // 组件挂载时，从sessionStorage获取用户名
     if (sessionStorage.getItem("username")) {
       this.nick_name = sessionStorage.getItem("username");
     }
-    // 滚动到顶部容器
     this.$nextTick(() => {
       const topContainer = document.getElementById('topContainer');
       if (topContainer) {
@@ -505,40 +458,37 @@ export default Vue.extend({
     });
   },
   beforeDestroy() {
-    // 移除事件监听
     if (this.languageChangedHandler) {
       languageBus.$off('language-changed', this.languageChangedHandler)
     }
   },
   computed: {
-    // 映射Vuex中的getters
     ...mapGetters(["sidebar", "avatar", "device"]),
-    // 映射Vuex中的state
     ...mapState({
-      isShowPanel: (state) => state.product.showHomeNav, // 是否显示导航面板
+      isShowPanel: (state) => state.product.showHomeNav,
-      navIndex: (state) => state.product.navIndex, // 导航索引
+      navIndex: (state) => state.product.navIndex,
-      gridObj: state => state.operationAnalysis.gridObj, // 未使用
+      gridObj: state => state.operationAnalysis.gridObj,
-      mybalance: state => state.user.mybalance, // 用户余额
+      mybalance: state => state.user.mybalance,
-      logoutUrl: state => state.login.logoutUrl, // 退出登录URL
+      logoutUrl: state => state.login.logoutUrl,
-      loginStateVuex: state => state.login.loginState, // Vuex中的登录状态
+      loginStateVuex: state => state.login.loginState,
-      logoInfoNew: state => state.product.logoInfoNew, // Logo信息
+      logoInfoNew: state => state.product.logoInfoNew,
     }),
-    // 计算登录状态：基于Vuex状态或sessionStorage中的userId
     loginState() {
       const userId = sessionStorage.getItem('userId');
       return this.loginStateVuex || (userId !== null && userId !== 'null' && userId !== '');
     },
-    // 计算是否显示注册按钮：基于组织类型和用户登录状态
     showRegisterButton() {
       const orgType = window.sessionStorage.getItem('org_type');
       const userId = window.sessionStorage.getItem('userId');
-      console.log("此时是:", orgType !== '2' && orgType !== '3' && userId !== null)
       return orgType !== '2' && orgType !== '3' && userId === null;
     },
-    // 计算用户名
     username() {
       return sessionStorage.getItem('username') || '';
     },
+    // 判断当前是否为ncmatch.cn域名
+    isNcmatchDomain() {
+      return window.location.hostname.includes('ncmatch.cn');
+    }
   },
   methods: {
     // 处理AI助手点击
@@ -548,7 +498,6 @@ export default Vue.extend({
         duration: 3000,
         showClose: true
       });
-
     },
 
     // 处理客服点击
@@ -563,14 +512,11 @@ export default Vue.extend({
     // 处理消息图标点击
     handleMessageClick() {
       if (this.loginState) {
-        // 已登录状态：打开消息中心
         this.messageCenterVisible = true;
-        // 同时调用组件方法确保初始化
         if (this.$refs.messageCenter) {
           this.$refs.messageCenter.open();
         }
       } else {
-        // 未登录状态：跳转到登录页
         this.handleGoLogin()
       }
     },
@@ -582,51 +528,26 @@ export default Vue.extend({
 
     // 初始化语言状态
     initLanguage() {
-      // 直接从store获取当前语言，确保一致性
       this.language = languageStore.getLanguage()
-      console.log('topBox初始化语言:', this.language)
-
-      // 保存事件处理函数的引用，以便正确移除
       this.languageChangedHandler = (lang) => {
-        console.log('topBox接收到语言变化:', lang)
         this.language = lang
       }
-
-      // 监听语言变化事件
       languageBus.$on('language-changed', this.languageChangedHandler)
     },
 
-    // 切换语言 - 统一使用共享状态
+    // 切换语言
     toggleLanguage() {
       const newLanguage = this.language === 'zh' ? 'en' : 'zh';
-      console.log('topBox切换语言到:', newLanguage);
-
-      // 使用共享状态管理，确保所有组件同步
       languageStore.setLanguage(newLanguage);
-
-      // 调试信息
-      setTimeout(() => {
-        console.log('切换后验证 - topBox语言:', this.language);
-        console.log('切换后验证 - store语言:', languageStore.getLanguage());
-      }, 200);
     },
 
-    // 获取翻译文本的通用方法
+    // 获取翻译文本
     getTranslation(key) {
       if (!key) return ''
       return this.translations[this.language]?.[key] || key
     },
 
-    // 调试语言状态
+    // 控制台按钮点击事件
-    debugLanguage() {
-      console.log('=== topBox语言调试信息 ===');
-      console.log('当前语言:', this.language);
-      console.log('languageStore状态:', languageStore.getLanguage());
-      console.log('localStorage状态:', localStorage.getItem('language'));
-      languageStore.debug();
-    },
-
-    // 控制台按钮点击事件：根据角色跳转不同页面
     goB() {
       if (sessionStorage.getItem('jueseNew').includes('客户')) {
         this.$router.push('/product/productHome')
@@ -638,7 +559,6 @@ export default Vue.extend({
     // 初始化Logo信息
     init() {
       let remoteUrl = ''
-      // 根据环境设置API基础URL
       if (window.location.href.includes("dev")) {
         remoteUrl = 'https://www.kaiyuancloud.cn/dev/reseller/get_ipc_logo.dspy'
       } else if (window.location.href.includes("localhost")) {
@@ -648,13 +568,10 @@ export default Vue.extend({
       }
 
       let params = {
-        url_link: window.location.href.split("#")[0] // 获取当前页面URL
+        url_link: window.location.href.split("#")[0]
       }
       getLogoAPI(params).then((res) => {
-        console.log("获取接口触发了")
         if (res.status == true && res.data && res.data.length) {
-          console.log("res.data[0].additional_msg", res.data[0].additional_msg)
-          // 提交Logo信息到Vuex
           this.$store.commit('setLogoInfoNew', res.data[0].additional_msg);
           this.isShow = true
           if (res.data[0].orgname == '中关村数智人工智能产业联盟') {
@@ -665,7 +582,6 @@ export default Vue.extend({
           if (this.photosUrl.orgname != '业主机构') {
             this.isLogo = true
             this.logoImg = this.photosUrl.logo;
-
             this.$store.commit('setLogo', this.photosUrl.logo)
             this.logoText = this.photosUrl.orgname;
           } else {
@@ -673,7 +589,6 @@ export default Vue.extend({
           }
         } else {
           this.$message({
-            // message: res.msg,
             message: "获取ipc失败~",
             type: "error",
           });
@@ -683,24 +598,19 @@ export default Vue.extend({
 
     // 退出登录
     async logout() {
-      this.$store.commit('setLoginState', false) // 设置Vuex登录状态为false
+      this.$store.commit('setLoginState', false)
-
-      // 清除本地存储
       store.commit('tagsView/resetBreadcrumbState');
       sessionStorage.removeItem("auths");
       sessionStorage.removeItem("routes");
       sessionStorage.removeItem("user");
       sessionStorage.removeItem("userId");
       sessionStorage.removeItem("org_type")
-
       localStorage.removeItem("auths");
       localStorage.removeItem("routes");
       localStorage.removeItem("user");
       localStorage.removeItem("userId");
       localStorage.removeItem("org_type")
       localStorage.removeItem('userId')
-
-      // 如果当前页面不是首页，则跳转到首页
       if (!window.location.href.includes('homePage/index')) {
         await this.$router.push(getHomePath());
       }
@@ -724,7 +634,7 @@ export default Vue.extend({
       })
     },
 
-    // 初始化余额（从sessionStorage获取）
+    // 初始化余额
     initMybalance() {
       return sessionStorage.getItem('mybalance')
     },
@@ -742,10 +652,8 @@ export default Vue.extend({
     // 获取用户信息
     async getUserInfo() {
       if (!this.userId) return;
-
       getUserInfoAPI({ id: this.userId }).then((res) => {
         if (res.status) {
-          // this.nick_name = res.data[0].nick_name;
           this.userInfoList = res.data;
           sessionStorage.setItem("orgid", res.data[0].orgid);
         } else {
@@ -760,21 +668,18 @@ export default Vue.extend({
     // 处理下拉菜单显示/隐藏时的图标旋转
     handleShow(isShow) {
       let resverNode = document.getElementById('resverIcon')
-
       if (isShow) {
         if (this.role.includes('客户')) {
-          this.$store.dispatch('user/getCustmoersMoney') // 获取客户余额
+          this.$store.dispatch('user/getCustmoersMoney')
         }
-
+        resverNode.style.transform = 'rotate(180deg)'
-        resverNode.style.transform = 'rotate(180deg)' // 旋转图标
       } else {
-        resverNode.style.transform = 'rotate(0)' // 恢复图标
+        resverNode.style.transform = 'rotate(0)'
       }
     },
 
     // 鼠标进入三级菜单项
     sildeThrMenu(item) {
-      console.log("it", item)
       let res = []
       res.push(item)
       this.showPanelRightData = res
@@ -782,15 +687,12 @@ export default Vue.extend({
 
     // 点击菜单项进行跳转或打开新窗口
     clickGo(item) {
-      this.$store.commit('setShowHomeNav', false) // 隐藏导航面板
+      this.$store.commit('setShowHomeNav', false)
-      console.log("电机的item是", item)
       let userId = sessionStorage.getItem('userId')
       const orgType = window.sessionStorage.getItem('org_type');
       let isKehu = orgType === '2' || orgType === '3';
-      console.log("userId", userId)
       if (item.type === '百度云') {
         if (this.loginState) {
-          // 百度云产品跳转逻辑
           this.$store.commit('setRedirectUrl', item.url)
           localStorage.setItem('redirectUrl', item.url)
           localStorage.setItem('userRescourseUrl', item.listUrl)
@@ -814,12 +716,11 @@ export default Vue.extend({
         }
       } else if (item.type === '阿里云') {
         if (this.loginState) {
-          // 阿里云同步和节日活动逻辑
           reqNewHomeSync().then(response => {
             if (response.status) {
               reqNewHomeFestival().then(res => {
                 if (res.status) {
-                  window.open(res.data) // 打开阿里云页面
+                  window.open(res.data)
                 } else {
                   this.$message.warning(res.msg)
                 }
@@ -868,16 +769,10 @@ export default Vue.extend({
     // 改变面板数据
     changeData(data) {
       this.showPanelData = data || []
-
-      // 更安全的初始化方式
       this.secMenuData = data?.[0]?.secMenu || []
-
-      // 初始化threeData和showPanelRightData
       if (this.secMenuData.length > 0) {
         const firstSecMenu = this.secMenuData[0]
         this.threeData = firstSecMenu.thrMenu || []
-
-        // 处理thrTitle为null的情况
         if (this.threeData.length > 0) {
           this.showPanelRightData = this.threeData.map(item => ({
             ...item,
@@ -898,14 +793,12 @@ export default Vue.extend({
     // 初始化导航数据
     initData() {
       reqNavList({ url_link: window.location.href }).then(res => {
-        console.log("res", res.data.product_service)
         if (res.status) {
-          this.product_service = this.buildData(res.data.product_service) // 构建数据结构
+          this.product_service = this.buildData(res.data.product_service)
           this.changeData(this.product_service)
         }
       }).catch(error => {
         console.error("获取导航数据失败:", error)
-        // 可以设置一些默认数据或显示错误信息
         this.product_service = []
         this.changeData([])
       })
@@ -921,7 +814,7 @@ export default Vue.extend({
               secItem.thrMenu.forEach(thrItem => {
                 if (thrItem.value && Array.isArray(thrItem.value)) {
                   thrItem.value.forEach(valueItem => {
-                    valueItem.type = secItem.secTitle; // 添加type属性，值为secTitle
+                    valueItem.type = secItem.secTitle;
                   });
                 }
               });
@@ -929,15 +822,12 @@ export default Vue.extend({
           });
         }
       });
-      return data; // 返回修改后的原始数据
+      return data;
     },
 
     // 鼠标进入二级菜单项
     sildeSecMenu(item) {
-      console.log("获取的item时", item)
       this.secId = item.id
-
-      // 处理thrMenu可能为空或thrTitle为null的情况
       if (!item.thrMenu || item.thrMenu.length === 0) {
         this.threeData = []
         this.showPanelRightData = [{
@@ -946,13 +836,10 @@ export default Vue.extend({
         }]
         return
       }
-
-      // 处理thrTitle为null的情况
       this.threeData = item.thrMenu.map(menu => ({
         ...menu,
         thrTitle: menu.thrTitle || item.secTitle
       }))
-
       this.showPanelRightData = this.threeData
     },
 
@@ -971,7 +858,6 @@ export default Vue.extend({
     sildeItemIn(item) {
       this.firId = item.id
       this.secId = item.secMenu[0].id
-      console.log("获取的item时", item)
       this.secMenuData = item.secMenu || []
       this.showPanelRightData = this.secMenuData[0].thrMenu || []
     },
@@ -981,12 +867,10 @@ export default Vue.extend({
 
     // 鼠标进入生态与合作菜单
     sildeIn(item) {
-      console.log("sildeIn", item)
       this.changeData(item)
       if (this.hideTimer) {
         clearTimeout(this.hideTimer)
       }
-      // 延时显示面板，避免鼠标快速移动时面板闪烁
       this.showTimer = setTimeout(() => {
         this.$store.commit('setShowHomeNav', true)
       }, 100)
@@ -997,7 +881,6 @@ export default Vue.extend({
       if (this.showTimer) {
         clearTimeout(this.showTimer)
       }
-      // 延时隐藏面板，给鼠标移动到面板上的时间
       this.hideTimer = setTimeout(() => {
         this.$store.commit('setShowHomeNav', false)
       }, 200)
@@ -1014,13 +897,19 @@ export default Vue.extend({
     handleGoLogin() {
       let token = this.$store.getters.token;
       if (!token) {
-        // 提示登录
         this.$message.warning('请先登录哦~');
         this.$router.push({
           path: '/login'
         });
-      } else {
+      }
+    },
 
+    // 首页跳转方法
+    goHome() {
+      if (this.isNcmatchDomain) {
+        this.$router.push('/ncmatchHome/index');
+      } else {
+        this.$router.push('/homePage/index');
       }
     }
   },
@@ -1118,7 +1007,6 @@ export default Vue.extend({
     .language-toggle {
       cursor: pointer;
       margin-right: 20px;
-      // width: 60px;
       text-align: center;
       border-radius: 4px;
       font-size: 14px;
@@ -1140,11 +1028,9 @@ export default Vue.extend({
     }
 
     a {
-      // padding: 8px 16px;
       border-radius: 4px;
       font-size: 14px;
       text-decoration: none;
-      // margin-left: 10px;
       transition: all 0.3s;
     }
 
@@ -1158,7 +1044,6 @@ export default Vue.extend({
     }
 
     .register-btn {
-      // height: 50px;
       display: flex;
       justify-content: center;
       align-items: center;
@@ -1231,7 +1116,6 @@ export default Vue.extend({
 
     li {
       padding: 10px;
-      //cursor: pointer;
       transition: background-color 0.3s;
 
       &:hover {
@@ -1350,7 +1234,6 @@ export default Vue.extend({
 }
 
 .clickItem {
-  //margin: 30px 0 !important;
   margin-bottom: 15px !important;
 
   &:hover {

f/web-kboss/src/views/login/indexNew.vue

@@ -1022,7 +1022,7 @@ $light_gray: #eee;
 $dark_gray: #889aa4;
 
 .main-box {
-  background: url('/static/img/banner.0798e703.png') no-repeat center center;
+  background: url('/static/img/banner.png') no-repeat center center;
   background-size: cover;
   width: 100vw;
   height: 100vh;

f/web-kboss/src/views/loginMobile/index.vue

@@ -357,9 +357,9 @@ export default {
           this.isDisabled1 = false;
           this.dialogVisible = false;
           that.SendCode_text1 = "获取验证码";
-          clearInterval(that.timer1);
+          clearInterval(this.timer1);
-          that.timer1 = null;
+          this.timer1 = null;
-          that.time_count1 = 60;
+          this.time_count1 = 60;
           this.$refs.form.resetFields();
         } else {
           this.$message({