From a8191418b4b795f12f0fc7d877c9757a8154957a Mon Sep 17 00:00:00 2001 From: zcx <1078327420@qq.com> Date: Sun, 12 May 2024 19:24:38 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 2991a0288ef452759322f6b875e990528b042786 Author: zcx <1078327420@qq.com> Date: Sun May 12 19:24:16 2024 +0800 1 commit f0a01dc52ae4f5b9116cf37645e7a165126ae287 Author: zcx <1078327420@qq.com> Date: Sun May 12 19:14:07 2024 +0800 1 commit 103b91481dd79a631b6c7562405031171bdb11e7 Merge: 3f241a6 d73c814 Author: zcx <1078327420@qq.com> Date: Sat May 11 16:10:15 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch commit d73c814619c41300d61ecb1a0eef45251e83e885 Author: zcx <1078327420@qq.com> Date: Sat May 11 16:04:16 2024 +0800 Squashed commit of the following: commit 3f241a6a466421483e0ce27824477d7acf769a0c Author: zcx <1078327420@qq.com> Date: Sat May 11 16:03:53 2024 +0800 1 commit ecd56eeb362753f2a0f835d5b1699ddc335a53ec Merge: f745de4 55dbf59 Author: zcx <1078327420@qq.com> Date: Sat May 11 16:03:36 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch commit f745de4fef942cf71e5190d22d99ab5825d97a1a Merge: d83686a c82f1ef Author: zcx <1078327420@qq.com> Date: Sat May 11 15:51:39 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch commit d83686a0121b3c28d5dca3681f595065459d055b Author: zcx <1078327420@qq.com> Date: Fri May 10 11:06:40 2024 +0800 新界面 commit 977b40cd4f07c43cc1c76137bda1c82382d63ff7 Author: zcx <1078327420@qq.com> Date: Fri May 10 10:44:28 2024 +0800 新的页面代码 commit 548cc49c7d09fd8a1333515c92c1a91be57e884e Author: zcx <1078327420@qq.com> Date: Fri May 10 10:20:18 2024 +0800 聊天界面初始版 commit ff3952859f3f26c3d0675ddbe509d8e284525c28 Merge: 7b44e8a c656856 Author: zcx <1078327420@qq.com> Date: Fri May 10 10:15:56 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch # Conflicts: # doc/自由同行-软件需求构思及描述.docx commit 7b44e8a34862a9e481bf0eade4c864d4afa50ecd Author: zcx <1078327420@qq.com> Date: Fri May 10 10:12:14 2024 +0800 1 commit 5e48c1f463ef8e7aa9e7da5779f1722856434733 Merge: 167bb2d bfb34b1 Author: zcx <1078327420@qq.com> Date: Fri May 10 10:10:13 2024 +0800 Merge branch '曾晨曦_branch' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch # Conflicts: # doc/“自由同行”软件需求规格说明书.docx commit 167bb2d2736df8c57737bb0c3a7429c911ece321 Author: zcx <1078327420@qq.com> Date: Fri May 10 10:09:46 2024 +0800 前端代码初始版 commit e5d34887348cb63335547c4bb7b81d541782d905 Author: zcx <1078327420@qq.com> Date: Sun Mar 31 11:48:46 2024 +0800 更新 commit bfb34b10a2726c5bb01fe6a9624426e0425b5753 Author: zcx <1078327420@qq.com> Date: Tue Mar 26 11:15:48 2024 +0800 需求规格说明书 commit 26f7946e45493f75de5ebd84a9832ac213b2961f Author: zcx <1078327420@qq.com> Date: Tue Mar 26 11:08:14 2024 +0800 1 commit 31f1339042f1c0e92afeaece7d2d0536858df570 Merge: 3671794 9d34b69 Author: zcx <1078327420@qq.com> Date: Tue Mar 26 11:07:41 2024 +0800 Merge branch 'develop' of https://bdgit.educoder.net/mwxbgi697/softegg into 曾晨曦_branch commit 36717942eb9c0ad9792a0d5156ba146ed7b6d86f Author: zcx <1078327420@qq.com> Date: Thu Mar 21 15:50:06 2024 +0800 用例图 --- src/前端/walktofree.iml | 8 ++ .../walktofree/src/components/Demand.vue | 131 ------------------ .../walktofree/src/components/DemandList.vue | 41 ++++++ .../walktofree/src/components/HelloWorld.vue | 44 ++++++ .../walktofree/src/components/HomePage.vue | 2 +- .../walktofree/src/components/TheWelcome.vue | 88 ++++++++++++ .../walktofree/src/components/WelcomeItem.vue | 87 ++++++++++++ .../walktofree/src/components/searchPage.vue | 3 + src/前端/walktofree/src/router/index.js | 6 +- 9 files changed, 277 insertions(+), 133 deletions(-) create mode 100644 src/前端/walktofree.iml delete mode 100644 src/前端/walktofree/src/components/Demand.vue create mode 100644 src/前端/walktofree/src/components/DemandList.vue create mode 100644 src/前端/walktofree/src/components/HelloWorld.vue create mode 100644 src/前端/walktofree/src/components/TheWelcome.vue create mode 100644 src/前端/walktofree/src/components/WelcomeItem.vue diff --git a/src/前端/walktofree.iml b/src/前端/walktofree.iml new file mode 100644 index 0000000..1786447 --- /dev/null +++ b/src/前端/walktofree.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/前端/walktofree/src/components/Demand.vue b/src/前端/walktofree/src/components/Demand.vue deleted file mode 100644 index ab34564..0000000 --- a/src/前端/walktofree/src/components/Demand.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - diff --git a/src/前端/walktofree/src/components/DemandList.vue b/src/前端/walktofree/src/components/DemandList.vue new file mode 100644 index 0000000..e6ee4f1 --- /dev/null +++ b/src/前端/walktofree/src/components/DemandList.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/src/前端/walktofree/src/components/HelloWorld.vue b/src/前端/walktofree/src/components/HelloWorld.vue new file mode 100644 index 0000000..5fb372c --- /dev/null +++ b/src/前端/walktofree/src/components/HelloWorld.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/前端/walktofree/src/components/HomePage.vue b/src/前端/walktofree/src/components/HomePage.vue index bb45d92..c2e553d 100644 --- a/src/前端/walktofree/src/components/HomePage.vue +++ b/src/前端/walktofree/src/components/HomePage.vue @@ -104,7 +104,7 @@ export default { this.$router.push('/home'); }, gotomessage() { - this.$router.push('/message'); + this.$router.push('/Communication'); }, gotomine() { this.$router.push('/mine'); diff --git a/src/前端/walktofree/src/components/TheWelcome.vue b/src/前端/walktofree/src/components/TheWelcome.vue new file mode 100644 index 0000000..dab9536 --- /dev/null +++ b/src/前端/walktofree/src/components/TheWelcome.vue @@ -0,0 +1,88 @@ + + + diff --git a/src/前端/walktofree/src/components/WelcomeItem.vue b/src/前端/walktofree/src/components/WelcomeItem.vue new file mode 100644 index 0000000..6d7086a --- /dev/null +++ b/src/前端/walktofree/src/components/WelcomeItem.vue @@ -0,0 +1,87 @@ + + + diff --git a/src/前端/walktofree/src/components/searchPage.vue b/src/前端/walktofree/src/components/searchPage.vue index ae816c1..ea04649 100644 --- a/src/前端/walktofree/src/components/searchPage.vue +++ b/src/前端/walktofree/src/components/searchPage.vue @@ -86,6 +86,9 @@ export default { gotohome() { this.$router.push('/home'); }, + search() { + this.$router.push('/DemandList'); + } } } \ No newline at end of file diff --git a/src/前端/walktofree/src/router/index.js b/src/前端/walktofree/src/router/index.js index 0d2390a..34fd80b 100644 --- a/src/前端/walktofree/src/router/index.js +++ b/src/前端/walktofree/src/router/index.js @@ -5,6 +5,8 @@ import Home from '../components/HomePage.vue'; import Message from '../components/message.vue'; import Mine from '../components/mine.vue'; import SearchPage from '../components/searchPage.vue'; +import Communication from "@/components/Communication.vue"; +import DemandList from "@/components/DemandList.vue"; const routes = [ { path: '/', redirect: '/login' }, // 重定向到/login路径 @@ -14,7 +16,9 @@ const routes = [ { path: '/message', component: Message }, { path: '/mine', component: Mine }, { path: '/searchPage', component: SearchPage }, - { path: '/Communication', component: Communication } + { path: '/Communication', component: Communication }, + { path: '/searchPage', component: SearchPage}, + { path: '/DemandList', component:DemandList} ]; const router = createRouter({