Merge branch 'feature/去掉footer'

# Conflicts:
#	src/views/card/form.vue
#	src/views/message/addTemp.vue
#	src/views/message/form.vue

src/components/layout/index.vue

@@ -22,7 +22,7 @@
             <router-view></router-view>
           </div>
         </div>
-        <vue-gic-footer></vue-gic-footer>
+        <!-- <vue-gic-footer></vue-gic-footer> -->
       </div>
     </div>
     <description :drawer.sync="drawer" :direction="direction" :contentTitle="contentTitle" />

src/views/card/form.vue

@@ -402,6 +402,9 @@ export default cardForm;
   margin-left: 20px;
   color: #f5222d;
 }
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
 .f-alert {
   width: 900px !important;
   /deep/ .el-alert__content {

src/views/card/group-send.vue

 <template>
-  <el-form :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
+  <el-form class="content" :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
     <div class="dm-form__wrap">
       <h3 class="dm-title__label">基础设置</h3>
       <el-form-item label="活动名称" prop="putOnName">
@@ -721,6 +721,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 .ecm-msg__edit {
   display: inline-block;
   vertical-align: top;

src/views/ecm/form.vue

 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="110px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
+    <el-form class="content" ref="form" :model="form" label-width="110px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
       <!-- 计划内容设置 -->
       <section class="dm-form__wrap">
         <h3 class="dm-title__label">计划内容设置</h3>
@@ -565,6 +565,9 @@ import ecmForm from './form.js';
 export default ecmForm;
 </script>
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 .no_label_form_label {
   margin-left: -100px;
   label {

src/views/evaluation/problem.vue

@@ -116,6 +116,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
 .img-box {
   max-width: 100%;
   img {

src/views/ewash/form.vue

@@ -194,6 +194,9 @@ export default cardForm;
 </script>
 
 <style lang="scss" scoped>
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
 .tips {
   position: relative;
   top: 3px;

src/views/ewash/group-send.vue

 <template>
-  <el-form :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
+  <el-form class="content" :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
     <div class="dm-form__wrap">
       <h3 class="dm-title__label">基础设置</h3>
       <el-form-item label="活动名称" prop="putOnName">
@@ -683,6 +683,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 .ecm-msg__edit {
   display: inline-block;
   vertical-align: top;

src/views/game/dzp/form.vue

 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="100px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
+    <el-form class="content" ref="form" :model="form" label-width="100px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
       <section class="dm-form__wrap">
         <h3 class="dm-title__label">游戏内容</h3>
         <el-form-item label="游戏名称" prop="gameName">
@@ -794,6 +794,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 .avatar-uploader /deep/ {
   font-size: 0;
   line-height: 0;

src/views/game/ggk/form.vue

 <template>
   <div>
-    <el-form ref="form" :model="form" label-width="100px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
+    <el-form class="content" ref="form" :model="form" label-width="100px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
       <section class="dm-form__wrap">
         <h3 class="dm-title__label">游戏内容</h3>
         <el-form-item label="游戏名称" class="width50" prop="gameName">
@@ -684,6 +684,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 .skin-box {
   display: block;
   width: 220px;

src/views/game/klfl/form.vue

 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="110px" class="ptyx-add" v-loading="loading" loading-text="加载中">
+  <el-form ref="form" :model="form" :rules="rules" label-width="110px" class="ptyx-add content" v-loading="loading" loading-text="加载中">
     <section class="dm-form__wrap">
       <h3 class="dm-title__label">游戏内容</h3>
       <el-form-item label="游戏名称" prop="gameName" class="width50">
@@ -891,6 +891,9 @@ export default {
 
 <style lang="scss" scoped>
 @import './form.scss';
+.content {
+  padding-bottom: 58px;
+}
 /deep/ .act-select {
   width: 400px !important;
 }

src/views/game/ptyx/form.vue

 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="ptyx-add" v-loading="loading" element-loading-text="拼命加载中">
+  <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="ptyx-add content" v-loading="loading" element-loading-text="拼命加载中">
     <section class="dm-form__wrap">
       <h3 class="dm-title__label">游戏内容</h3>
       <el-form-item label="游戏名称" prop="gameName" class="width50">
@@ -688,6 +688,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 /deep/ .act-select {
   width: 400px !important;
 }

src/views/game/znm/form.vue

 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="100px" class="ptyx-add" v-loading="loading" loading-text="加载中">
+  <el-form ref="form" :model="form" :rules="rules" label-width="100px" class="ptyx-add content" v-loading="loading" loading-text="加载中">
     <section class="dm-form__wrap">
       <h3 class="dm-title__label">游戏内容</h3>
       <el-form-item label="游戏名称" prop="gameName" class="width50">
@@ -485,6 +485,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  padding-bottom: 58px;
+}
 /deep/ .act-select {
   width: 400px !important;
 }

src/views/message/addTemp.vue

@@ -456,6 +456,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
 .reduce-link-input {
   /deep/ .dm-input__counter {
     display: none;

src/views/msg/edit.vue

 <template>
-  <el-form v-loading="loading" label-width="100px">
+  <el-form class="content" v-loading="loading" label-width="100px">
     <section class="dm-form__wrap msg-edit__info">
       <h3 class="dm-title__label">基础信息</h3>
       <el-row :gutter="20">
@@ -526,6 +526,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.content {
+  margin-bottom: 80px;
+}
 .msg-edit {
   &__info {
     /deep/ .el-col {

src/views/popup/form.vue

@@ -748,6 +748,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
 .line {
   box-sizing: content-box;
   padding: 0 24px;

src/views/wechat/editor.vue

@@ -474,6 +474,7 @@ export default {
 <style lang="scss" scoped>
 .dm-wrap {
   display: flex;
+  margin-bottom: 80px !important;
 }
 .editor-wrap {
   width: 685px;

src/views/wechat/video/addEdit.vue

@@ -154,3 +154,8 @@ export default {
   }
 };
 </script>
+<style scoped>
+.dm-wrap {
+  margin-bottom: 80px !important;
+}
+</style>