diff --git a/.env.development b/.env.development index d0fb89d..e864986 100644 --- a/.env.development +++ b/.env.development @@ -3,9 +3,9 @@ ENV = 'development' # EBTS/开发环境 #VUE_APP_BASE_API = '/dev-api' -#VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +VUE_APP_BASE_API = 'http://localhost:8085/dev-api' SITE_TYPE = 'NEd5n92EMIpyyBslaNqsRgE' -VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api' +#VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 48d69d5..5029a88 100644 --- a/.env.production +++ b/.env.production @@ -3,4 +3,5 @@ ENV = 'production' # EBTS/生产环境 #VUE_APP_BASE_API = '/prod-api' -VUE_APP_BASE_API = 'http://192.168.190.67/dev-api' +#VUE_APP_BASE_API = 'http://192.168.190.67/dev-api' +VUE_APP_BASE_API = 'http://sist.swjtu.edu.cn/dev-api' diff --git a/.env.staging b/.env.staging index 1515f99..bdf6c2e 100644 --- a/.env.staging +++ b/.env.staging @@ -4,4 +4,4 @@ NODE_ENV = staging ENV = 'staging' # EBTS/测试环境 -VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api' +VUE_APP_BASE_API = 'http://192.168.190.67/dev-api' diff --git a/src/assets/index/party_building_activities/sy_bj3.png b/src/assets/index/party_building_activities/sy_bj3.png index e69de29..6d9c845 100644 Binary files a/src/assets/index/party_building_activities/sy_bj3.png and b/src/assets/index/party_building_activities/sy_bj3.png differ diff --git a/src/assets/index/party_building_activities/sy_bj3@2x.png b/src/assets/index/party_building_activities/sy_bj3@2x.png index e69de29..55352a5 100644 Binary files a/src/assets/index/party_building_activities/sy_bj3@2x.png and b/src/assets/index/party_building_activities/sy_bj3@2x.png differ diff --git a/src/assets/index/party_building_activities/sy_icon_zhdh.png b/src/assets/index/party_building_activities/sy_icon_zhdh.png index e69de29..db96e22 100644 Binary files a/src/assets/index/party_building_activities/sy_icon_zhdh.png and b/src/assets/index/party_building_activities/sy_icon_zhdh.png differ diff --git a/src/assets/index/scientific_research_trends/sy_bj2.png b/src/assets/index/scientific_research_trends/sy_bj2.png index e69de29..f133748 100644 Binary files a/src/assets/index/scientific_research_trends/sy_bj2.png and b/src/assets/index/scientific_research_trends/sy_bj2.png differ diff --git a/src/assets/index/scientific_research_trends/sy_bj2@2x.png b/src/assets/index/scientific_research_trends/sy_bj2@2x.png index e69de29..318d6e7 100644 Binary files a/src/assets/index/scientific_research_trends/sy_bj2@2x.png and b/src/assets/index/scientific_research_trends/sy_bj2@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_b1.png b/src/assets/index/scientific_research_trends/sy_icon_b1.png index e69de29..e6e4b53 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_b1.png and b/src/assets/index/scientific_research_trends/sy_icon_b1.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png b/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png index e69de29..74243c7 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_b1@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh1.png b/src/assets/index/scientific_research_trends/sy_icon_bh1.png index e69de29..6518932 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh1.png and b/src/assets/index/scientific_research_trends/sy_icon_bh1.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh10.png b/src/assets/index/scientific_research_trends/sy_icon_bh10.png index e69de29..2a27af3 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh10.png and b/src/assets/index/scientific_research_trends/sy_icon_bh10.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png index e69de29..aedfba1 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh10@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png index e69de29..beb0be2 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh1@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2.png b/src/assets/index/scientific_research_trends/sy_icon_bh2.png index e69de29..976b1ad 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2.png and b/src/assets/index/scientific_research_trends/sy_icon_bh2.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png index e69de29..741f0b7 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png and b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x(1).png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png index e69de29..9f8ca7b 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh2@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh3.png b/src/assets/index/scientific_research_trends/sy_icon_bh3.png index e69de29..c23f4e0 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh3.png and b/src/assets/index/scientific_research_trends/sy_icon_bh3.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png index e69de29..366b9b5 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh3@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh4.png b/src/assets/index/scientific_research_trends/sy_icon_bh4.png index e69de29..4527655 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh4.png and b/src/assets/index/scientific_research_trends/sy_icon_bh4.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png index e69de29..9968f8b 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh4@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh5.png b/src/assets/index/scientific_research_trends/sy_icon_bh5.png index e69de29..cd5f4f4 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh5.png and b/src/assets/index/scientific_research_trends/sy_icon_bh5.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png index e69de29..8d16864 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh5@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh6.png b/src/assets/index/scientific_research_trends/sy_icon_bh6.png index e69de29..4c8ada6 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh6.png and b/src/assets/index/scientific_research_trends/sy_icon_bh6.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh7.png b/src/assets/index/scientific_research_trends/sy_icon_bh7.png index e69de29..274d936 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh7.png and b/src/assets/index/scientific_research_trends/sy_icon_bh7.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png index e69de29..b3d19fe 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh7@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh8.png b/src/assets/index/scientific_research_trends/sy_icon_bh8.png index e69de29..1ccdb66 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh8.png and b/src/assets/index/scientific_research_trends/sy_icon_bh8.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png index e69de29..44f41aa 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh8@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh9.png b/src/assets/index/scientific_research_trends/sy_icon_bh9.png index e69de29..a43d3a1 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh9.png and b/src/assets/index/scientific_research_trends/sy_icon_bh9.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png b/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png index e69de29..560b467 100644 Binary files a/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png and b/src/assets/index/scientific_research_trends/sy_icon_bh9@2x.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_zhdl.png b/src/assets/index/scientific_research_trends/sy_icon_zhdl.png new file mode 100644 index 0000000..975e16a Binary files /dev/null and b/src/assets/index/scientific_research_trends/sy_icon_zhdl.png differ diff --git a/src/assets/index/scientific_research_trends/sy_icon_zhdl@2x.png b/src/assets/index/scientific_research_trends/sy_icon_zhdl@2x.png new file mode 100644 index 0000000..84648e5 Binary files /dev/null and b/src/assets/index/scientific_research_trends/sy_icon_zhdl@2x.png differ diff --git a/src/utils/sist.js b/src/utils/sist.js index c8e02ee..43e6845 100644 --- a/src/utils/sist.js +++ b/src/utils/sist.js @@ -67,18 +67,28 @@ export function setLanguage() { export function toArticle(news,width) { + console.log(width,"width") info(news.id).then(res => { let info = null try { info = getParentNode(res.data.encodeId) + console.log(info) }catch (e){} if (info == null){ return } - if (width) { - vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang")); + if (info.three == null) { + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "?id=" + news.id +"&type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "?id=" + news.id +"&type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + } } else { - vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang")); + if (width) { + vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id +"?type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + } else { + vm.$router.push("/mobile/" + info.second.encodeId + "/" + info.three.encodeId + "&id=" + news.id +"?type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang")); + } } }) } diff --git a/src/views/content/components/dire_data.vue b/src/views/content/components/dire_data.vue index 0f731b2..df50835 100644 --- a/src/views/content/components/dire_data.vue +++ b/src/views/content/components/dire_data.vue @@ -18,7 +18,11 @@ -
{{ item.name }}
+
+ + {{ item.name }} + +
diff --git a/src/views/header/index.vue b/src/views/header/index.vue index 07a7a78..970204e 100644 --- a/src/views/header/index.vue +++ b/src/views/header/index.vue @@ -3,30 +3,33 @@
- -
- {{ $t('message.student') }} -
- - -
- {{ $t('message.staff') }} -
- - -
- {{ $t('message.alumni') }} -
- - -
- {{ $t('message.examine') }} -
- - -
- {{ $t('message.services_portal') }} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ $t('message.switch') }}
@@ -133,6 +136,7 @@ export default { } sessionStorage.setItem("lang", lang) let fullPath = this.$route.fullPath + debugger window.location.replace(fullPath.substr(0, fullPath.length - 2) + lang) } } diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue index aa09e42..cab80f9 100644 --- a/src/views/index/components/news_center.vue +++ b/src/views/index/components/news_center.vue @@ -1,3 +1,4 @@ +