diff --git a/.env.development.local b/.env.development.local index 2523a2d..5ee87fe 100644 --- a/.env.development.local +++ b/.env.development.local @@ -2,7 +2,12 @@ ENV='development' # 后端本地 Laravel（php artisan serve 默认 8000） -VUE_APP_PRO_API = http://127.0.0.1:8000 -VUE_APP_BASE_API = http://127.0.0.1:8000 -VUE_APP_UPLOAD_API = http://127.0.0.1:8000/api/admin/upload-file +#VUE_APP_PRO_API = http://127.0.0.1:8000 +#VUE_APP_BASE_API = http://127.0.0.1:8000 +#VUE_APP_UPLOAD_API = http://127.0.0.1:8000/api/admin/upload-file +VUE_APP_PRO_API = https://suzhoukeji-test.ali251.langye.net + +VUE_APP_BASE_API = https://suzhoukeji-test.ali251.langye.net + +VUE_APP_UPLOAD_API = https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue index aea70ed..80c976c 100644 --- a/src/views/course/apply_list.vue +++ b/src/views/course/apply_list.vue @@ -266,12 +266,6 @@ width: 120, fixed: 'left' }, - { - prop: 'user.is_schoolmate_text', - label: '校友', - align: 'center', - width: 120, - }, { prop: 'username', label: '姓名', @@ -289,7 +283,14 @@ return (
{row.user.mobile}
) } } - },{ + }, + { + prop: 'user.is_schoolmate_text', + label: '校友', + align: 'center', + width: 120, + }, + { prop: 'user.is_company_schoolmate_text', label: '是否校友企业', align: 'center', @@ -311,7 +312,24 @@ label: '企查查名称', align: 'left', width: 200, - }, { + },{ + prop: 'user.company_tag', + label: '企业资质', + align: 'center', + width: 180, + customFn:(row)=>{ + const companyTag = row.user.company ? row.user.company.company_tag : '' + return ( +
+ {companyTag} +
+ ) + + } + }, { prop: 'is_yh_invested', label: '集团标签', align: 'center', @@ -333,6 +351,18 @@ return (
{row.user.company_position}
) } } + },{ + prop: 'user.education', + label: '最高学历', + align: 'center', + width: 120, + customFn:(row)=>{ + if(this.getPropValueIfExists(row.change_data,'education')){ + return (
{this.getPropValueIfExists(row.change_data,'education')}
) + }else{ + return (
{row.user.education}
) + } + } },{ prop: 'user.sex', label: '性别', @@ -364,19 +394,20 @@ return (
{row.user.birthday}
) } } - }, { - prop: 'user.email', - label: '邮箱', - align: 'center', - width: 180, - customFn:(row)=>{ - if(this.getPropValueIfExists(row.change_data,'email')){ - return (
{this.getPropValueIfExists(row.change_data,'email')}
) - }else{ - return (
{row.user.email}
) - } - } - }, + }, + //{ + // prop: 'user.email', + // label: '邮箱', + // align: 'center', + // width: 180, + // customFn:(row)=>{ + // if(this.getPropValueIfExists(row.change_data,'email')){ + // return (
{this.getPropValueIfExists(row.change_data,'email')}
) + // }else{ + // return (
{row.user.email}
) + // } + // } + //}, // { // prop: 'score', // label: '评分', diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 833cf55..a357d6e 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -143,11 +143,12 @@
+
学员分布地图
苏州
全国
-
校友分布
+
@@ -367,14 +368,10 @@ export default { // 动态信息 activeTab: 'alumni', newsTabs: [ - { key: 'alumni', label: '校友动态' }, - { key: 'industry', label: '业界动态' }, - { key: 'needs', label: '校友需求' } + { key: 'alumni', label: '校友动态' } ], newsData: { - alumni: [], - industry: [], - needs: [] + alumni: [] }, scrollTimer: null } @@ -703,14 +700,6 @@ export default { if (res.article.xiaoyou && Array.isArray(res.article.xiaoyou)) { this.newsData.alumni = res.article.xiaoyou.map(item => item.title || '') } - // 业界动态 - if (res.article.yejie && Array.isArray(res.article.yejie)) { - this.newsData.industry = res.article.yejie.map(item => item.title || '') - } - // 校友需求 - if (res.article.supply_demands && Array.isArray(res.article.supply_demands)) { - this.newsData.needs = res.article.supply_demands.map(item => item.title || '') - } } // 处理课程体系数据 - 从 yearConfigs 获取 if (res && res.yearConfigs && Array.isArray(res.yearConfigs)) { @@ -737,7 +726,7 @@ export default { this.courseSystemList = courseList this.courseSystemTotal = { name: '累计', sessions: totalSessions, people: totalPeople } } - // 处理苏州地图及排行数据 + // 处理苏州地图及排行数据（直接使用 home-v2.suzhou） if (res && res.suzhou && Array.isArray(res.suzhou)) { // 后端字段 company_area（区域名称），company_total（校友数量） // 与现有 name 对应关系中，部分字段需要特殊映射 @@ -752,10 +741,10 @@ export default { }, {}) res.suzhou.forEach(item => { - const rawName = item.area || '' + const rawName = item.area || item.company_area || '' const mappedName = nameMap[rawName] || rawName if (baseMap[mappedName]) { - baseMap[mappedName].value = item.total || 0 + baseMap[mappedName].value = item.total_unique || item.total || item.company_total || 0 } }) @@ -1926,43 +1915,41 @@ export default { .news-container { flex: 4; - background: rgba(6, 19, 54, 0.85); - border: 1px solid rgba(71, 148, 255, 0.35); + background: linear-gradient(135deg, rgba(59, 130, 246, 0.2) 0%, rgba(99, 102, 241, 0.1) 100%); + border: 1px solid rgba(59, 130, 246, 0.3); + border-radius: 8px; display: flex; flex-direction: column; - padding: 1vh 1vw; + padding: 3.4vh 1.5vw !important; min-height: 0; - gap: 1vh!important; + gap: 1.5vh !important; + backdrop-filter: blur(10px); } .news-tabs { display: flex; - justify-content: space-between; - gap: 1.5vw; - // margin-bottom: 1vh; + justify-content: center; + align-items: center; + gap: 0; } .news-tab { - flex: 1; + flex: 0 0 auto; text-align: center; - padding: 0.6vh 0.5vw; - cursor: pointer; - color: #fff; - border-radius: 2vw; - border:1px solid #3185ed; - // background: rgba(30, 60, 120, 0.4); - transition: all 0.3s ease; + padding: 0; + cursor: default; + border: none; + background: transparent; font-size: 1.3vw; - text-align: center; font-weight: bold; color: #93ccfd; } .news-tab.active { - color: #fff; - font-weight: 600; - background: #3185ed; - box-shadow: 0 2px 8px rgba(59, 130, 246, 0.4); + color: #93ccfd; + font-weight: bold; + background: transparent; + box-shadow: none; } .news-content { @@ -1983,7 +1970,7 @@ export default { } .news-item { - color: #e7f5ff; + color: #fff; flex-shrink: 0; white-space: nowrap; overflow: hidden;