diff --git a/src/App.vue b/src/App.vue index 9231434..98b5925 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,7 +31,6 @@ export default { window.scroll(0, 0); }, created() { - console.log('process.env ', process.env); const userId = '1218763410024566784'; const params = { userId }; this.getUserId(params); diff --git a/src/components/FooterPage/FooterPage.vue b/src/components/FooterPage/FooterPage.vue index c71242a..31de37a 100644 --- a/src/components/FooterPage/FooterPage.vue +++ b/src/components/FooterPage/FooterPage.vue @@ -31,7 +31,7 @@ class="pointer" v-for="arr in arrs" >{{ arr.name }} -
400-789-789
+
18003513318
@@ -47,10 +90,10 @@ export default { width: 20.5%; margin-right: 6%; background: #fff; - height: 100px; - line-height: 100px; + height: 70px; text-align: center; - margin-bottom: 20px; + margin-bottom: 40px; + border: 1px solid #eee; } .partner-content-box { diff --git a/src/views/About/Children/Partner.vue b/src/views/About/Children/Partner.vue index 2d1a12a..95cff28 100644 --- a/src/views/About/Children/Partner.vue +++ b/src/views/About/Children/Partner.vue @@ -1,6 +1,6 @@ diff --git a/src/views/About/Children/SpinOffs.vue b/src/views/About/Children/SpinOffs.vue index 8ec5b58..c9e1bec 100644 --- a/src/views/About/Children/SpinOffs.vue +++ b/src/views/About/Children/SpinOffs.vue @@ -12,7 +12,7 @@ export default { components: { DeriveEnterprise }, data() { return { - title: '衍生企业', + title: '生态企业', typeOfPlatform: '关于我们', arr: [ { name: '关于我们', url: '/About/Introduce' }, diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue index b98d9ca..87eedb9 100644 --- a/src/views/Activity/ActDetails.vue +++ b/src/views/Activity/ActDetails.vue @@ -19,11 +19,22 @@
+ 报名已结束 + @@ -35,10 +46,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/Activity/Activity.vue b/src/views/Activity/Activity.vue index bac7eb1..6b098f8 100644 --- a/src/views/Activity/Activity.vue +++ b/src/views/Activity/Activity.vue @@ -215,7 +215,7 @@ export default { .policy-list { position: relative; width: 100%; - height: 238px; + height: 268px; overflow: hidden; background: #fff; box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); @@ -311,8 +311,7 @@ export default { .source-time { margin-left: 200px; - position: absolute; - bottom: 10px; + padding-top: 10px; margin-bottom: 0; line-height: 30px; color: rgba(0, 0, 0, 0.45); diff --git a/src/views/Develop/Develop.vue b/src/views/Develop/Develop.vue index 1089616..41d0626 100644 --- a/src/views/Develop/Develop.vue +++ b/src/views/Develop/Develop.vue @@ -4,8 +4,8 @@
-

维基数智

-
+ +
传控科技成立于2015年8月,由资深电子产品工程师携自动化和计算机专业相关同仁创立,围绕时物链条构建软硬件开放平台,致力于成为智能传感器控制系统解决方案和关键设备供应商。
传控科技以传感器控制技术为核心进行开源模块及电子产品的研发生产、电子信息技术及网络应用的开发、咨询、服务、培训等,业务覆盖数字工厂、数字医疗、数字管理三大方向,自主研发产品先后应用于国家电力、北京科学技术委员会、山大一院、北京深孵咨询服务有限公司等企事业单位,清华大学、北京大学、山西大学、中北大学等高校。
传控科技拥有发明专利和知识产权二十余项,并且拥有国内及美国注册商标任意环、ANYRING、CCSENS、老吾老、幼吾幼、传控可及、时物链条等,已通过ISO9001认证。
@@ -18,8 +18,12 @@ class="inner dev-img-box d-flex flex-wrap" style="margin-top: 40px !important; margin-bottom: 40px !important" > -
- +
+ +
+

{{ item.title }}

+
{{ item.txt }}
+
diff --git a/src/views/Hatch/Children/Partner.vue b/src/views/Hatch/Children/Partner.vue index bfe2bbf..2b3cbdf 100644 --- a/src/views/Hatch/Children/Partner.vue +++ b/src/views/Hatch/Children/Partner.vue @@ -7,7 +7,7 @@ --> diff --git a/src/views/ServiceMarket/Children/InnovativeService.vue b/src/views/ServiceMarket/Children/InnovativeService.vue index c140c4e..e40cff4 100644 --- a/src/views/ServiceMarket/Children/InnovativeService.vue +++ b/src/views/ServiceMarket/Children/InnovativeService.vue @@ -3,19 +3,14 @@
-
-
- +
+
+
+ +

{{ item.name }}

-

{{ item.intro }}

+

{{ item.intro }}

diff --git a/src/views/ServiceMarket/Children/Institute.vue b/src/views/ServiceMarket/Children/Institute.vue index 1c5097a..30df7a5 100644 --- a/src/views/ServiceMarket/Children/Institute.vue +++ b/src/views/ServiceMarket/Children/Institute.vue @@ -53,7 +53,7 @@ :class="(index + 1) % 3 === 0 ? 'mr0' : ''" :key="index" class="pic-box pb-10" - v-for="(item,index) in list" + v-for="(item,index) in partners" >
@@ -67,6 +67,7 @@