Browse Source

Merge branch 'V4.3.3_XiaoWang' into V4.3.3

feature
mk 1 year ago
parent
commit
2b03ccdcc9
  1. 2
      src/views/modules/communityParty/comPromotion/index.vue
  2. 12
      src/views/modules/workSys/promotionTab/index.vue

2
src/views/modules/communityParty/comPromotion/index.vue

@ -387,6 +387,8 @@
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/list-main.scss";
.g-main {
width: 100%;
}

12
src/views/modules/workSys/promotionTab/index.vue

@ -3,8 +3,6 @@
<div class="m-search">
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="标签名称">
<el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
</el-input>
@ -273,6 +271,7 @@
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/list-main.scss";
.g-main {
width: 100%;
}
@ -283,15 +282,6 @@
padding: 30px 20px 5px;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
}
.item_width_1 {
width: 260px;
}
.item_width_2 {
width: 495px;
}
.m-table {
background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);

Loading…
Cancel
Save