From 1d34eb14bc0fae7e15a231a59810b29c17baa155 Mon Sep 17 00:00:00 2001
From: Ablikim_m <2812437343@qq.com>
Date: Sat, 11 Sep 2021 03:37:11 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!5=20:?=
 =?UTF-8?q?=20=E6=96=B0=E9=97=BB=E7=9B=B8=E5=85=B3=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json       | 162 +++++++++++++++++-----------------
 src/App.vue             |  58 +++++++------
 src/components/news.vue | 186 +---------------------------------------
 src/router/index.js     |  17 +---
 4 files changed, 116 insertions(+), 307 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7a2ab00..fd2fe99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1702,87 +1702,6 @@
         "webpack-chain": "^6.4.0",
         "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^4.2.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.5.0",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
-          "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -11265,6 +11184,87 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.5.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.5.0.tgz",
+      "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://repo.huaweicloud.com/repository/npm/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-router": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.2.tgz",
diff --git a/src/App.vue b/src/App.vue
index bed32e2..1cfd87c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,31 +1,35 @@
 <template>
-  <div style="width:65%; margin-left: auto; margin-right: auto; margin-top:3px;height: 70px">
-    <div style="display:flex; flex-direction: row; align-content: space-between;justify-content: space-between">
-      <img :src="require('@/assets/logo.png')" alt="logo" height="47" width="189"/>
-      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal"  width="50%" @select="handleSelect">
-        <el-menu-item @click="tomainpage" index="1">首页</el-menu-item>
-        <el-submenu index="2">
-          <template slot="title">社区简介</template>
-          <el-menu-item @click="tohub" index="2-1">社区简介</el-menu-item>
-          <el-menu-item index="2-2">组织结构</el-menu-item>
-          <el-menu-item index="2-3">社区架构</el-menu-item>
-          <el-menu-item index="2-4">社区文化</el-menu-item>
-        </el-submenu>
-        <el-submenu index="3">
-          <template slot="title">新闻中心</template>
-          <el-menu-item @click="tonews" index="3-1">新闻中心</el-menu-item>
-          <el-menu-item @click="tocommunity" index="3-2">社区动态</el-menu-item>
-          <el-menu-item @click="toshow" index="3-3">立项公示</el-menu-item>
-        </el-submenu>
-        <el-menu-item @click="toprojects" index="4">项目介绍</el-menu-item>
-        <el-submenu index="5">
-          <template slot="title" >加入我们</template>
-          <el-menu-item @click="tojoinUs" index="5-1">运行机制</el-menu-item>
-          <el-menu-item index="5-2">学生转正机制</el-menu-item>
-          <el-menu-item index="5-3">立项机制</el-menu-item>
-          <el-menu-item index="5-4">酬劳机制</el-menu-item>
-        </el-submenu>
-      </el-menu>
+  <div style="width:100%;">
+    <div id="top">
+      <div style="display:flex;height: 50px; font-size: 34px; font-family: Source Han Sans CN; flex-direction: row; align-content: space-between;justify-content: space-between">
+        <img :src="require('@/assets/logo.png')" alt="logo" height="47" width="189"
+             style="position: absolute;left: 200px"/>
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" width="50%" @select="handleSelect"
+                 style="position: absolute;left:780px;background-color:transparent;">
+          <el-button type="warning" @click="tomainpage">首页</el-button>
+          <el-button type="warning" @click="tojoinUs">加入我们</el-button>
+<!--          <el-submenu index="2">-->
+<!--            <template slot="title">社区简介</template>-->
+<!--            <el-menu-item @click="tohub" index="2-1">社区简介</el-menu-item>-->
+<!--            <el-menu-item index="2-2">组织结构</el-menu-item>-->
+<!--            <el-menu-item index="2-3">社区架构</el-menu-item>-->
+<!--            <el-menu-item index="2-4">社区文化</el-menu-item>-->
+<!--          </el-submenu>-->
+<!--          <el-submenu index="3">-->
+<!--            <template slot="title">新闻中心</template>-->
+<!--            <el-menu-item @click="tonews" index="3-1">社区动态</el-menu-item>-->
+<!--            <el-menu-item index="3-2">立项公示</el-menu-item>-->
+<!--          </el-submenu>-->
+<!--          <el-menu-item @click="toprojects" index="4">项目介绍</el-menu-item>-->
+<!--          <el-submenu index="5">-->
+<!--            <template slot="title">加入我们</template>-->
+<!--            <el-menu-item @click="tojoinUs" index="5-1">运行机制</el-menu-item>-->
+<!--            <el-menu-item index="5-2">学生转正机制</el-menu-item>-->
+<!--            <el-menu-item index="5-3">立项机制</el-menu-item>-->
+<!--            <el-menu-item index="5-4">酬劳机制</el-menu-item>-->
+<!--          </el-submenu>-->
+        </el-menu>
+      </div>
     </div>
 
     <div>
diff --git a/src/components/news.vue b/src/components/news.vue
index e9f08e9..9907da6 100644
--- a/src/components/news.vue
+++ b/src/components/news.vue
@@ -1,193 +1,13 @@
-<!--author:jyx-->
-import newscommunity1 from '@/components/newscommunity1'
 <template>
-
-  <div>
-    <div >
-      <img :src="require('@/assets/news1.png')"   />
-    </div>
-
-    <div >
-      <div>
-        <div style="font-size: x-large;  margin: 65px 0px;">
-          <h1>社区动态</h1>
-        </div>
-        <div style="display: flex">
-          <!--Start single team member-->
-          <div style="width: 50%">
-            <div style="width: 560pt">
-              <div>
-                <img src="../assets/new21.png" width="746px" >
-              </div>
-              <div style="background: #F8F8F8;height: 235pt;width: 560pt" @click="tocommunity">
-                <div style="margin-left: 41pt ">
-                  <h1>开发者协会招新啦！</h1>
-                  <br>
-                  <img src="../assets/go.png" >
-                  <br><br><br><br><br><br>
-                  <div >2021-9-20</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <!--End single team member-->
-          <!--Start single team member-->
-          <div style="width: 50%">
-            <div style="width: 560pt">
-            <div>
-              <img src="../assets/new20.png"  width="746px">
-            </div>
-            <div style="background: #F8F8F8;height: 235pt;width: 560pt" @click="tocommunity1">
-              <div style="margin-left: 41pt ">
-                <h1>西北工业大学开发者协会成立</h1>
-                <br>
-                <img src="../assets/go.png" >
-                <br><br><br><br><br><br>
-                <a>2021-7-1</a>
-              </div>
-            </div>
-            </div>
-          </div>
-          <!--End single team member-->
-        </div>
-      </div>
-    </div>
-
-    <section>
-      <div class="container">
-        <div style="font-size: xx-large;  margin: 65px 0px;">
-          <h1>立项公示</h1>
-        </div>
-        <div >
-          <!--Start single team member-->
-          <div style="margin-bottom: 78px">
-            <div style="display: flex;width: 100%">
-              <div width="50%">
-                <img src="../assets/new29.png" sizes="max" >
-              </div>
-              <div style="width:640px;background: #F8F8F8;" @click="tonewsshow">
-                <div style="margin-top:110pt;margin-left: 78pt ">
-                  <h1>课题组网站建设项目</h1>
-                  <br>
-                  <a>立项公示与项目介绍</a>
-                  <br>
-                  <img src="../assets/go.png" >
-
-                </div>
-              </div>
-            </div>
-          </div>
-          <!--End single team member-->
-          <!--Start single team member-->
-          <div style="margin-bottom: 78px">
-            <div style="display: flex">
-              <div >
-                <img src="../assets/new2.png" >
-              </div>
-              <div style="width:640px;background: #F8F8F8;" @click="tonewsshow1">
-                <div style="margin-top:110pt;margin-left: 78pt ">
-                  <h1>融媒体校园服务平台</h1>
-                  <br>
-                  <a>立项公示与项目介绍</a>
-                  <br>
-                  <img src="../assets/go.png" >
-
-                </div>
-              </div>
-            </div>
-          </div>
-          <!--End single team member-->
-          <!--Start single team member-->
-          <div style="margin-bottom: 78px">
-            <div style="display: flex">
-              <div >
-                <img src="../assets/new6.png" >
-              </div>
-              <div style="width:640px;background: #F8F8F8;" @click="tonewsshow2">
-                <div style="margin-top:110pt;margin-left: 78pt ">
-                  <h1>十四运场馆流线图设计</h1>
-                  <br>
-                  <a>立项公示与项目介绍</a>
-                  <br>
-                  <img src="../assets/go.png" >
-
-                </div>
-              </div>
-            </div>
-          </div>
-          <!--End single team member-->
-          <!--Start single team member-->
-          <div style="margin-bottom: 78px">
-            <div style="display: flex">
-              <div >
-                <img src="../assets/new7.png" >
-              </div>
-              <div style="width:640px;background: #F8F8F8;" @click="tonewsshow3">
-                <div style="margin-top:110pt;margin-left: 78pt ">
-                  <h1>十四观众引导页面</h1>
-                  <br>
-                  <a>立项公示与项目介绍</a>
-                  <br>
-                  <img src="../assets/go.png" >
-                </div>
-              </div>
-            </div>
-          </div>
-          <!--End single team member-->
-        </div>
-      </div>
-    </section>
-  </div>
-
+  <h1>新闻中心</h1>
 </template>
 
 <script>
-
 export default {
-  name: "news",
-
-  methods: {
-    tocommunity() {
-      if (this.$route.path !== 'newscommunity') {
-        this.$router.push({path: 'newscommunity'});
-      }
-    },
-    tocommunity1() {
-      if (this.$route.path !== 'newscommunity1') {
-        this.$router.push({path: 'newscommunity1'});
-      }
-    },
-    tocooperate() {
-      if (this.$route.path !== 'cooperate') {
-        this.$router.push({path: 'cooperate'});
-      }
-    },
-    tonewsshow() {
-      if (this.$route.path !== 'newsshow') {
-        this.$router.push({path: 'newsshow'});
-      }
-    },
-    tonewsshow1() {
-      if (this.$route.path !== './newsshow1') {
-        this.$router.push({path: './newsshow1'});
-      }
-    },
-    tonewsshow2() {
-      if (this.$route.path !== 'newsshow2') {
-        this.$router.push({path: 'newsshow2'});
-      }
-    },
-    tonewsshow3() {
-      if (this.$route.path !== 'newsshow3') {
-        this.$router.push({path: 'newsshow3'});
-      }
-    },
-  },
+  name: "news"
 }
 </script>
 
 <style scoped>
 
-</style>
-
-
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 1854d66..2e55cf6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,33 +2,18 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 import hub from "@/components/hub";
 import news from "@/components/news";
-import newscommunity from "@/components/newscommunity";
-import newsshow from "@/components/newsshow";
 import mainpage from "@/components/mainpage";
 import projects from "@/components/projects";
 import joinUs from "@/components/joinUs";
-import cooperate from "@/components/cooperate";
-import newscommunity1 from "@/components/newscommunity1";
-import newsshow1 from "@/components/newsshow1";
-import newsshow2 from "@/components/newsshow2";
-import newsshow3 from "@/components/newsshow3";
 
 Vue.use(VueRouter)
 
 const routes = [
   {path:"/",component:mainpage},
   {path:"/hub",component:hub},
-  {path:"/news",component: news},
-  {path:"/newscommunity",component: newscommunity},
-  {path:"/newsshow",component: newsshow},
+  {path:"/News",component: news},
   {path:"/projects",component:projects},
   {path: "/joinUs", component:joinUs},
-  {path: "/cooperate", component:cooperate},
-  {path: "/newscommunity1", component:newscommunity1},
-  {path: "/newsshow1", component:newsshow1},
-  {path: "/newsshow2", component:newsshow2},
-  {path: "/newsshow3", component:newsshow3},
-
 ]
 
 const router = new VueRouter({
-- 
Gitee