From f60b912c8144cab700931148309d2c3788241433 Mon Sep 17 00:00:00 2001 From: lucky Date: Wed, 20 Jan 2021 17:28:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Index/IndexNewList.vue | 2 +- src/router/index.js | 6 + src/views/Activity/ActDetails.vue | 27 ++++- src/views/ItInformation/ItDetails.vue | 133 +++++++++++++++++++++ src/views/ItInformation/ItInformation.vue | 2 +- src/views/Policy/components/PolicyList.vue | 4 +- 6 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 src/views/ItInformation/ItDetails.vue diff --git a/src/components/Index/IndexNewList.vue b/src/components/Index/IndexNewList.vue index 38312e2..dcc3e82 100644 --- a/src/components/Index/IndexNewList.vue +++ b/src/components/Index/IndexNewList.vue @@ -80,7 +80,7 @@ export default { // 跳转到详情界面 jumpDetails(item) { this.setActDetail(item); - this.$router.push('/ActDetails'); + this.$router.push('/ItDetails'); }, }, }; diff --git a/src/router/index.js b/src/router/index.js index 06068f2..49f1f3a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -93,6 +93,12 @@ const routes = [ name: 'ItInformation', component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ItInformation/ItInformation.vue'), }, + // 行业资讯详情界面 + { + path: '/ItDetails', + name: 'ItDetails', + component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/ItInformation/ItDetails.vue'), + }, // 活动公告界面 { path: '/Activity', diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue index b98d9ca..d7dfc62 100644 --- a/src/views/Activity/ActDetails.vue +++ b/src/views/Activity/ActDetails.vue @@ -19,10 +19,16 @@
+ 报名已结束 @@ -35,10 +41,27 @@ export default { name: 'ActDetails', components: { Enroll }, data() { - return {}; + return { nowData: '' }; }, computed: mapState('home', ['actDetail']), - created() {}, + created() { + // 获取当前时间 + var aData = new Date(); + console.log(aData); //Wed Aug 21 2019 10:00:58 GMT+0800 (中国标准时间) + this.nowData = + aData.getFullYear() + + '-' + + (aData.getMonth() + 1) + + '-' + + aData.getDate() + + ' ' + + aData.getHours() + + ':' + + aData.getMinutes() + + ':' + + aData.getSeconds(); + console.log(this.nowData); //2019-8-20 + }, methods: {}, }; diff --git a/src/views/ItInformation/ItDetails.vue b/src/views/ItInformation/ItDetails.vue new file mode 100644 index 0000000..45c8087 --- /dev/null +++ b/src/views/ItInformation/ItDetails.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/views/ItInformation/ItInformation.vue b/src/views/ItInformation/ItInformation.vue index 2abb836..4e51463 100644 --- a/src/views/ItInformation/ItInformation.vue +++ b/src/views/ItInformation/ItInformation.vue @@ -86,7 +86,7 @@ export default { // 跳转到详情界面 jumpDetails(item) { this.setActDetail(item); - this.$router.push('/ActDetails'); + this.$router.push('/ItDetails'); }, }, }; diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue index 14dd928..20c6818 100644 --- a/src/views/Policy/components/PolicyList.vue +++ b/src/views/Policy/components/PolicyList.vue @@ -39,8 +39,8 @@

{{ monthEnglish[item.publishTime.split('-')[1] - 1] }}.

{{ item.publishTime.split('-')[2] }}

-

{{ item.title }}

-

{{ item.intro }}

+

{{ item.title }}

+

{{ item.intro }}

Date: Wed, 20 Jan 2021 17:59:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Children/place/EntitySpace.vue | 24 ++++++++++--------- src/views/NewPlatform/components/NewModel.vue | 17 +++++++------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/views/IncubationPlatform/Children/place/EntitySpace.vue b/src/views/IncubationPlatform/Children/place/EntitySpace.vue index c98f45f..ffc48df 100644 --- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue +++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue @@ -6,9 +6,9 @@

- - - 统计信息填报 + + + 统计信息填报 @@ -58,16 +60,16 @@
发酵工程中试基地位于山西维尔乳制品有限公司，基地具有发酵乳制品等生产加工条件，可提供微生物发酵实验及相关中试。
-
- 超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。 -
+
超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。
干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司 ，拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件，可提供相关中试研究。
- +
@@ -118,15 +120,15 @@