Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/layout/enterprise/appointment.vue

@@ -2,7 +2,8 @@
   <div id="technical">
     <el-col :span="24" class="main">
       <el-col :span="24" class="left">
-        <el-col :span="24" class="downLeftTop">
+        <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> <span @click="add()">创建对接会</span></el-col>
+        <!-- <el-col :span="24" class="downLeftTop">
           <el-image :src="downLeftTopImage"></el-image>
           <span class="topText">
             <span>展会预约</span>
@@ -12,7 +13,7 @@
             >
             <span @click="add()">创建对接会</span>
           </span>
-        </el-col>
+        </el-col> -->
         <el-col :span="24" class="infoLeft">
           <el-table :data="resultTable" stripe style="width: 96%" border>
             <el-table-column prop="title" label="对接会标题"> </el-table-column>
@@ -122,6 +123,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
+.leftTop span:last-child {
+  float: right;
+  cursor: pointer;
+}
 .jishuImage {
   width: 100%;
   height: 100%;

src/layout/enterprise/context.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="recruitLists">
     <el-row>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的订购" name="first">
@@ -264,6 +265,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;

src/layout/enterprise/contextfabuxx.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="recruitLists">
     <el-row>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>我的发布</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的需求" name="first">
@@ -580,6 +581,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
@@ -606,7 +619,7 @@ p {
 }
 
 .fbListCenterTwo {
-  width: 48%;
+  width: 45%;
   float: left;
   margin-left: 10px;
   margin-right: 10px;
@@ -627,6 +640,7 @@ p {
   width: 22%;
   border-right: 1px solid #ccc;
   height: 100px;
+  padding-left: 20px;
 }
 .fbListCenterC p {
   padding: 5px 0;

src/layout/enterprise/jibencontext.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="rightcont">
     <el-col class="zhengce">
-      <el-col :span="24" class="topTitle"> <span>基本信息</span></el-col>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>基本信息</span> </el-col>
       <el-col :span="24" class="info">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="用户名：">
@@ -113,13 +113,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
 }
-.zhengce {
-  padding: 20px;
-}
 .zhengce .topTitle {
   font-size: 22px;
   color: #22529a;
@@ -128,7 +137,8 @@ p {
 
 .zhengce .info {
   float: left;
-  width: 100%;
+  width: 90%;
+  padding: 10px;
 }
 .zhengce .info p {
   float: left;
@@ -144,4 +154,7 @@ p {
   width: 100px;
   height: 100px;
 }
+/deep/.el-button {
+  margin: 10px auto;
+}
 </style>

src/layout/enterprise/parts/room.vue

@@ -51,6 +51,9 @@ export default {
   width: 95%;
   margin: 20px;
 }
+/deep/.el-table--border td {
+  cursor: pointer;
+}
 .leftTop {
   font-size: 18px;
   width: 96%;