审核修改

src/components/FooterPage/FooterPage.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-13 16:33:32
+ * @LastEditors: wally
+ * @LastEditTime: 2021-03-24 19:00:22
+-->
 <template>
   <div>
     <div class="footer">
@@ -38,9 +45,9 @@ export default {
       str: '头部导航栏',
       finds: [
         { id: 1, name: '创新挑战', path: '/Challenge/Solicitation' },
-        { id: 2, name: '创新研究院', path: '/ServiceMarket/Institute' },
+        { id: 2, name: '创新服务', path: '/ServiceMarket/Institute' },
         { id: 3, name: '孵化平台', path: '/Hatch/Space' },
-        { id: 4, name: '学习平台', path: '/Study' },
+        // { id: 4, name: '学习平台', path: '/Study' },
       ],
       news: [
         { id: 5, name: '行业资讯', path: '/ItInformation' },

src/components/HeadNav/HeadNav.vue

@@ -63,13 +63,31 @@ export default {
         {
           name: '创新政策',
           url: '/Policy',
+          children: [
+            {
+              title: '国家政策',
+              url: '/Policy',
+            },
+            {
+              title: '省级政策',
+              url: '/Policy',
+            },
+            {
+              title: '市级政策',
+              url: '/Policy',
+            },
+            {
+              title: '区县政策',
+              url: '/Policy',
+            },
+          ],
         },
         {
-          name: '创新研究院',
+          name: '创新服务',
           url: '/ServiceMarket/Institute',
           children: [
             {
-              title: '智慧创新研究院',
+              title: '创新研究院',
               url: '/ServiceMarket/Institute',
             },
             {
@@ -123,6 +141,16 @@ export default {
         {
           name: '双创活动',
           url: '/Activity',
+          children: [
+            {
+              title: '活动通知',
+              url: '/Activity',
+            },
+            {
+              title: '活动报道',
+              url: '/Activity',
+            },
+          ],
         },
         {
           name: '创新挑战',
@@ -240,7 +268,7 @@ export default {
 .list-down {
   margin-right: 20px;
   font-size: 18px;
-  color: rgba(0, 0, 0, 0.65);
+  color: rgba(0, 0, 0, 0.85);
 }
 
 .list-down:hover {

src/components/Introduce/ContactUs.vue

@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-13 16:33:32
  * @LastEditors: wally
- * @LastEditTime: 2021-01-13 17:15:37
+ * @LastEditTime: 2021-03-24 19:10:16
 -->
 <!--
   Copyright (c) 2020.
@@ -13,26 +13,30 @@
 
 <template>
   <div>
-    <div class="d-flex flex-nowrap white" style="padding: 80px 0;">
+    <div class="d-flex flex-nowrap white" style="padding: 80px 0">
       <div class="flex-1 align-center flex-wrap flex-column">
         <a-icon class="user" type="user" />
         <br />
-        <span class="concat-us-tips">王部长</span>
+        <span class="concat-us-tips">王老师</span>
       </div>
       <div class="flex-1 align-center flex-wrap flex-column">
         <a-icon class="user" type="phone" />
         <br />
-        <span class="concat-us-tips">18003513318</span>
+        <span class="concat-us-tips">13383416022</span>
       </div>
       <div class="flex-1 align-center flex-wrap flex-column">
         <a-icon class="user" type="mail" />
         <br />
-        <span class="concat-us-tips">wjzh114@163.com</span>
+        <span class="concat-us-tips">CSD114@163.com</span>
       </div>
       <div class="flex-1 align-center flex-wrap flex-column">
         <a-icon class="user" type="environment" />
         <br />
-        <span class="concat-us-tips">山西综改示范区太原学府园区发展路15号中绿大厦503室</span>
+        <span class="concat-us-tips"
+          >山西综改示范区太原学府园区 <br />
+          发展路15号中绿大厦2层/5层<br />
+          产业路38号高新置业副楼西区902室<br />
+        </span>
       </div>
     </div>
     <div class="contact d-flex flex-nowrap">

src/components/Introduce/IntentionModel.vue

@@ -1,95 +1,36 @@
 <template>
   <div>
-    <a-button @click="showModal">直接申请</a-button>
+    <a-button @click="showModal">服务申请</a-button>
-    <a-modal
+    <a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk" title="服务申请" width="50%">
-      :confirm-loading="confirmLoading"
-      :visible="visible"
-      @cancel="handleCancel"
-      @ok="handleOk"
-      title="服务申请"
-      width="50%"
-    >
       <a-form :form="form">
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="公司名称"
-        >
           <a-input placeholder="请输入公司名称..." v-model.trim="platform.companyName" />
         </a-form-item>
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系人" required>
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="联系人"
-          required
-        >
           <a-input placeholder="请输入联系人..." v-model.trim="platform.manName" />
         </a-form-item>
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
-          :label-col="formItemLayout.labelCol"
+          <a-input @change="changePhone" placeholder="请输入联系电话.." type="tel" v-model.trim="platform.tel" />
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="联系电话"
-          required
-        >
-          <a-input
-            @change="changePhone"
-            placeholder="请输入联系电话.."
-            type="tel"
-            v-model.trim="platform.tel"
-          />
         </a-form-item>
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="图片验证码" required>
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="图片验证码"
-          required
-        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="图片验证码" type="number" v-model="codeNum" />
-            <img
+            <img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
-              :src="picCode.imageBase64"
-              @click="changePicCode"
-              class="code_img ml-2"
-              v-if="picCode && picCode.imageBase64"
-            />
             <a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
             <!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
           </div>
         </a-form-item>
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="短信验证码" required>
-          :label-col="formItemLayout.labelCol"
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="短信验证码"
-          required
-        >
           <div class="d-flex flex-nowrap">
             <a-input placeholder="请输入验证码" type="number" v-model="platform.code" />
-            <a-button
+            <a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
-              class="code_img ml-2"
+            <a-button :disabled="platform.isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else
-              disabled
+              >获取验证码</a-button
-              type="primary"
+            >
-              v-if="showInterval"
-            >重新发送 {{ interval }}</a-button>
-            <a-button
-              :disabled="platform.isTel === false"
-              @click="getCode"
-              class="code_img ml-2"
-              type="primary"
-              v-else
-            >获取验证码</a-button>
           </div>
         </a-form-item>
-        <a-form-item
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="项目信息简述" required>
-          :label-col="formItemLayout.labelCol"
+          <a-textarea placeholder="请输入项目信息简述..." style="height: 120px" v-model.trim="platform.describe" />
-          :wrapper-col="formItemLayout.wrapperCol"
-          label="项目信息简述"
-          required
-        >
-          <a-textarea
-            placeholder="请输入项目信息简述..."
-            style="height: 120px"
-            v-model.trim="platform.describe"
-          />
         </a-form-item>
         <a-form-item
           :label-col="formItemLayout.labelCol"
@@ -97,16 +38,8 @@
           label="上传附件"
           v-show="typeData.type === 0"
         >
-          <a-upload
+          <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
-            :action="action"
+            <a-button> <a-icon type="upload" />点击上传附件 </a-button>
-            :default-file-list="fileList"
-            @change="fileChange"
-            list-type="picture"
-            name="files"
-          >
-            <a-button>
-              <a-icon type="upload" />点击上传附件
-            </a-button>
           </a-upload>
         </a-form-item>
       </a-form>

src/views/About/Children/Introduce.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-13 17:30:54
+ * @LastEditors: wally
+ * @LastEditTime: 2021-03-24 18:47:27
+-->
 <template>
   <div>
     <div class="content-box">
@@ -33,7 +40,7 @@ export default {
       ],
       list: [
         {
-          title: '山西维基智汇科技有限公司',
+          title: '山西创时代企业孵化器有限公司',
           content:
             '研究院的介绍包含研究院，公司架构，和各中心的介绍。' +
             '各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、' +

src/views/About/Children/Organ.vue

@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-13 17:30:54
  * @LastEditors: wally
- * @LastEditTime: 2021-01-18 10:59:20
+ * @LastEditTime: 2021-03-24 18:55:48
 -->
 <template>
   <div>
@@ -39,20 +39,13 @@ export default {
       treedata: [
         {
           //一定一定要注意这里有[]
-          name: '山西智汇协同创新研究院有限公司',
+          name: '山西创时代企业孵化器有限公司',
           children: [
-            { name: '三大平台', children: [{ name: '数智网络平台' }, { name: '战略合作平台' }, { name: '知识培训平台' }] },
+            { name: '高新众创空间', children: [{ name: '入驻服务平台' }, { name: '创新赋能平台' }, { name: '跟踪评价平台' }] },
-            { name: '专家委员会' },
+            { name: '创时代专业孵化器', children: [{ name: '创新政策服务' }, { name: '信息技术咨询' }, { name: '知识产权服务' }] },
             {
-              name: '咨询服务中心',
+              name: '线上孵化器',
-              children: [
+              children: [{ name: '科创能力咨询' }, { name: '技术转移服务' }, { name: '数字化转服务' }],
-                { name: '科创体系与科创能力咨询服务中心' },
-                { name: '知识产权与技术转移咨询服务中心' },
-                { name: '数字化转型咨询服务中心' },
-                { name: '科技信息咨询服务中心' },
-                { name: '科创战略协同研究中心' },
-                { name: '山西奥依工业设计咨询服务中心' },
-              ],
             },
           ],
         },

src/views/Activity/Activity.vue

@@ -8,9 +8,10 @@
   <div class="inner">
     <div class="search-list">
       <span>
+        <a-checkbox style="font-size: 20px; font-weight: bold">培训</a-checkbox>
         <a-checkbox style="font-size: 20px; font-weight: bold" :checked="sta.ly === 1" @click="cSta('ly')">路演</a-checkbox>
         <a-checkbox style="font-size: 20px; font-weight: bold" :checked="sta.jz === 1" @click="cSta('jz')">讲座</a-checkbox>
-        <a-checkbox style="font-size: 20px; font-weight: bold" :checked="sta.sl === 1" @click="cSta('sl')">沙龙</a-checkbox>
+        <a-checkbox style="font-size: 20px; font-weight: bold" :checked="sta.sl === 1" @click="cSta('sl')">交流</a-checkbox>
       </span>
       <a-input-search @search="getData" class="search" enter-button="搜索" placeholder="请输入..." style="width: 381px" v-model="iptCon" />
     </div>

src/views/Challenge/Children/Notice.vue

@@ -29,8 +29,25 @@
         v-show="total > 6"
       />
     </div>
-    <a-modal width="50%" title="揭榜详情" :visible="visible" :confirm-loading="confirmLoading" @ok="handleCancel" @cancel="handleCancel">
+    <a-modal
+      :footer="false"
+      width="50%"
+      title="揭榜详情"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      @ok="handleCancel"
+      @cancel="handleCancel"
+    >
       <a-form :form="form" :label-col="{ span: 5 }" :wrapper-col="{ span: 12, offset: 5 }" v-if="proData">
+        <a-form-item label="发榜人">
+          {{ proData.accepterName }}
+        </a-form-item>
+        <a-form-item label="发榜单位">
+          {{ proData.phone }}
+        </a-form-item>
+        <a-form-item label="介绍人">
+          {{ proData.accepterName }}
+        </a-form-item>
         <a-form-item label="揭榜人">
           {{ proData.accepterName }}
         </a-form-item>

src/views/Challenge/Children/components/Publish.vue

@@ -12,7 +12,7 @@
           <a-input placeholder="请输入技术领域..." v-model.trim="platform.technicalField" />
         </a-form-item>
         <!-- 需求截止时间 -->
-        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="需求截止时间">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="截止时间">
           <a-date-picker @change="changeNeedTime" style="width: 100%" />
         </a-form-item>
         <!-- 需求类别 -->

src/views/Challenge/Children/components/SearchBox.vue

@@ -1,9 +1,17 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-03-18 16:05:24
+ * @LastEditors: wally
+ * @LastEditTime: 2021-03-24 18:33:27
+-->
 <template>
   <div class="search-list">
-    <span>发榜单位：</span> <a-input style="width: 20%" v-model="getParam.companyName" /> <span>单位地址：</span>
+    <span>发榜单位：</span> <a-input style="width: 20%" v-model="getParam.companyName" /> <span>发榜项目：</span>
-    <a-input style="width: 20%" v-model="getParam.address" /><br />
+    <a-input style="width: 20%" v-model="getParam.address" />
-    <span>发榜标题：</span> <a-input style="width: 20%" v-model="getParam.dataTitle" /> <span>所属领域：</span>
+    <span>截止时间：</span> <a-input style="width: 20%" v-model="getParam.dataTitle" />
-    <a-input style="width: 20%" v-model="getParam.serviccs" />
+    <!-- <span>所属领域：</span>
+    <a-input style="width: 20%" v-model="getParam.serviccs" /> -->
     <a-button class="search-btn" type="primary" @click="submit">搜索</a-button>
   </div>
 </template>
@@ -33,7 +41,7 @@ export default {
 .search-list {
   position: relative;
   height: 80px;
-  line-height: 40px;
+  line-height: 80px;
   background: #fff;
   box-shadow: 0 0 10px #ccc;
   border-radius: 4px;
@@ -45,8 +53,8 @@ export default {
 .search-btn {
   position: absolute;
   right: 4px;
-  height: 72px;
+  height: 34px;
-  top: 4px;
+  top: 24px;
   width: 116.5px;
   font-size: 18px;
   // color: white !important;

src/views/Challenge/Children/components/Unveiling.vue

@@ -29,12 +29,15 @@
         <a-form-item label="揭榜单位" required>
           <a-input v-model="setData.unit" placeholder="请输入揭榜单位" />
         </a-form-item>
+        <a-form-item label="介绍人">
+          <a-input v-model="setData.unit" placeholder="揭榜介绍人" />
+        </a-form-item>
         <a-form-item label="方案简述" required>
           <a-textarea v-model="setData.planIntro" placeholder="请输入方案简述" />
         </a-form-item>
-        <a-form-item label="揭榜时间">
+        <!-- <a-form-item label="揭榜时间">
           <a-date-picker format="YYYY-MM-DD HH:mm:ss" show-time @ok="changeTime" />
-        </a-form-item>
+        </a-form-item> -->
       </a-form>
     </a-modal>
     <a-modal :confirm-loading="confirmLoading1" title="需要登录" :visible="visible1" @cancel="handleCancel1" @ok="handleOk1" width="50%">

src/views/FirstPage/FirstPage.vue

@@ -82,7 +82,7 @@ export default {
         },
         {
           id: 3,
-          name: '创新研究院',
+          name: '创新服务',
           url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/index03.png',
           path: '/ServiceMarket/Institute',
         },

src/views/Hatch/Children/Epoch.vue

@@ -2,14 +2,14 @@
   <div style="padding: 0 25px">
     <div style="padding-bottom: 80px; position: relative">
       <div class="words-content">
-        <p class="words-title">创时代孵化器介绍</p>
+        <p class="words-title">山西创时代企业孵化器</p>
         <div class="con-con">
-          <div class="d-flex justify-space-between">
+          <!-- <div class="d-flex justify-space-between">
             <img src="@/assets/创新.png" style="width: 20%; height: 100%" alt="" />
             <img src="@/assets/竞争.png" style="width: 15%; height: 100%" alt="" />
             <img src="@/assets/机遇.png" style="width: 20%; height: 100%" alt="" />
             <img src="@/assets/合作.png" style="width: 15%; height: 100%" alt="" />
-          </div>
+          </div> -->
           <p style="text-indent: 2em; margin-top: 40px">
             山西创时代企业孵化器有限公司。2017年成立，位于山西综改示范区太原学府园区。现运营1个省级众创空间,1个专业化科技企业孵化器。
             双创平台建筑面积1万平方米,孵化企业200余家。2020年认定为省级小微企业创新创业基地、省级中小企业公共服务平台。
@@ -54,7 +54,7 @@ export default {
     return {
       list: [
         {
-          title: '高薪众创空间',
+          title: '高新众创空间',
           content:
             '研究院的介绍包含研究院，公司架构，和各中心的介绍。' +
             '各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、' +
@@ -70,7 +70,7 @@ export default {
           imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/logo/zckj01.png',
         },
         {
-          title: '虚拟孵化器',
+          title: '线上孵化器',
           content:
             '各中心介绍包含科创体系与科创能力咨询服务中心、' +
             '知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、' +

src/views/ServiceMarket/Children/InnovativeService.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: wally
+ * @email: 18603454788@163.com
+ * @Date: 2021-01-14 16:25:40
+ * @LastEditors: wally
+ * @LastEditTime: 2021-03-24 17:35:28
+-->
 <template>
   <div class="d-flex flex-nowrap inner">
     <left-nav />
@@ -14,7 +21,7 @@
             </div>
           </div>
           <div class="d-flex flex-row-reverse">
-            <add-shopping :service-id="item.id" :type-data="typeData" />
+            <!-- <add-shopping :service-id="item.id" :type-data="typeData" /> -->
             <intention-model :service-id="item.id" :type-data="typeData" class="mr-3" />
           </div>
           <a-divider v-if="index !== list.length - 1" />
@@ -29,11 +36,11 @@ import { mapMutations } from 'vuex';
 import { selService } from 'config/api';
 import LeftNav from './../components/LeftNav.vue';
 import IntentionModel from 'components/Introduce/IntentionModel.vue';
-import AddShopping from 'components/Introduce/AddShopping.vue';
+// import AddShopping from 'components/Introduce/AddShopping.vue';
 
 export default {
   name: 'InnovativeService',
-  components: { LeftNav, IntentionModel, AddShopping },
+  components: { LeftNav, IntentionModel },
   data() {
     return {
       title: '创新研究院-科技创新服务',

src/views/ServiceMarket/Children/Institute.vue

@@ -29,10 +29,10 @@
               <img src="~assets/fwcs02.png" />
             </div>
             <div>
-              <div class="font-16 textColor line-height-36">
+              <div class="font-16 textColor line-height-36" style="text-indent: 2em">
                 研究院下没六个咨询服务中心和一个专家委员会：科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心。
               </div>
-              <div class="font-16 textColor line-height-36">
+              <div class="font-16 textColor line-height-36" style="text-indent: 2em">
                 以中心为主体，以团队为单元，以平台为支撑，围绕创新创业发展需求，整合各类优质资源，打造全链条一体化开放式创新创业新生态。
               </div>
               <div :style="{ height: '500px' }" id="treeChart"></div>

src/views/ServiceMarket/Children/ServiceDet.vue

@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-14 16:25:40
  * @LastEditors: wally
- * @LastEditTime: 2021-01-15 21:42:54
+ * @LastEditTime: 2021-03-24 18:26:50
 -->
 <template>
   <div>
@@ -20,11 +20,14 @@
         <!-- <a-button>直接申请</a-button> -->
         <intention-model :type-data="typeData" style="float: left; margin-right: 20px" />
         <!-- <a-button type="primary">加入购物车</a-button> -->
-        <add-shopping :type-data="typeData" />
+        <!-- <add-shopping :type-data="typeData" /> -->
       </div>
+      <br />
       <div class="mt-10" style="margin-top: 40px">
         <p class="font-30">服务案例</p>
-        <div>研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心</div>
+        <div>
+          研究院的介绍包含研究院，公司架构，和各中心的介绍。各中心介绍包含科创体系与科创能力咨询服务中心、知识产权与技术转移咨询服务中心、数字化转型咨询服务中心、科技信息咨询服务中心、科创战略协同研究中心、山西奥依工业设计咨询服务中心
+        </div>
       </div>
     </div>
   </div>
@@ -34,10 +37,10 @@
 import { mapState } from 'vuex';
 import { selContent } from 'config/api';
 import IntentionModel from 'components/Introduce/IntentionModel.vue';
-import AddShopping from 'components/Introduce/AddShopping.vue';
+// import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'ServiceDet',
-  components: { IntentionModel, AddShopping },
+  components: { IntentionModel },
   data() {
     return {
       obj: {

src/views/ServiceMarket/components/LeftNav.vue

@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-13 17:25:56
  * @LastEditors: wally
- * @LastEditTime: 2021-01-13 18:19:19
+ * @LastEditTime: 2021-03-24 17:30:01
 -->
 <template>
   <div class="nav-box">
@@ -13,7 +13,9 @@
       @click="jump(item.url, index)"
       class="d-flex flex-column justify-center"
       v-for="(item, index) in list"
-    >{{ item.title }}</div>
+    >
+      {{ item.title }}
+    </div>
   </div>
 </template>
 
@@ -26,7 +28,7 @@ export default {
       activeNum: 0,
       list: [
         {
-          title: '智慧创新研究院',
+          title: '创新研究院',
           url: '/ServiceMarket/Institute',
         },
         {