Browse Source

Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

master
王金鹏 6 years ago
parent
commit
300bfcc4bd
  1. BIN
      src/assets/img/login_bg.jpg
  2. BIN
      src/assets/img/login_bg3.jpg
  3. 11
      src/assets/scss/pages/login.scss
  4. 2
      src/views/modules/news/news-add-or-update.vue
  5. 8
      src/views/modules/news/news-publish.vue

BIN
src/assets/img/login_bg.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 626 KiB

After

Width:  |  Height:  |  Size: 701 KiB

BIN
src/assets/img/login_bg3.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 KiB

11
src/assets/scss/pages/login.scss

@ -12,13 +12,13 @@
}
&::before {
background-image: url(~@/assets/img/login_bg.jpg);
background-size: contain;
background: url(~@/assets/img/login_bg.jpg) no-repeat;
background-size: 100% 100%;
}
&::after {
background-color: rgba(38, 50, 56, .4);
}
// &::after {
// background-color: rgba(38, 50, 56, .4);
// }
.aui-content {
display: flex;
@ -74,6 +74,7 @@
.login-body {
padding: 20px 30px;
background-color: #fff;
box-shadow: 6px 6px 16px #FDDBD4;
.login-title {
font-size: 18px;

2
src/views/modules/news/news-add-or-update.vue

@ -356,7 +356,7 @@ export default {
if (!valid) {
return false
}
this.$http['post']('/news/news/publish', this.dataForm).then(({ data: res }) => {
this.$http['put']('/news/news/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

8
src/views/modules/news/news-publish.vue

@ -141,8 +141,8 @@ export default {
dataForm: {
id: '',
streetId: '',
communityId: '',
gridId: '',
communityId: null,
gridId: null,
newsCateroryId: '',
newsTitle: '',
newsReleaseStartTime: '',
@ -150,8 +150,8 @@ export default {
newsContent: '',
newsImageUrl: '',
street: '',
community: '',
grid: '',
community: null,
grid: null,
newsProperty: ''
},
time: [],

Loading…
Cancel
Save