Merge branch 'master' of http://git.cc-lotus.info/Free-cysci/cysci-website

src/views/dynamic/index.vue

@@ -1,7 +1,18 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="main"> 数据动态 </el-col>
+      <el-col :span="24" class="main">
+        <div class="w_1200">
+          <el-col :span="24" class="common one">
+            <el-col :span="12" class="left"> 左侧 </el-col>
+            <el-col :span="12" class="left"> 右侧 </el-col>
+          </el-col>
+          <el-col :span="24" class="common two">
+            <el-col :span="12" class="left"> 左侧 </el-col>
+            <el-col :span="12" class="left"> 右侧 </el-col>
+          </el-col>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -33,4 +44,24 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main {
+  min-height: 500px;
+  margin: 10px 0 0 0;
+  .common {
+    margin: 0 0 10px 0;
+    .left {
+      width: 49.5%;
+      height: 500px;
+      overflow: hidden;
+      box-shadow: 0 0 4px #409eff;
+      border-radius: 10px;
+      margin: 0 10px 10px 0;
+      padding: 10px;
+    }
+    .left:nth-child(2n) {
+      margin: 0 0 10px 0;
+    }
+  }
+}
+</style>