guhongwei 5 éve
szülő
commit
2764e40ecd

+ 3 - 3
public/static/home.html

@@ -1,6 +1,6 @@
 <html>
 	<head>
-		<title>欢迎来到吉林省计算中心科技服务平台</title>
+		<title>欢迎来到吉林省计算中心科技服务平台</title>
 		<meta charset="utf-8" />
 		<meta name="renderer" content="webkit">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -18,13 +18,13 @@
 					<div class="w_1200">
 						<div class="homeTop">
 							<div class="homeTopInfo">
-								<span>欢迎来到吉林省计算中心科技服务平台</span>
+								<span>欢迎来到吉林省计算中心科技服务平台</span>
 								<button type="button">登录</button>
 								<button type="button">注册</button>
 							</div>
 							<div class="homeTopLogo">
 								<img src="images/logo.png">
-								<span>吉林省计算中心科技服务平台</span>
+								<span>吉林省计算中心科技服务平台</span>
 							</div>
 						</div>
 						<div class="homeMain">

+ 4 - 4
public/static/liveIndex.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>吉林省计算中心</title>
+    <title>吉林省计算中心</title>
 	<link rel="stylesheet" type="text/css" href="css/style.css"/>
 	<link rel="stylesheet" type="text/css" href="css/mubu2017.css"/>
 	<link rel="stylesheet" type="text/css" href="css/iconfont.css"/>
@@ -16,9 +16,9 @@
 				<div class="infoTwo">
 					<div class="infoThree">
 						<img src="./images/logo.png" >
-						<p class="title">吉林省计算中心科技直播大厅</p>
-						<p>指导单位:吉林省计算中心</p>
-						<p>主办方:吉林省计算中心</p>
+						<p class="title">吉林省计算中心科技直播大厅</p>
+						<p>指导单位:吉林省计算中心</p>
+						<p>主办方:吉林省计算中心</p>
 						<p>支持单位:长春市福瑞科技有限公司</p>
             <a href="../live/hall" target="_blink">进入活动现场<i class="iconfont icon-bofang"></i></a>
             <!-- ../live/hall -->

+ 1 - 1
src/router/index.js

@@ -92,7 +92,7 @@ const live = [
   },
   {
     path: '/live/hall/dock/dockDetail',
-    meta: { title: '对接信息详情', subSite: true },
+    meta: { title: '项目信息详情', subSite: true },
     name: 'dock_Detail',
     component: () => import('../views/hall/dock/dockDetail.vue'),
   },

+ 192 - 6
src/views/hall/dock/dockDetail.vue

@@ -1,19 +1,205 @@
 <template>
   <div id="dockDetail">
-    <p>dockDetail</p>
+    <el-row>
+      <el-col :span="24" class="style">
+        <el-image :src="beijingPic"></el-image>
+        <el-col :span="24" class="info">
+          <div class="w_1200">
+            <el-col :span="24" class="top">
+              <p>吉林省计算中心对接直播大厅</p>
+              <p>主办方:吉林省计算中心</p>
+            </el-col>
+            <el-col :span="24" class="main">
+              <el-col :span="6" class="btn">
+                <el-col :span="24">
+                  <el-button type="primary" icon="el-icon-tickets" @click="btnInfo">项目信息</el-button>
+                </el-col>
+                <el-col :span="24">
+                  <el-button type="danger" icon="el-icon-phone-outline" @click="btnPhone">线下对接</el-button>
+                </el-col>
+              </el-col>
+              <el-col :span="18" class="mainInfo">
+                <el-col :span="24" v-if="display === '1'">
+                  <p class="name textOver">{{ productInfo.name }}</p>
+                  <div class="brief">
+                    <p>
+                      <span>应用领域:{{ productInfo.field }}</span>
+                      <span>服务范围:{{ productInfo.scope }}</span>
+                    </p>
+                    <p>
+                      <span>产品类型:{{ productInfo.product_type_name }}</span>
+                      <span>研发阶段:{{ productInfo.phase }}</span>
+                    </p>
+                    <p>
+                      <span>交易方式:{{ productInfo.business }}</span>
+                      <span>交易价格:{{ productInfo.price }}/{{ productInfo.priceunit }}</span>
+                    </p>
+                  </div>
+                  <p class="intro">
+                    <span><i class="el-icon-date"></i>项目简介</span>
+                    <span>{{ productInfo.introduction }}</span>
+                  </p>
+                </el-col>
+                <el-col :span="24" v-if="display === '2'">
+                  <p>{{ productInfo.contact_user }}</p>
+                  <p>{{ productInfo.contact_tel }}</p>
+                </el-col>
+              </el-col>
+            </el-col>
+          </div>
+        </el-col>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: mapProduct } = createNamespacedHelpers('marketproduct');
 export default {
   name: 'dockDetail',
   props: {},
   components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {},
+  data: () => ({
+    beijingPic: require('@a/live/top_3.png'),
+    display: '1',
+    productInfo: {},
+  }),
+  created() {
+    if (this.$route.query.id) {
+      this.searchInfo();
+    }
+  },
+  methods: {
+    ...mapProduct(['fetch']),
+    async searchInfo() {
+      let res = await this.fetch(this.$route.query.id);
+      if (res.errcode === 0) {
+        this.$set(this, `productInfo`, res.data);
+      }
+    },
+    // 项目信息
+    btnInfo() {
+      this.display = '1';
+    },
+    // 线下对接
+    btnPhone() {
+      this.display = '2';
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.w_1200 {
+  width: 1200px;
+  margin: 0 auto;
+}
+p {
+  padding: 0;
+  margin: 0;
+}
+.style {
+  height: 100vh;
+}
+.style .info {
+  position: relative;
+  top: -450px;
+}
+.style .top {
+  position: relative;
+  top: 0;
+  width: 100%;
+  text-align: center;
+  z-index: 999;
+  height: 230px;
+  margin: 0 0 20px 0;
+}
+.style .top p:first-child {
+  font-size: 50px;
+  color: #fff;
+}
+.style .top p:last-child {
+  font-size: 30px;
+  color: #fff;
+  position: absolute;
+  width: 100%;
+  top: 170px;
+}
+.style .main {
+  height: 670px;
+  border: 1px solid red;
+  background: #fff;
+  overflow: hidden;
+  padding: 30px 20px;
+}
+.main .btn div {
+  padding: 30px 0 0px 0;
+}
+/deep/.main .btn .el-button {
+  float: left;
+  margin: 0 40px;
+  width: 70%;
+}
+.main .mainInfo {
+  border: 1px solid red;
+  height: 610px;
+}
+.mainInfo .name {
+  font-size: 25px;
+  text-align: center;
+  height: 90px;
+  line-height: 90px;
+  border-bottom: 2px solid red;
+  margin: 0 60px;
+}
+.mainInfo .brief {
+  float: left;
+  padding: 0 88px 15px 88px;
+  color: red;
+  margin: 15px 20px 0 19px;
+  width: 75%;
+  border-bottom: 1px dashed red;
+}
+.mainInfo .brief p {
+  float: left;
+  width: 100%;
+  padding: 0 0 15px 0;
+}
+.mainInfo .brief p span:first-child {
+  float: left;
+  width: 50%;
+}
+.mainInfo .intro {
+  float: left;
+  padding: 20px;
+  width: 95%;
+}
+.mainInfo .intro span:first-child {
+  display: inline-block;
+  width: 100%;
+  font-size: 20px;
+  color: red;
+}
+.mainInfo .intro span:last-child {
+  display: inline-block;
+  line-height: 25px;
+  color: #666;
+  text-indent: 2rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 13;
+  word-break: break-all;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+}
+</style>

+ 11 - 61
src/views/hall/hall.vue

@@ -5,11 +5,11 @@
         <div class="livetop">
           <div class="w_1200">
             <div class="title">
-              吉林省计算中心对接直播大厅
+              吉林省计算中心对接直播大厅
             </div>
             <div class="zhuban">
               <span>主办方:</span>
-              <span>吉林省计算中心直播大厅</span>
+              <span>吉林省计算中心直播大厅</span>
             </div>
             <div class="num">
               <p>
@@ -90,7 +90,10 @@
                       <ul class="technology">
                         <li class="technologyList" v-for="(item, index) in technologyList" :key="index">
                           <el-col :span="14" class="left">
-                            <p>{{ item.name }}</p>
+                            <p>
+                              <span class="textOver" style="display:inline-block;width:85%;">{{ item.name }}</span>
+                              <el-button type="primary" size="mini" @click="technologyBtn(item.id)" style="position: relative;top: -5px;">对接</el-button>
+                            </p>
                             <p>
                               <span><i class="el-icon-user-solid" style="color:#FFA500;margin:0 5px 0 0;"></i>{{ item.contact_user }}</span>
                               <span><i class="el-icon-phone" style="color:#FFA500;margin:0 5px 0 0;"></i>{{ item.contact_tel }}</span>
@@ -249,64 +252,7 @@ export default {
     // 找服务
     serviceList: [],
     // 找专家
-    expertList: [
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-      {
-        logo: require('@/assets/live/测试图片.jpg'),
-        name: '万事通',
-        address: '吉林省长春市',
-        csly: '计算机,电脑,啥都有',
-        scnl: '全能,啥都会,没有他不会的',
-      },
-    ],
+    expertList: [],
     // 嘉宾
     jiabinlist: [
       {
@@ -410,6 +356,10 @@ export default {
     hallDetail() {
       this.$router.push({ path: '/live/hallDetail' });
     },
+    // 找技术详情
+    technologyBtn(id) {
+      this.$router.push({ path: '/live/hall/dock/dockDetail', query: { id: id } });
+    },
   },
   filters: {
     getDate(meta) {

+ 2 - 2
src/views/hall/hallDetail.vue

@@ -5,11 +5,11 @@
         <div class="livetop">
           <div class="w_1200">
             <div class="title">
-              吉林省计算中心对接直播中心
+              吉林省计算中心对接直播中心
             </div>
             <div class="zhuban">
               <span>主办方:</span>
-              <span>吉林省计算中心直播大厅</span>
+              <span>吉林省计算中心直播大厅</span>
             </div>
             <div class="num">
               <p>

+ 2 - 2
src/views/hall/liveList.vue

@@ -5,11 +5,11 @@
         <div class="livetop">
           <div class="w_1200">
             <div class="title">
-              吉林省计算中心对接直播中心
+              吉林省计算中心对接直播中心
             </div>
             <div class="zhuban">
               <span>主办方:</span>
-              <span>吉林省计算中心直播大厅</span>
+              <span>吉林省计算中心直播大厅</span>
             </div>
             <div class="num">
               <p>