Merge branch 'HitSheep' of http://39.105.160.25:10880/post-project-ui/post-ui into HitSheep

package.json

@@ -48,6 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "mockjs": "^1.1.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

src/views/message/messageList.vue

@@ -1,21 +1,29 @@
 <template>
   <div class="right" :style="{ height: height, width: width }">
     <div class="up">
-      <div class="up-title">🔍筛选搜索</div>
-      <div class="up-input-title">
-        消息标题:<el-input v-model="input" class="up-input" placeholder="请输入内容"></el-input>
-      </div>
-      
-      <div class="up-input-title-right">
-        <span class="demonstration">发布时间:</span>
-        <el-date-picker v-model="value2" type="datetimerange" class="up-input-right" :picker-options="pickerOptions" range-separator="至"
-          start-placeholder="开始日期" end-placeholder="结束日期" align="right">
-        </el-date-picker>
+      <div class="left-up">
+        <div class="up-title">🔍筛选搜索</div>
+        <div class="up-input-title">
+          消息标题:<el-input v-model="input" class="up-input" placeholder="请输入内容"></el-input>
+
+        </div>
+
+        <div class="up-input-title-right">
+          <span class="demonstration">发布时间:</span>
+          <el-date-picker v-model="value2" type="datetimerange" class="up-input-right" :picker-options="pickerOptions"
+            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+          </el-date-picker>
+        </div>
       </div>
-      <div class="anniu">
-        <el-button plain>重置</el-button>
-        <el-button type="primary" plain>查询列表</el-button>
+      <div class="right-up">
+        <div class="anniu">
+          <el-button plain>重置</el-button>
+          <el-button type="primary" plain>查询列表</el-button>
+        </div>
       </div>
+    </div>
+
+
 
 
       <div class="down">
@@ -68,7 +76,6 @@
      
     </div>
 
-</div>
 
 
 </template>
@@ -107,13 +114,15 @@ export default {
   margin-left: 40px;
   float: left;
 }
-.up-input-right{
+
+.up-input-right {
   width: 500px;
 }
+
 .up-input-title-right {
   margin-left: 450px;
   margin-top: 15px;
-  
+
 }
 
 
@@ -150,7 +159,6 @@ export default {
 .bottom-page{
   float:right;
 }
-
 /**
 自适应
 */
@@ -161,5 +169,4 @@ export default {
   height: 100%;
   /* background-color: #9dc3e6; */
 }
-
 </style>