细节修改

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);

src/components/FooterPage/FooterPage.vue

@@ -31,7 +31,7 @@
             class="pointer"
             v-for="arr in arrs"
           >{{ arr.name }}</span>
-          <div class="font-bold-24 mt-3" style="font-style: italic;">400-789-789</div>
+          <div class="font-bold-24 mt-3" style="font-style: italic;">18003513318</div>
         </div>
         <div class="box">
           <img

src/components/Introduce/DeriveEnterprise.vue

@@ -5,14 +5,14 @@
   -->
 
 <template>
-  <div class="enterprise-bg" v-if="newPartners && newPartners.length > 0">
+  <div class="enterprise-bg" v-if="partners && partners.length > 0">
     <div class="d-flex flex-wrap px-5">
       <div
         :class="(index + 1) % 3 === 0 ? 'enterprise-box1' : ''"
         :key="index"
         @click="openProfile(item.name, item.description)"
         class="enterprise-box d-flex flex-column align-center justify-center white mb-8"
-        v-for="(item, index) in newPartners"
+        v-for="(item, index) in partners"
       >
         <img :src="item.logoUrl" class="enterprise-pic my-2" v-if="item.logoUrl" />
         <div class="font-bold-24 title-color my-2">{{ item.name }}</div>
@@ -32,11 +32,11 @@
     <div class="d-flex flex-row-reverse pb-10 enterprise-page">
       <a-pagination
         :default-page-size="6"
-        :total="newPartners.length"
+        :total="partners.length"
         @change="onChange"
         show-less-items
         v-model="current"
-        v-show="newPartners.length > 6"
+        v-show="partners.length > 6"
       />
     </div>
   </div>
@@ -63,67 +63,26 @@ export default {
     return {
       current: 1,
       showProfile: false, // 显示公司介绍
-      newPartners: [
-        {
-          description: '132',
-          name: '测试公司1',
-          logoUrl: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2816433753,267880517&fm=26&gp=0.jpg',
-        },
-        {
-          description: '132',
-          name: '测试公司1',
-          logoUrl: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2816433753,267880517&fm=26&gp=0.jpg',
-        },
-        {
-          description: '132',
-          name: '测试公司1',
-          logoUrl: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2816433753,267880517&fm=26&gp=0.jpg',
-        },
-        {
-          description: '132',
-          name: '测试公司1',
-          logoUrl: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2816433753,267880517&fm=26&gp=0.jpg',
-        },
-        {
-          description: '132',
-          name: '测试公司1',
-          logoUrl: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2816433753,267880517&fm=26&gp=0.jpg',
-        },
-      ],
     };
   },
 
   computed: {
     ...mapState('home', ['partners', 'profile']),
-
-    // newPartners() {
-    //   let { partners } = this;
-    //   let arr = [];
-    //   if (partners && partners.length > 0) {
-    //     for (let i = 0; i < partners.length; i++) {
-    //       const element = partners[i];
-    //       for (let j = 0; j < element.backendSearchList.length; j++) {
-    //         const item = element.backendSearchList[j];
-    //         arr.push(item);
-    //       }
-    //     }
-    //     return arr;
-    //   }
-    //   return arr;
-    // },
   },
 
   async created() {
     this.setPartners([]);
     const { title, typeOfPlatform } = this;
+    console.log('title, typeOfPlatform : ', title, typeOfPlatform);
     const params = {
       param: {
-        pageNum: this.current,
+        pageNum: 1,
-        pageSize: 6,
+        // pageSize: -1,
-        type: title === '合作伙伴' ? 1 : 2,
+        type: title === '中心介绍' ? 0 : title === '合作伙伴' ? 1 : 2,
-        typeOfPlatform: typeOfPlatform === '关于我们' ? 2 : 1,
+        typeOfPlatform: typeOfPlatform === '研究院' ? 0 : typeOfPlatform === '孵化平台' ? 1 : 2,
       },
     };
+    console.log('params: ', params);
     await this.getFrontSearchCompany(params);
   },
 

src/components/Introduce/Pter.vue

@@ -11,26 +11,69 @@
       <p class="title-ch">合作伙伴</p>
       <p class="title-en">Partners</p>
     </div>
-    <div class="partner-content-box d-flex flex-wrap">
+    <div v-if="partners && partners.length > 0">
+      <div :key="index" v-for="(item,index) in partners">
         <div
-        :class="(index + 1) % 4 === 0 ? 'mr0' : ''"
+          class="partner-content-box d-flex flex-wrap"
-        :key="index"
+          v-if="item.backendSearchList && item.backendSearchList.length > 0"
+        >
+          <div
+            :class="(i + 1) % 4 === 0 ? 'mr0' : ''"
+            :key="i"
             class="item-box"
-        v-for="(item, index) in lists"
+            v-for="(list,i) in item.backendSearchList"
-      >{{ item }}</div>
+          >
+            <img :src="list.logoUrl" class="fill-height" v-if="list.logoUrl" />
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import { mapState, mapMutations, mapActions } from 'vuex';
+
 export default {
   name: 'Pter',
+  props: {
+    title: {
+      type: String,
+      default: '',
+    },
+    typeOfPlatform: {
+      type: String,
+      default: '',
+    },
+  },
   data() {
     return {
-      title: '合作伙伴',
+      lists: [],
-      lists: [123, 456, 789, 456, 123, 456, 789, 456, 123, 456, 789, 456],
     };
   },
+
+  computed: mapState('home', ['partners']),
+
+  async created() {
+    this.setPartners([]);
+    const { title, typeOfPlatform } = this;
+    console.log('title, typeOfPlatform : ', title, typeOfPlatform);
+    const params = {
+      param: {
+        pageNum: 1,
+        // pageSize: -1,
+        type: title === '中心介绍' ? 0 : title === '合作伙伴' ? 1 : 2,
+        typeOfPlatform: typeOfPlatform === '研究院' ? 0 : typeOfPlatform === '孵化平台' ? 1 : 2,
+      },
+    };
+    console.log('params: ', params);
+    await this.getFrontSearchCompany(params);
+  },
+
+  methods: {
+    ...mapMutations('home', ['setPartners', 'setProfile']),
+    ...mapActions('home', ['getFrontSearchCompany']),
+  },
 };
 </script>
 
@@ -47,10 +90,10 @@ export default {
   width: 20.5%;
   margin-right: 6%;
   background: #fff;
-  height: 100px;
+  height: 70px;
-  line-height: 100px;
   text-align: center;
-  margin-bottom: 20px;
+  margin-bottom: 40px;
+  border: 1px solid #eee;
 }
 
 .partner-content-box {

src/views/About/Children/Partner.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pter />
+    <pter :title="title" :type-of-platform="typeOfPlatform" />
   </div>
 </template>
 

src/views/About/Children/SpinOffs.vue

@@ -12,7 +12,7 @@ export default {
   components: { DeriveEnterprise },
   data() {
     return {
-      title: '衍生企业',
+      title: '生态企业',
       typeOfPlatform: '关于我们',
       arr: [
         { name: '关于我们', url: '/About/Introduce' },

src/views/Activity/ActDetails.vue

@@ -19,11 +19,22 @@
         </span>
       </div>
       <div class="policy-content" v-dompurify-html="actDetail.content"></div>
+      <a-button
+        disabled
+        style="margin: 50px 25px"
+        v-if="actDetail.releaseTime && Date.parse(actDetail.releaseTime) < Date.parse(nowData)"
+      >报名已结束</a-button>
       <enroll
         :act-name="actDetail.title"
         :activity-id="actDetail.activityId"
         style="margin: 50px 25px"
+        v-else
       />
+      <!-- <enroll
+        :act-name="actDetail.title"
+        :activity-id="actDetail.activityId"
+        style="margin: 50px 25px"
+      />-->
     </div>
   </div>
 </template>
@@ -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: {},
 };
 </script>

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;
+  padding-top: 10px;
-  bottom: 10px;
   margin-bottom: 0;
   line-height: 30px;
   color: rgba(0, 0, 0, 0.45);

src/views/Develop/Develop.vue

@@ -4,8 +4,8 @@
   <div>
     <rotation />
     <div class="inner" style="padding: 0 25px; padding-bottom: 50px">
-      <p class="dev-title">维基数智</p>
+      <!-- <p class="dev-title">维基数智</p> -->
-      <div class="dev-content line-height-30">
+      <div class="dev-content line-height-30 mt-8">
         <div>传控科技成立于2015年8月，由资深电子产品工程师携自动化和计算机专业相关同仁创立，围绕时物链条构建软硬件开放平台，致力于成为智能传感器控制系统解决方案和关键设备供应商。</div>
         <div>传控科技以传感器控制技术为核心进行开源模块及电子产品的研发生产、电子信息技术及网络应用的开发、咨询、服务、培训等，业务覆盖数字工厂、数字医疗、数字管理三大方向，自主研发产品先后应用于国家电力、北京科学技术委员会、山大一院、北京深孵咨询服务有限公司等企事业单位，清华大学、北京大学、山西大学、中北大学等高校。</div>
         <div>传控科技拥有发明专利和知识产权二十余项，并且拥有国内及美国注册商标任意环、ANYRING、CCSENS、老吾老、幼吾幼、传控可及、时物链条等，已通过ISO9001认证。</div>
@@ -18,8 +18,12 @@
       class="inner dev-img-box d-flex flex-wrap"
       style="margin-top: 40px !important; margin-bottom: 40px !important"
     >
-      <div :key="index" class="d-flex" style="width: 50%" v-for="(item, index) in lists">
+      <div :key="index" class="d-flex pic-box" style="width: 50%" v-for="(item, index) in lists">
-        <img :src="item" @click="showProfile = true" style="width: 100%; cursor: pointer" />
+        <img :src="item.url" @click="showProfile = true" style="width: 100%; cursor: pointer" />
+        <div class="txt pa-5">
+          <h2 class="white--text">{{ item.title }}</h2>
+          <div class="pt-2">{{ item.txt }}</div>
+        </div>
       </div>
     </div>
     <a-modal
@@ -59,10 +63,26 @@ export default {
   data() {
     return {
       lists: [
-        'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/f8d1790b78ca4afca3cfb15e350a53ef.jpg',
+        {
-        'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/0b883954d7ae4fd1a74be0c7943a3e52.jpg',
+          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/01.png',
-        'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/e92c71d276dd4689a43c643472762c12.jpg',
+          txt: '打造统筹管理事和时间的轻量级老板工具',
-        'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/bc60bf21daa6431b9dcf3c575121dabd.jpg',
+          title: 'PT pro老板工具',
+        },
+        {
+          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/02.png',
+          txt: '采集设备参数，配合智能匹配算法，动态调节设备配置，挖掘机器的最大潜能。',
+          title: '智能选矿',
+        },
+        {
+          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/03.png',
+          txt: '自动无干扰地记录急救流程各时间节点，最大限度降低记录工作对急救过程产生干扰和延误，达到实时监控抢救流程',
+          title: '智慧胸痛卒中中心绿道管理平台',
+        },
+        {
+          url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210114/04.png',
+          txt: '应用于数字医疗行业的测评平台，可满足各类线上、线下认知测评功能',
+          title: '认知评测云平台HT pro',
+        },
       ],
       showProfile: false,
     };
@@ -93,4 +113,31 @@ export default {
   height: 62px;
   font-size: 28px;
 }
+
+.pic-box {
+  position: relative;
+  overflow: hidden;
+
+  .txt {
+    opacity: 0;
+    position: absolute;
+    top: 200px;
+    left: 200px;
+    width: 100%;
+    height: 100%;
+    color: rgba(255, 255, 255, 0.9);
+    line-height: 32px;
+    background: rgba(0, 0, 0, 0.7);
+  }
+}
+
+.pic-box:hover .txt {
+  position: absolute;
+  opacity: 1;
+  top: 0;
+  left: 0;
+  -webkit-transition: all 0.5s ease-in;
+  -moz-transition: all 0.5s ease-in;
+  transition: all 0.5s ease-in;
+}
 </style>

src/views/Hatch/Children/Partner.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div>
-    <pter />
+    <pter :title="title" :type-of-platform="typeOfPlatform" />
   </div>
 </template>
 <script>
@@ -17,7 +17,7 @@ export default {
   name: 'Partner',
   components: { Pter },
   data() {
-    return { showPage: 11, title: '孵化平台', typeOfPlatform: '合作伙伴' };
+    return { showPage: 11, title: '合作伙伴', typeOfPlatform: '孵化平台' };
   },
 };
 </script>

src/views/ServiceMarket/Children/InnovativeService.vue

@@ -3,19 +3,14 @@
     <left-nav />
     <div class="flex-1">
       <div class="content-box fill-width pa-3">
-        <div
+        <div :key="index" style="cursor: pointer" v-for="(item, index) in list">
-          :key="index"
+          <div @click="jump(item.id)" class="pointer d-flex flex-nowrap justify-space-between">
-          style="margin-bottom: 50px; cursor: pointer"
+            <div class="d-flex flex-column justify-center py-3">
-          v-for="(item, index) in list"
-        >
-          <div
-            @click="jump(item.id)"
-            class="pointer d-flex flex-nowrap justify-space-between mb-10"
-          >
               <img :src="item.picUrl" style="width: 330px;height:173px" />
+            </div>
             <div class="flex-1 flex-column pa-3">
               <p class="font-bold-22">{{ item.name }}</p>
-              <p>{{ item.intro }}</p>
+              <p class="font-16 line-height-30" v-dompurify-html="item.intro">{{ item.intro }}</p>
             </div>
           </div>
           <a-divider v-if="index !== (list.length - 1)" />

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"
         >
           <div class="pic d-flex align-center justify-center">
             <img :src="item.url" class="fill-width fill-height" />
@@ -67,6 +67,7 @@
 </template>
 
 <script>
+import { mapState, mapMutations, mapActions } from 'vuex';
 import '@/common/platform.styl';
 import LeftNav from './../components/LeftNav.vue';
 
@@ -75,9 +76,8 @@ export default {
   components: { LeftNav },
   data() {
     return {
-      title: '服务超市-智慧创新研究院',
+      title: '中心介绍',
-      title1: '创新平台-组织机构',
+      typeOfPlatform: '研究院',
-      typeOfPlatform: '服务超市',
       list: [
         {
           id: 1,
@@ -127,10 +127,32 @@ export default {
       ],
     };
   },
+
+  computed: mapState('home', ['partners']),
+
+  async created() {
+    this.setPartners([]);
+    const { title, typeOfPlatform } = this;
+    console.log('title, typeOfPlatform : ', title, typeOfPlatform);
+    const params = {
+      param: {
+        pageNum: 1,
+        // pageSize: -1,
+        type: title === '中心介绍' ? 0 : title === '合作伙伴' ? 1 : 2,
+        typeOfPlatform: typeOfPlatform === '研究院' ? 0 : typeOfPlatform === '孵化平台' ? 1 : 2,
+      },
+    };
+    console.log('params: ', params);
+    await this.getFrontSearchCompany(params);
+  },
+
   mounted() {
     this.showChart();
   },
+
   methods: {
+    ...mapMutations('home', ['setPartners', 'setProfile']),
+    ...mapActions('home', ['getFrontSearchCompany']),
     showChart() {
       // 基于准备好的dom，初始化echarts实例
       var myChart = this.$echarts.init(document.getElementById('treeChart'));

src/views/ServiceMarket/Children/Partner.vue

@@ -3,7 +3,7 @@
     <left-nav />
     <div class="flex-1 py-3">
       <div class="fill-width">
-        <pter />
+        <pter :title="title" :type-of-platform="typeOfPlatform" />
       </div>
     </div>
   </div>
@@ -19,7 +19,7 @@ export default {
   data() {
     return {
       title: '合作伙伴',
-      typeOfPlatform: '关于我们',
+      typeOfPlatform: '研究院',
       arr: [
         { name: '关于我们', url: '/About/Introduce' },
         { name: '合作伙伴', url: '' },