From 6423797b16942e5475826e36a16a1fcf9599a535 Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Thu, 7 Jan 2021 17:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=A0=E5=85=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=84=8F=E5=90=91=E5=A1=AB=E6=8A=A5=EF=BC=8C=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeadNav/HeadNav.vue            |  29 +--
 src/components/Introduce/AddShopping.vue      |  94 +++++++
 src/components/Introduce/IntentionModel.vue   | 232 ++++++++++++++++++
 src/components/PlatformList/Fruit.vue         |  15 +-
 src/components/PlatformList/PlatformList.vue  |   3 +-
 src/config/api.js                             |   6 +
 src/router/index.js                           |  10 +-
 src/views/FirstPage/FirstPage.vue             |   2 +-
 .../Children/components/SenNav.vue            |   2 +-
 src/views/Industry/Children/Union.vue         |   6 +-
 .../Industry/Children/components/HNav.vue     |  10 +-
 src/views/Knowledge/Knowledge.vue             |   2 +-
 src/views/NewPlatform/Children/AchDet.vue     |  22 +-
 src/views/NewPlatform/Children/Core.vue       |   5 +-
 src/views/NewPlatform/Children/Develop.vue    |   6 +-
 src/views/NewPlatform/Children/Platform.vue   |   2 +-
 src/views/NewPlatform/Children/ServiceDet.vue |  65 ++++-
 .../Children/ShareChild/InsDet.vue            |  14 +-
 .../Children/ShareChild/Institute.vue         |   2 +-
 .../Children/components/SenNav.vue            |   2 +-
 src/views/NewPlatform/components/NewModel.vue | 204 +++++++++++++++
 21 files changed, 674 insertions(+), 59 deletions(-)
 create mode 100644 src/components/Introduce/AddShopping.vue
 create mode 100644 src/components/Introduce/IntentionModel.vue
 create mode 100644 src/views/NewPlatform/components/NewModel.vue

diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index 62ce811..d2ad2b6 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -2,23 +2,13 @@
   <div class="head">
     <img @click="jumUrl('/')" alt class="logo-img" src="@/assets/logo.png" style="cursor: pointer" />
     <div class="li-box">
-      <a-dropdown
-        :disabled="item.children.length > 0 ? false : true"
-        :key="a"
-        class="list-down"
-        v-for="(item, a) in list"
-      >
+      <a-dropdown :disabled="item.children.length > 0 ? false : true" :key="a" class="list-down" v-for="(item, a) in list">
         <a @click="jumUrl(item.url)" class="ant-dropdown-link">
           {{ item.name }}&nbsp;&nbsp;
           <a-icon type="down" v-show="item.children.length > 0" />
         </a>
         <a-menu slot="overlay">
-          <a-menu-item
-            :key="b"
-            class="px-6 py-3"
-            style="text-align: center"
-            v-for="(con, b) in item.children"
-          >
+          <a-menu-item :key="b" class="px-6 py-3" style="text-align: center" v-for="(con, b) in item.children">
             <a @click="jumUrl(con.url)">{{ con.title }}</a>
           </a-menu-item>
         </a-menu>
@@ -29,12 +19,7 @@
       <template slot="title">
         <span>点击查看购物车！</span>
       </template>
-      <a-icon
-        @click="$router.push('/Cart')"
-        class="icon-head baseColor"
-        style="right: 100px"
-        type="shopping-cart"
-      />
+      <a-icon @click="$router.push('/Cart')" class="icon-head baseColor" style="right: 100px" type="shopping-cart" />
     </a-tooltip>
     <router-link tag="span" to="/login">
       <a-icon class="icon-head" style="right: 50px" type="user" />
@@ -133,18 +118,18 @@ export default {
           children: [
             {
               title: '产业创新联盟',
-              url: '/Challenge/Union',
+              url: '/Industry/Union',
             },
             {
               title: '产业服务',
-              url: '/Challenge/Serve',
+              url: '/Industry/Serve',
             },
             {
               title: '衍生企业',
-              url: '/Challenge/Enterprise',
+              url: '/Industry/Enterprise',
             },
           ],
-          url: '/Challenge/Union',
+          url: '/Industry/Union',
         },
         {
           name: '知识平台',
diff --git a/src/components/Introduce/AddShopping.vue b/src/components/Introduce/AddShopping.vue
new file mode 100644
index 0000000..49360d5
--- /dev/null
+++ b/src/components/Introduce/AddShopping.vue
@@ -0,0 +1,94 @@
+<template>
+  <div>
+    <a-button type="primary" @click="showModal">
+      {{ str }}
+    </a-button>
+    <a-modal width="50%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
+      <a-form :form="form">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="项目信息简述">
+          <a-textarea v-model.trim="describe" style="height: 120px" placeholder="请输入项目信息简述..." />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import { addCar } from 'config/api';
+const formItemLayout = {
+  labelCol: { span: 5 },
+  wrapperCol: { span: 18 },
+};
+const formTailLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 18, offset: 6 },
+};
+export default {
+  name: 'NewModel',
+  props: {
+    typeData: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      form: this.$form.createForm(this, { name: 'submit' }),
+      title: '加入购物车',
+      str: '加入购物车',
+      visible: false,
+      formItemLayout,
+      formTailLayout,
+      confirmLoading: false,
+      describe: '', // 项目描述
+    };
+  },
+  methods: {
+    // 显示表单输入框
+    showModal() {
+      this.visible = true;
+    },
+    // 取消显示
+    handleCancel(e) {
+      this.visible = false;
+    },
+    // 点击确定
+    async handleOk() {
+      this.confirmLoading = true;
+      try {
+        const params = {
+          param: {
+            description: this.describe,
+            serviceId: this.typeData.Id,
+            type: this.typeData.type,
+          },
+        };
+        const res = await addCar(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.$message.success('加入购物车成功');
+          this.visible = false;
+          this.confirmLoading = false;
+          this.describe = '';
+        } else {
+          this.$message.error(msg);
+        }
+      } catch (error) {
+        this.$message.error(error);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.must-color {
+  color: red;
+}
+
+.code_img {
+  height: 32px;
+  width: 120px;
+}
+</style>
diff --git a/src/components/Introduce/IntentionModel.vue b/src/components/Introduce/IntentionModel.vue
new file mode 100644
index 0000000..775d42e
--- /dev/null
+++ b/src/components/Introduce/IntentionModel.vue
@@ -0,0 +1,232 @@
+<template>
+  <div>
+    <a-button type="primary" @click="showModal">
+      {{ str }}
+    </a-button>
+    <a-modal width="50%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
+      <a-form :form="form">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
+          <a-input v-model.trim="platform.companyName" placeholder="请输入公司名称..." />
+        </a-form-item>
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系人" required>
+          <a-input v-model.trim="platform.manName" placeholder="请输入联系人..." />
+        </a-form-item>
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
+          <a-input @change="changePhone" type="tel" v-decorator="['tel', { rules: phoneRules }]" placeholder="请输入联系电话.." />
+        </a-form-item>
+        <a-form-item :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 :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 :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 class="code_img ml-2" disabled 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 :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="项目信息简述" required>
+          <a-textarea v-model.trim="platform.describe" style="height: 120px" placeholder="请输入项目信息简述..." />
+        </a-form-item>
+        <a-form-item
+          v-show="typeData.type === 0"
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+          label="上传附件"
+        >
+          <a-upload :action="action" :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>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import { serviceApply, upload } from 'config/api';
+const formItemLayout = {
+  labelCol: { span: 5 },
+  wrapperCol: { span: 18 },
+};
+const formTailLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 18, offset: 6 },
+};
+export default {
+  name: 'NewModel',
+  props: {
+    typeData: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      form: this.$form.createForm(this, { name: 'submit' }),
+      action: upload,
+      fileList: [],
+      visible: false,
+      title: '意向填报',
+      str: '意向填报',
+      formItemLayout,
+      formTailLayout,
+      confirmLoading: false,
+      platform: {
+        companyName: '', // 公司名称
+        manName: '', // 联系人
+        tel: '', // 联系电话
+        describe: '', // 项目描述
+        code: '', // 验证码
+        files: [], // 附件Id
+        isTel: false,
+      },
+      codeRules: [
+        { required: true, message: '请输入验证码' },
+        { min: 4, max: 4, message: '请输入4位短信验证码' },
+      ],
+      codeNum: '',
+      showInterval: false,
+      codeTimer: null,
+      interval: 120, // 验证码有效时间倒计时
+      phoneRules: [
+        { required: true, pattern: new RegExp(/^[1][3,4,5,6,7,8,9][0-9]{9}$/), whitespace: true, message: '请输入正确的手机号' },
+      ],
+    };
+  },
+  computed: mapState('user', ['picCode']),
+  created() {
+    this.sendPicCode();
+  },
+  methods: {
+    ...mapActions('user', ['sendCode', 'sendPicCode']),
+    // 显示表单输入框
+    showModal() {
+      this.visible = true;
+    },
+    // 取消显示
+    handleCancel(e) {
+      this.visible = false;
+    },
+    // 验证电话
+    changePhone(e) {
+      this.platform.tel = e.target.value;
+      this.platform.isTel = /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(this.platform.tel);
+    },
+    // 点击确定
+    handleOk() {
+      if (!this.platform.manName) {
+        this.$message.error('请输入联系人');
+      } else if (!this.platform.tel) {
+        this.$message.error('请输入联系电话');
+      } else if (!this.platform.code) {
+        this.$message.error('请输入验证码');
+      } else if (!this.platform.describe) {
+        this.$message.error('请输入项目信息简述');
+      } else {
+        if (this.platform.isTel) {
+          for (var i = 0; i < this.fileList.length; i++) {
+            this.platform.files = this.platform.files.concat(this.fileList[i].response.data[0].id);
+          }
+          this.subMitAdd();
+          // console.log(this.platform.files);
+        } else {
+          this.$message.error('请输入正确的联系电话');
+        }
+      }
+    },
+    // 加入接口
+    async subMitAdd() {
+      this.confirmLoading = true;
+      try {
+        const params = {
+          param: {
+            code: this.platform.code,
+            companyName: this.platform.companyName,
+            contactName: this.platform.manName,
+            contactPhone: this.platform.tel,
+            description: this.platform.describe,
+            filesId: this.platform.files,
+            serviceId: this.typeData.Id,
+            type: this.typeData.type,
+          },
+        };
+        const res = await serviceApply(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.$message.success('申请成功');
+          this.visible = false;
+          this.confirmLoading = false;
+          for (let key in this.platform) {
+            this.platform[key] = '';
+          }
+          this.platform.isTel = false;
+        } else {
+          throw msg;
+          this.confirmLoading = false;
+        }
+      } catch (error) {
+        this.$message.error(error);
+        this.confirmLoading = false;
+      }
+    },
+    // 获取验证码
+    async getCode() {
+      console.log(111);
+      try {
+        const params = {
+          phone: this.platform.tel,
+          verificationCodeId: this.picCode.verificationCodeId,
+          verificationCodeValue: this.codeNum,
+        };
+        await this.sendCode(params);
+        this.getCodeInterval();
+      } catch (error) {
+        // throw new Error(`SignIn.vue method getCode: ${error}`);
+        console.log(error);
+      }
+    },
+
+    // 验证码倒计时
+    getCodeInterval() {
+      this.showInterval = true;
+      this.codeTimer = setInterval(() => {
+        if (this.interval === 0) {
+          clearInterval(this.codeTimer);
+          this.codeTimer = null;
+          this.showInterval = false;
+          this.interval = 120;
+          return;
+        }
+        this.interval = this.interval - 1;
+      }, 1000);
+    },
+
+    // 刷新验证码
+    changePicCode() {
+      this.sendPicCode();
+    },
+    fileChange(info) {
+      this.fileList = info.fileList;
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.must-color {
+  color: red;
+}
+
+.code_img {
+  height: 32px;
+  width: 120px;
+}
+</style>
diff --git a/src/components/PlatformList/Fruit.vue b/src/components/PlatformList/Fruit.vue
index 3386e54..8711ba7 100644
--- a/src/components/PlatformList/Fruit.vue
+++ b/src/components/PlatformList/Fruit.vue
@@ -5,7 +5,8 @@
         <p class="font-24 my-3" style="cursor: pointer" @click="detail(item.id)">{{ item.name }}</p>
         <p class="font-16" style="color: rgba(0, 0, 0, 0.45); cursor: pointer" @click="detail(item.id)">编号：{{ item.identifier }}</p>
         <p class="font-16 baseColor item-more">
-          <a-button type="primary" style="cursor: pointer">转化意向填报</a-button>
+          <!-- <a-button type="primary" style="cursor: pointer">转化意向填报</a-button> -->
+          <intention-model :type-data="getId(item.id)" />
         </p>
       </div>
     </div>
@@ -26,13 +27,19 @@
 <script>
 import { mapMutations, mapState } from 'vuex';
 import { selRes } from 'config/api';
+import IntentionModel from '../Introduce/IntentionModel.vue';
 export default {
   name: 'PlatformList',
+  components: { IntentionModel },
   data() {
     return {
       list: [],
       pageSize: 12,
       total: 0,
+      typeData: {
+        type: 2,
+        Id: '',
+      },
     };
   },
   computed: mapState('home', ['achList', 'achIpt', 'achCurrent']),
@@ -82,6 +89,12 @@ export default {
       this.setAchId(id);
       this.$router.push('/NewPlatform/AchDet');
     },
+    getId(Id) {
+      return (this.typeData = {
+        type: 2,
+        Id,
+      });
+    },
   },
 };
 </script>
diff --git a/src/components/PlatformList/PlatformList.vue b/src/components/PlatformList/PlatformList.vue
index d491269..78de792 100644
--- a/src/components/PlatformList/PlatformList.vue
+++ b/src/components/PlatformList/PlatformList.vue
@@ -2,7 +2,8 @@
   <div>
     <div class="inner d-flex flex-wrap">
       <div :class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :key="index" class="item-box mb-6" v-for="(item, index) in list">
-        <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+        <img v-if="item.picUrl" :src="item.picUrl" style="height: 220px; width: 100%" />
+        <img v-else :src="item.visitLocation" style="height: 220px; width: 100%" />
         <p class="font-24 my-4 title">{{ item.name }}</p>
         <p @click="jump(item.id)" class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多→</p>
       </div>
diff --git a/src/config/api.js b/src/config/api.js
index 9e7a68c..983beda 100644
--- a/src/config/api.js
+++ b/src/config/api.js
@@ -77,6 +77,12 @@ export const selResMes = params => axios.post(`${achInstr}/selResMes`, params);
 
 // 服务列表查询
 export const selService = params => axios.post(`${greenvalley}/serviceProject/selService`, params);
+// 服务详情查询
+export const selContent = params => axios.post(`${greenvalley}/serviceProject/selContent`, params);
 
 // 查询用户购物车
 export const SearchCar = params => axios.post(`${service}/SearchCar`, params);
+// 服务/设备/成果直接申请（意向填报）
+export const serviceApply = params => axios.post(`${service}/serviceApply`, params);
+// 加入购物车
+export const addCar = params => axios.post(`${service}/addCar`, params);
diff --git a/src/router/index.js b/src/router/index.js
index 0a79331..a875805 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -162,7 +162,7 @@ const routes = [
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Transfer.vue'),
       },
       {
-        // 资源开发利用平台
+        // 知识培训服务平台
         path: '/NewPlatform/Develop',
         name: 'Develop',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/NewPlatform/Children/Develop.vue'),
@@ -255,23 +255,23 @@ const routes = [
     ],
   },
   {
-    // 创新挑战
+    // 产业平台
     path: '/Industry/Union',
     name: 'Industry',
     component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/Industry/Industry.vue'),
     children: [
       {
-        path: '/Challenge/Union',
+        path: '/Industry/Union',
         name: 'Union',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/Industry/Children/Union.vue'),
       },
       {
-        path: '/Challenge/Serve',
+        path: '/Industry/Serve',
         name: 'Serve',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/Industry/Children/Serve.vue'),
       },
       {
-        path: '/Challenge/Enterprise',
+        path: '/Industry/Enterprise',
         name: 'Enterprise',
         component: () => import(/* webpackChunkName: "cooperative-enterprise" */ 'views/Industry/Children/Enterprise.vue'),
       },
diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue
index 1cbb2de..f03d088 100644
--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@@ -90,7 +90,7 @@ export default {
         },
         {
           id: '08',
-          firstName: '资源开发利用平台',
+          firstName: '知识培训服务平台',
           secondName: '',
         },
       ],
diff --git a/src/views/IncubationPlatform/Children/components/SenNav.vue b/src/views/IncubationPlatform/Children/components/SenNav.vue
index 9ce663c..4f45602 100644
--- a/src/views/IncubationPlatform/Children/components/SenNav.vue
+++ b/src/views/IncubationPlatform/Children/components/SenNav.vue
@@ -23,7 +23,7 @@ export default {
           url: '/NewPlatform/Transfer',
         },
         {
-          title: '资源开发利用平台',
+          title: '知识培训服务平台',
           url: '/NewPlatform/Develop',
         },
       ],
diff --git a/src/views/Industry/Children/Union.vue b/src/views/Industry/Children/Union.vue
index 0832854..2902539 100644
--- a/src/views/Industry/Children/Union.vue
+++ b/src/views/Industry/Children/Union.vue
@@ -28,7 +28,8 @@
         念，以“赋能健康中国，筑梦绿色未来”为愿景，以“构建创新创业生态，发展特色产业集群，打造全链条一体化开放
         式创新创业高地”为使命，大力推动建设“共融共生，共建 共创”价值共同体。
       </div>
-      <a-button class="center-btn" type="primary">申请加入</a-button>
+      <new-model class="center-btn" />
+      <!-- <a-button class="center-btn" type="primary">申请加入</a-button> -->
     </div>
     <div class="center-box c-box" style="margin-bottom: 160px">
       <div class="center-title">
@@ -62,9 +63,10 @@
 <script>
 import HNav from './components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
+import NewModel from '../../NewPlatform/components/NewModel.vue';
 export default {
   name: 'Union',
-  components: { HNav, BreadCrumb },
+  components: { HNav, BreadCrumb, NewModel },
   data() {
     return {
       title: '产业创新联盟',
diff --git a/src/views/Industry/Children/components/HNav.vue b/src/views/Industry/Children/components/HNav.vue
index 9be5486..cb9130b 100644
--- a/src/views/Industry/Children/components/HNav.vue
+++ b/src/views/Industry/Children/components/HNav.vue
@@ -16,24 +16,24 @@ export default {
       list: [
         {
           title: '产业创新联盟',
-          url: '/Challenge/Union',
+          url: '/Industry/Union',
         },
         {
           title: '产业服务',
-          url: '/Challenge/Serve',
+          url: '/Industry/Serve',
         },
         {
           title: '衍生企业',
-          url: '/Challenge/Enterprise',
+          url: '/Industry/Enterprise',
         },
       ],
     };
   },
   created() {
     console.log();
-    if (this.$route.fullPath === '/Challenge/Serve') {
+    if (this.$route.fullPath === '/Industry/Serve') {
       this.activeNum = 1;
-    } else if (this.$route.fullPath === '/Challenge/Enterprise') {
+    } else if (this.$route.fullPath === '/Industry/Enterprise') {
       this.activeNum = 2;
     } else {
       this.activeNum = 0;
diff --git a/src/views/Knowledge/Knowledge.vue b/src/views/Knowledge/Knowledge.vue
index 06f4878..7269844 100644
--- a/src/views/Knowledge/Knowledge.vue
+++ b/src/views/Knowledge/Knowledge.vue
@@ -14,7 +14,7 @@ export default {
   components: { BreadCrumb },
   data() {
     return {
-      str: '这是资源开发利用平台',
+      str: '知识培训服务平台',
       title: '知识平台',
       typeOfPlatform: '知识平台',
       arr: [{ name: '知识平台', url: '/Knowledge' }],
diff --git a/src/views/NewPlatform/Children/AchDet.vue b/src/views/NewPlatform/Children/AchDet.vue
index 4c8b775..e5c5cc3 100644
--- a/src/views/NewPlatform/Children/AchDet.vue
+++ b/src/views/NewPlatform/Children/AchDet.vue
@@ -28,10 +28,12 @@
             <p>{{ obj.stage }}</p>
           </div>
         </div>
-        <p class="equ-btn">
-          <a-button style="margin-right: 20px">转化意向</a-button>
-          <a-button type="primary">加入购物车</a-button>
-        </p>
+        <div class="equ-btn">
+          <!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
+          <intention-model :type-data="typeData" style="margin-right: 20px; float: left" />
+          <!-- <a-button type="primary">加入购物车</a-button> -->
+          <add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
+        </div>
       </div>
     </div>
     <div class="content-box">
@@ -43,13 +45,23 @@
 <script>
 import { mapState } from 'vuex';
 import { selResMes } from 'config/api';
+import IntentionModel from 'components/Introduce/IntentionModel.vue';
+import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'AchDet',
+  components: { IntentionModel, AddShopping },
   data() {
-    return { obj: {} };
+    return {
+      obj: {},
+      typeData: {
+        type: 2,
+        Id: '',
+      },
+    };
   },
   computed: mapState('home', ['achId']),
   created() {
+    this.typeData.Id = this.achId;
     this.getData();
   },
   methods: {
diff --git a/src/views/NewPlatform/Children/Core.vue b/src/views/NewPlatform/Children/Core.vue
index 2519a06..7d71e8a 100644
--- a/src/views/NewPlatform/Children/Core.vue
+++ b/src/views/NewPlatform/Children/Core.vue
@@ -53,7 +53,7 @@
         申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍
         申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍申请加入文字介绍
         <div>
-          <a-button type="primary">申请加入</a-button>
+          <new-model />
         </div>
       </div>
     </div>
@@ -65,9 +65,10 @@ import '@/common/platform.styl';
 import HNav from './../components/HNav.vue';
 import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
 import DeEnt from './components/DeEnt.vue';
+import NewModel from './../components/NewModel.vue';
 export default {
   name: 'Core',
-  components: { HNav, BreadCrumb, DeEnt },
+  components: { HNav, BreadCrumb, DeEnt, NewModel },
   data() {
     return {
       str: '这是中心界面',
diff --git a/src/views/NewPlatform/Children/Develop.vue b/src/views/NewPlatform/Children/Develop.vue
index 0085395..e516685 100644
--- a/src/views/NewPlatform/Children/Develop.vue
+++ b/src/views/NewPlatform/Children/Develop.vue
@@ -16,13 +16,13 @@ export default {
   components: { SenNav, BreadCrumb },
   data() {
     return {
-      str: '这是资源开发利用平台',
-      title: '资源开发利用平台',
+      str: '这是知识培训服务平台',
+      title: '知识培训服务平台',
       typeOfPlatform: '创新平台',
       arr: [
         { name: '创新平台', url: '/NewPlatform/NewCore' },
         { name: '创新资源平台', url: '/NewPlatform/News' },
-        { name: '资源开发利用平台', url: '' },
+        { name: '知识培训服务平台', url: '' },
       ],
       list: [],
     };
diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue
index 2f746ef..1469f91 100644
--- a/src/views/NewPlatform/Children/Platform.vue
+++ b/src/views/NewPlatform/Children/Platform.vue
@@ -60,7 +60,7 @@ export default {
           url: '/NewPlatform/Transfer',
         },
         {
-          title: '资源开发利用平台',
+          title: '知识培训服务平台',
           content:
             '山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业，聚焦“创新”、聚力“孵化”、聚合“产业”，' +
             '致力建设集创新链、孵化链和产业链为一体，产学研协同、多学科交叉、大中小企业...',
diff --git a/src/views/NewPlatform/Children/ServiceDet.vue b/src/views/NewPlatform/Children/ServiceDet.vue
index 9183a8b..7813757 100644
--- a/src/views/NewPlatform/Children/ServiceDet.vue
+++ b/src/views/NewPlatform/Children/ServiceDet.vue
@@ -1,23 +1,61 @@
 <template>
   <div>
+    <rotation />
+    <div class="posi-name">
+      <p class="service-name">{{ obj.name }}</p>
+      <p class="service-eng">SERVICE</p>
+    </div>
     <div class="inner service-box">
-      <div style="margin-bottom: 40px">简介</div>
+      <div style="margin-bottom: 40px" v-dompurify-html="obj.content"></div>
       <div>
-        <a-button>直接申请</a-button>
-        <a-button type="primary">加入购物车</a-button>
+        <!-- <a-button>直接申请</a-button> -->
+        <intention-model style="float: left; margin-right: 20px" :type-data="typeData" />
+        <!-- <a-button type="primary">加入购物车</a-button> -->
+        <add-shopping :type-data="typeData" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { selContent } from 'config/api';
+import IntentionModel from 'components/Introduce/IntentionModel.vue';
+import Rotation from 'components/Rotation/Rotation.vue';
+import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'ServiceDet',
+  components: { IntentionModel, Rotation, AddShopping },
   data() {
-    return {};
+    return {
+      obj: {
+        name: '',
+        id: '',
+        content: '',
+      },
+      typeData: {
+        type: 0,
+        Id: '',
+      },
+    };
   },
   created() {
-    console.log(this.$route.params.id);
+    this.typeData.Id = this.$route.params.id;
+    this.getData(this.$route.params.id);
+  },
+  methods: {
+    async getData(id) {
+      try {
+        const params = { param: { id } };
+        const res = await selContent(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          console.log(data);
+          this.obj = data;
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    },
   },
 };
 </script>
@@ -29,4 +67,21 @@ export default {
   padding: 20px;
   background: #fff;
 }
+
+.posi-name {
+  position: absolute;
+  left: 20%;
+  top: 300px;
+  color: #fff;
+  text-align: center;
+}
+
+.service-name {
+  font-size: 40px;
+  margin-bottom: 0 !important;
+}
+
+.service-eng {
+  font-size: 16px;
+}
 </style>
diff --git a/src/views/NewPlatform/Children/ShareChild/InsDet.vue b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
index 2f2fe08..cab8d12 100644
--- a/src/views/NewPlatform/Children/ShareChild/InsDet.vue
+++ b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
@@ -29,8 +29,10 @@
           </div>
         </div>
         <p class="equ-btn">
-          <a-button style="margin-right: 20px">转化意向</a-button>
-          <a-button type="primary">加入购物车</a-button>
+          <intention-model :type-data="typeData" style="margin-right: 20px; float: left" />
+          <!-- <a-button style="margin-right: 20px">转化意向</a-button> -->
+          <!-- <a-button type="primary">加入购物车</a-button> -->
+          <add-shopping :type-data="typeData" style="margin-right: 20px; float: right" />
         </p>
       </div>
     </div>
@@ -42,16 +44,24 @@
 
 <script>
 import { selInstrumentMes } from 'config/api';
+import IntentionModel from 'components/Introduce/IntentionModel.vue';
+import AddShopping from 'components/Introduce/AddShopping.vue';
 export default {
   name: 'InsDet',
+  components: { IntentionModel, AddShopping },
   data() {
     return {
       obj: {},
+      typeData: {
+        type: 1,
+        Id: '',
+      },
       id: 0,
     };
   },
   created() {
     this.id = this.$route.params.id;
+    this.typeData.Id = this.$route.params.id;
     this.getData();
   },
   methods: {
diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue
index 0fc8e05..f83f15e 100644
--- a/src/views/NewPlatform/Children/ShareChild/Institute.vue
+++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue
@@ -9,7 +9,7 @@
       <p class="font-bold-24 item-title">设备列表</p>
       <div class="d-flex flex-wrap">
         <div v-for="(item, index) in list" :key="index" class="item-box" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''">
-          <img :src="item.imgUrl" style="height: 220px; width: 100%; border: 1px solid #ccc" />
+          <img :src="item.visitLocation" style="height: 220px; width: 100%" />
           <p class="font-24 my-4">{{ item.name }}</p>
           <p class="font-16 baseColor item-more" @click="jump(item.id)">了解更多→</p>
         </div>
diff --git a/src/views/NewPlatform/Children/components/SenNav.vue b/src/views/NewPlatform/Children/components/SenNav.vue
index 9ce663c..4f45602 100644
--- a/src/views/NewPlatform/Children/components/SenNav.vue
+++ b/src/views/NewPlatform/Children/components/SenNav.vue
@@ -23,7 +23,7 @@ export default {
           url: '/NewPlatform/Transfer',
         },
         {
-          title: '资源开发利用平台',
+          title: '知识培训服务平台',
           url: '/NewPlatform/Develop',
         },
       ],
diff --git a/src/views/NewPlatform/components/NewModel.vue b/src/views/NewPlatform/components/NewModel.vue
new file mode 100644
index 0000000..513b92f
--- /dev/null
+++ b/src/views/NewPlatform/components/NewModel.vue
@@ -0,0 +1,204 @@
+<template>
+  <div>
+    <a-button type="primary" @click="showModal">
+      {{ str }}
+    </a-button>
+    <a-modal width="50%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
+      <a-form :form="form">
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称">
+          <a-input v-model.trim="platform.companyName" placeholder="请输入公司名称..." />
+        </a-form-item>
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系人" required>
+          <a-input v-model.trim="platform.manName" placeholder="请输入联系人..." />
+        </a-form-item>
+        <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="联系电话" required>
+          <a-input @change="changePhone" type="tel" v-decorator="['tel', { rules: phoneRules }]" placeholder="请输入联系电话.." />
+        </a-form-item>
+        <a-form-item :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 :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 :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 class="code_img ml-2" disabled 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 :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="项目信息简述" required>
+          <a-textarea v-model.trim="platform.describe" style="height: 120px" placeholder="请输入项目信息简述..." />
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions } from 'vuex';
+import { JoinPlatform } from 'config/api';
+const formItemLayout = {
+  labelCol: { span: 5 },
+  wrapperCol: { span: 18 },
+};
+const formTailLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 18, offset: 6 },
+};
+export default {
+  name: 'NewModel',
+  data() {
+    return {
+      form: this.$form.createForm(this, { name: 'submit' }),
+      visible: false,
+      title: '协同创新中心加入申请',
+      str: '申请加入',
+      formItemLayout,
+      formTailLayout,
+      confirmLoading: false,
+      platform: {
+        companyName: '', // 公司名称
+        manName: '', // 联系人
+        tel: '', // 联系电话
+        describe: '', // 项目描述
+        code: '', // 验证码
+        isTel: false,
+      },
+      codeRules: [
+        { required: true, message: '请输入验证码' },
+        { min: 4, max: 4, message: '请输入4位短信验证码' },
+      ],
+      codeNum: '',
+      showInterval: false,
+      codeTimer: null,
+      interval: 120, // 验证码有效时间倒计时
+      phoneRules: [
+        { required: true, pattern: new RegExp(/^[1][3,4,5,6,7,8,9][0-9]{9}$/), whitespace: true, message: '请输入正确的手机号' },
+      ],
+    };
+  },
+  computed: mapState('user', ['picCode']),
+  created() {
+    this.sendPicCode();
+  },
+  methods: {
+    ...mapActions('user', ['sendCode', 'sendPicCode']),
+    // 显示表单输入框
+    showModal() {
+      this.visible = true;
+    },
+    // 取消显示
+    handleCancel(e) {
+      this.visible = false;
+    },
+    // 验证电话
+    changePhone(e) {
+      this.platform.tel = e.target.value;
+      this.platform.isTel = /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(this.platform.tel);
+    },
+    // 点击确定
+    handleOk() {
+      if (!this.platform.manName) {
+        this.$message.error('请输入联系人');
+      } else if (!this.platform.tel) {
+        this.$message.error('请输入联系电话');
+      } else if (!this.platform.code) {
+        this.$message.error('请输入验证码');
+      } else if (!this.platform.describe) {
+        this.$message.error('请输入项目信息简述');
+      } else {
+        if (this.platform.isTel) {
+          this.subMitAdd();
+        } else {
+          this.$message.error('请输入正确的联系电话');
+        }
+      }
+    },
+    // 加入接口
+    async subMitAdd() {
+      this.confirmLoading = true;
+      try {
+        const params = {
+          param: {
+            code: this.platform.code,
+            companyName: this.platform.companyName,
+            contactName: this.platform.manName,
+            contactPhone: this.platform.tel,
+            description: this.platform.describe,
+            type: 0,
+          },
+        };
+        const res = await JoinPlatform(params);
+        const { code, msg, data } = res.data;
+        if (code === 200) {
+          this.$message.success('申请成功');
+          this.visible = false;
+          this.confirmLoading = false;
+          for (let key in this.platform) {
+            this.platform[key] = '';
+          }
+          this.platform.isTel = false;
+        } else {
+          throw msg;
+          this.confirmLoading = false;
+        }
+      } catch (error) {
+        this.$message.error(error);
+        this.confirmLoading = false;
+      }
+    },
+    // 获取验证码
+    async getCode() {
+      console.log(111);
+      try {
+        const params = {
+          phone: this.platform.tel,
+          verificationCodeId: this.picCode.verificationCodeId,
+          verificationCodeValue: this.codeNum,
+        };
+        await this.sendCode(params);
+        this.getCodeInterval();
+      } catch (error) {
+        // throw new Error(`SignIn.vue method getCode: ${error}`);
+        console.log(error);
+      }
+    },
+
+    // 验证码倒计时
+    getCodeInterval() {
+      this.showInterval = true;
+      this.codeTimer = setInterval(() => {
+        if (this.interval === 0) {
+          clearInterval(this.codeTimer);
+          this.codeTimer = null;
+          this.showInterval = false;
+          this.interval = 120;
+          return;
+        }
+        this.interval = this.interval - 1;
+      }, 1000);
+    },
+
+    // 刷新验证码
+    changePicCode() {
+      this.sendPicCode();
+    },
+  },
+};
+</script>
+
+<style lang="stylus" scoped>
+.must-color {
+  color: red;
+}
+
+.code_img {
+  height: 32px;
+  width: 120px;
+}
+</style>