Merge branch 'master' of https://git.yidian-inc.com:8021/bp/op-web-service...

Merge branch 'master' of https://git.yidian-inc.com:8021/bp/op-web-service into lwh/head-distribution

src/pages/Activity/Manage/index.vue

@@ -30,12 +30,12 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="small" @click="getActivityList">搜索</el-button>
-            <el-form-item style="margin-left: 50px">
+            <el-button type="primary" @click="getActivityList">搜索</el-button>
+            <el-form-item style="margin-left: 20px">
               <el-button @click="reset()">重置</el-button>
               <!-- <el-button type="primary" @click="getActivityList">搜索</el-button> -->
             </el-form-item>
-            <el-button type="primary" size="small" @click="goReleaseProduc"
+            <el-button type="primary" @click="goReleaseProduc"
               >发布拼单</el-button
             >
           </el-form-item>
@@ -354,9 +354,9 @@ export default {
     height: 100%;
   }
   .formitem-wrapper {
-    height: 100px;
-    display: flex;
-    align-items: flex-end;
+    // height: 100px;
+    // display: flex;
+    // align-items: flex-end;
   }
   .table-wrapper {
     flex: 1;