clay commit : 第一阶段完成

.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

.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'

.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'

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 (info.three == null) {
       if (width) {
-      vm.$router.push("/pc/" + info.second.encodeId + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang"));
+        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 + "/" + info.three.encodeId + "?id=" + news.id + "&lang=" + sessionStorage.getItem("lang"));
+        vm.$router.push("/mobile/" + info.second.encodeId + "?id=" + news.id +"&type=" + info.second.type+ "&lang=" + sessionStorage.getItem("lang"));
+      }
+    } else {
+      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"));
+      }
     }
   })
 }

src/views/content/components/dire_data.vue

@@ -18,7 +18,11 @@
           </el-col>
           <el-row>
             <el-col class="text" :offset="1" :span="23">
-              <div v-for="(item,index) in chile.children" :key="index">{{ item.name }}</div>
+              <div v-for="(item,index) in chile.children" :key="index">
+                <a style="text-decoration: none" :href="item.link">
+                  {{ item.name }}
+                </a>
+              </div>
             </el-col>
           </el-row>
         </el-row>

src/views/header/index.vue

@@ -3,30 +3,33 @@
     <!--头部部分-->
     <div class="top">
       <el-row>
-        <el-col :span="2">
+<!--        <el-col :span="2">-->
-          <div class="link">
+<!--          <div class="link">-->
-            {{ $t('message.student') }}
+<!--            {{ $t('message.student') }}-->
-          </div>
+<!--          </div>-->
-        </el-col>
+<!--        </el-col>-->
-        <el-col :span="2">
+<!--        <el-col :span="2">-->
-          <div class="link">
+<!--          <div class="link">-->
-            {{ $t('message.staff') }}
+<!--            {{ $t('message.staff') }}-->
-          </div>
+<!--          </div>-->
-        </el-col>
+<!--        </el-col>-->
-        <el-col :span="2">
+<!--        <el-col :span="2">-->
-          <div class="link">
+<!--          <div class="link">-->
-            {{ $t('message.alumni') }}
+<!--            {{ $t('message.alumni') }}-->
-          </div>
+<!--          </div>-->
-        </el-col>
+<!--        </el-col>-->
-        <el-col :span="2">
+<!--        <el-col :span="2">-->
-          <div class="link">
+<!--          <div class="link">-->
-            {{ $t('message.examine') }}
+<!--            {{ $t('message.examine') }}-->
-          </div>
+<!--          </div>-->
-        </el-col>
+<!--        </el-col>-->
-        <el-col :span="3">
+<!--        <el-col :span="3">-->
-          <div class="link">
+<!--          <div class="link">-->
-            {{ $t('message.services_portal') }}
+<!--            {{ $t('message.services_portal') }}-->
-          </div>
+<!--          </div>-->
+<!--        </el-col>-->
+        <el-col :span="11">
+          <div style="width: 10px;height: 10px;"></div>
         </el-col>
         <el-col :offset="11" :span="2">
           <div class="switchLang" @click="switchLang">{{ $t('message.switch') }}</div>
@@ -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)
     }
   }

src/views/index/components/news_center.vue

@@ -1,3 +1,4 @@
+<script src="../../../utils/sist.js"></script>
 <template>
   <div class="news_center">
     <div class="headline">
@@ -84,9 +85,9 @@
         <div class="more" @click="lookMore(newsDate[0])">
           {{ $t('message.more') }}
         </div>
-        <div class="more_img">
+<!--        <div class="more_img">-->
-          <img src="@/assets/index/sy_icon_zhdl.png" alt="">
+<!--          <img src="@/assets/index/sy_icon_zhdl.png" alt="">-->
-        </div>
+<!--        </div>-->
       </el-col>
     </el-row>
   </div>
@@ -122,7 +123,7 @@ export default {
     },
     getList() {
       getArticleList({
-        type: "XC7D8m5gkr35BX1b4Otiln4",
+        type: "NEd5n92EMIpyyBslaNqsRgE",
         pageNum: 1,
         pageSize: 4
       }).then(res => {

src/views/index/components/party_building_activities.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="party_building_activities">
+  <div class="party_building_activities" v-bind:style="{backgroundImage:'url('+bgc+')'}">
     <!--title-->
 
     <div class="headline">
@@ -125,7 +125,9 @@ export default {
   },
   data(){
     return{
-      listData:[]
+      width: document.documentElement.clientWidth > 992,
+      listData:[],
+      bgc: require("../../../assets/index/party_building_activities/sy_bj3.png")
     }
   },
   created() {
@@ -141,7 +143,7 @@ export default {
 
     getListData(){
       getArticleList({
-        type: "LlBbF5OM6ILqxX69TIg7ipg",
+        type: "N6CfFGz2UWpQ9Uhk3uwiJAQ",
         pageNum: 1,
         pageSize: 6
       }).then(res => {
@@ -158,7 +160,9 @@ export default {
 
 <style scoped lang="scss">
 .party_building_activities {
+  //background-image: url("../../../assets/index/party_building_activities/sy_bj3.png");
   background-image: url("../../../assets/index/party_building_activities/sy_bj3.png");
+  //background-image: url();
   padding-top: 4rem;
   padding-bottom: 2rem;
 }

src/views/index/components/scientific_research_trends.vue

@@ -141,9 +141,9 @@
         <div style="background: #FFFFFF;color: #1956BC;" class="more" @click="lookMore(academiaData[0])">
           {{ $t('message.more') }}
         </div>
-        <div class="more_img">
+<!--        <div class="more_img">-->
-          <img src="@/assets/index/scientific_research_trends/sy_icon_zhdb.png" alt="">
+<!--          <img src="@/assets/index/scientific_research_trends/sy_icon_zhdb.png" alt="">-->
-        </div>
+<!--        </div>-->
       </el-col>
     </el-row>
   </div>
@@ -158,7 +158,7 @@ export default {
   name: "scientific_research_trends",
   data() {
     return {
-      width: document.documentElement.clientWidth>992,
+      width: document.documentElement.clientWidth > 992,
       scientificData: [],
       academiaData: [],
     }
@@ -168,7 +168,6 @@ export default {
     this.getAcademiaList()
   },
   methods: {
-
     getArticle(news){
       toArticle(news,this.width)
     },
@@ -177,7 +176,7 @@ export default {
     },
     getScientificList() {
       getArticleList({
-        type: "VPteru0OeW6GgYObAewMupY",
+        type: "STCplDRCWAA3zcFE0EBTcQI",
         pageNum: 1,
         pageSize: 10
       }).then(res => {
@@ -186,7 +185,7 @@ export default {
     },
     getAcademiaList() {
       getArticleList({
-        type: "KBwgShsEiDolV91qmaWdWJc",
+        type: "zpUhQJwnjHyJBqbvnWxcqwM",
         pageNum: 1,
         pageSize: 6
       }).then(res => {

src/views/index/components/teaching_student.vue

@@ -67,9 +67,9 @@
         <div class="more" @click="lookMore(listData[0])">
           {{ $t('message.more') }}
         </div>
-        <div class="more_img">
+<!--        <div class="more_img">-->
-          <img src="@/assets/index/sy_icon_zhdl.png" alt="">
+<!--          <img src="@/assets/index/sy_icon_zhdl.png" alt="">-->
-        </div>
+<!--        </div>-->
       </el-col>
     </el-row>
   </div>
@@ -100,7 +100,7 @@ export default {
 
     getListData(){
       getArticleList({
-        type: "--AMgi-Z8eHpj9W0a_fbhpk",
+        type: "9GhKyWFMk4aHEZMNVFcB4QU",
         pageNum: 1,
         pageSize:5
       }).then(res => {

src/views/other.vue

@@ -3,9 +3,9 @@
 <script>
 export default {
   created() {
+    console.log("dsdsdd")
     let path = this.$route.path;
-    console.log(path)
+    if (-1==path.indexOf("attached")||path==="/"){
-    if (!path.indexOf("attached")||path==="/"){
       this.$router.push("/home?lang="+sessionStorage.getItem("lang"));
     }
   }