合并

src/views/dynamic/index.vue

@@ -4,35 +4,23 @@
       <el-col :span="24" class="main">
         <div class="w_1200">
           <el-col :span="24" class="dataShow">
-            <el-col :span="24" class="top">
-              <span></span>
-            </el-col>
             <el-col :span="24" class="dataShowInfo">
               <el-col :span="8" class="left">
-                <el-col :span="1" class="leftTit">
-                  <p>数据展示</p>
-                  <p></p>
-                </el-col>
-                <el-col :span="23" class="leftInfo">
+                <el-col :span="24" class="leftInfo">
                   <userTwo></userTwo>
                 </el-col>
               </el-col>
               <el-col :span="8" class="center">
-                <maps></maps>
+                <el-col :span="24" class="centerInfo">
+                  <maps></maps>
+                </el-col>
               </el-col>
               <el-col :span="8" class="right">
-                <el-col :span="23" class="rightInfo">
+                <el-col :span="24" class="rightInfo">
                   <top-right></top-right>
                 </el-col>
-                <el-col :span="1" class="rightTit">
-                  <p></p>
-                  <p>数据展示</p>
-                </el-col>
               </el-col>
             </el-col>
-            <el-col :span="24" class="top down">
-              <span></span>
-            </el-col>
           </el-col>
           <el-col :span="24" class="dataImage">
             <el-image :src="centerImage"></el-image>
@@ -127,6 +115,28 @@ export default {
   width: 33%;
   height: 670px;
 }
+.dataShow .dataShowInfo .left .leftInfo {
+  width: 93%;
+  height: 670px;
+  background: #fff;
+  border: 1px transparent solid;
+  border-radius: 10px;
+  position: relative;
+  left: 5px;
+  top: 2px;
+}
+.dataShow .dataShowInfo .left .leftInfo:after {
+  position: absolute;
+  top: -3px;
+  bottom: -3px;
+  left: -3px;
+  right: -3px;
+  background: linear-gradient(135deg, #cdeeff, #0370af);
+  border-radius: 10px;
+  content: '';
+  z-index: -1;
+}
+
 .dataShow .dataShowInfo .left p:first-child {
   float: left;
   width: 100%;
@@ -150,12 +160,54 @@ export default {
   height: 670px;
   // border: 1px solid red;
 }
+.dataShow .dataShowInfo .center .centerInfo {
+  width: 93%;
+  height: 670px;
+  background: #fff;
+  border: 1px transparent solid;
+  border-radius: 10px;
+  position: relative;
+  left: 5px;
+  top: 2px;
+}
+.dataShow .dataShowInfo .center .centerInfo:after {
+  position: absolute;
+  top: -3px;
+  bottom: -3px;
+  left: -3px;
+  right: -3px;
+  background: linear-gradient(135deg, #cdeeff, #0370af);
+  border-radius: 10px;
+  content: '';
+  z-index: -1;
+}
 .dataShow .dataShowInfo .right {
   float: left;
   width: 34%;
   height: 670px;
   // border: 1px solid red;
 }
+.dataShow .dataShowInfo .right .rightInfo {
+  width: 93%;
+  height: 670px;
+  background: #fff;
+  border: 1px transparent solid;
+  border-radius: 10px;
+  position: relative;
+  left: 5px;
+  top: 2px;
+}
+.dataShow .dataShowInfo .right .rightInfo:after {
+  position: absolute;
+  top: -3px;
+  bottom: -3px;
+  left: -3px;
+  right: -3px;
+  background: linear-gradient(135deg, #cdeeff, #0370af);
+  border-radius: 10px;
+  content: '';
+  z-index: -1;
+}
 .dataShow .dataShowInfo .right p:first-child {
   float: left;
   width: 2px;

src/views/hallList/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div id="index">
     <el-col :span="24" class="main">
-      <el-col :span="24" class="info" style="padding:10px">
+      <el-col :span="24" class="info" style="padding:30px">
         <el-tabs>
           <el-tab-pane label="进行中的对接会" name="0">
             <list :list="listNow" :total="nowTotal" status="1" @query="searchList"></list>
           </el-tab-pane>
           <el-tab-pane label="近期对接会" name="1">
-            <list :list="listPre" :total="nowTotal" status="0" @query="searchList"></list>
+            <list :list="listPre" :total="preTotal" status="0" @query="searchList"></list>
           </el-tab-pane>
           <el-tab-pane label="过往对接会" name="2">
-            <list :list="listNow" :total="nowTotal" status="2" @query="searchList"></list>
+            <list :list="listNow" :total="pastTotal" status="2" @query="searchList"></list>
           </el-tab-pane>
         </el-tabs>
       </el-col>
@@ -63,6 +63,7 @@ export default {
       let res = await this.dockQuery({ is_allowed: 1, skip, limit, status, ...info });
       if (res.errcode === 0) {
         if (status == '0') {
+          console.log(res.total);
           this.$set(this, `preTotal`, res.total);
           this.$set(this, `listPre`, res.data);
         } else if (status == '1') {

src/views/hallList/parts/list.vue

@@ -84,9 +84,10 @@ export default {
 }
 .infoRightList {
   float: left;
-  width: 95%;
+  width: 100%;
   padding: 7px 0;
   margin: 0 0 0 5px;
+  border-bottom: 1px dashed #ccc;
 }
 .infoRightList:hover p span:first-child {
   -webkit-transform: translateY(-3px);
@@ -104,12 +105,11 @@ export default {
 }
 .infoRightList p span:first-child {
   display: inline-block;
-  width: 60%;
+  width: 89%;
   margin: 0 20px 0 10px;
 }
 .infoRightList p span:last-child {
   display: inline-block;
-  padding: 0 0 0 149px;
   text-align: center;
   font-size: 16px;
 }