diff --git a/src/assets/images/shangqi/home/logo3.png b/src/assets/images/shangqi/home/logo3.png
new file mode 100644
index 000000000..21afbded4
Binary files /dev/null and b/src/assets/images/shangqi/home/logo3.png differ
diff --git a/src/components/comHeader/index.vue b/src/components/comHeader/index.vue
index 8e9036365..6a2e0f462 100644
--- a/src/components/comHeader/index.vue
+++ b/src/components/comHeader/index.vue
@@ -72,7 +72,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$store.commit('setTypeFlag', 'loginOut')
this.$http.get('logout', {}, {
diff --git a/src/pages/home1/components/realtimeinfo/index.vue b/src/pages/home1/components/realtimeinfo/index.vue
index f955a9088..94f315cdc 100644
--- a/src/pages/home1/components/realtimeinfo/index.vue
+++ b/src/pages/home1/components/realtimeinfo/index.vue
@@ -4,7 +4,7 @@
@@ -18,56 +18,33 @@ export default {
data() {
return {
putTime: '',
- realimeinfoList: [
- {
- id: 1,
- title: '资讯1',
- },
- {
- id: 2,
- title: '资讯2',
- },
- {
- id: 3,
- title: '资讯3',
- },
- {
- id: 4,
- title: '资讯4',
- },
- {
- id: 5,
- title: '资讯5',
- },
- {
- id: 6,
- title: '资讯6',
- },
- ],
+ realimeinfoList: [], //资讯数据
}
},
computed: {},
watch: {},
mounted() {
this.getDate()
+ this.getDynamicInformation()
},
methods: {
- getDate() {
- //获取当前时间
- var date = new Date()
- var year = date.getFullYear()
- var month = date.getMonth() + 1
- var day = date.getDate()
- if (month < 10) {
- month = '0' + month
- }
- if (day < 10) {
- day = '0' + day
- }
- var nowDate = year + '-' + month + '-' + day
- this.putTime = nowDate
+ //截取时间
+ getDate (date) {
+ return date != null ? date.substring(0, date.indexOf(' ')) : ''
+ },
+ //获取数据
+ getDynamicInformation () {
+ let obj = {}
+ obj.msgType = 'RESOURCE'
+ obj.rowLimit = 8
+ this.$http.get('lawss/msgDynamicInfo/page', obj, {
+ _this: this
+ }, res => {
+ this.realimeinfoList = res.data.list
+ }, e => {
+ })
+ },
},
- },
}
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 94a72ceca..11e76a840 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -4,7 +4,7 @@
@@ -18,56 +18,34 @@ export default {
data() {
return {
putTime: '',
- standardReleaseList: [
- {
- id: 1,
- title: '标准发布1',
- },
- {
- id: 2,
- title: '标准发布2',
- },
- {
- id: 3,
- title: '标准发布3',
- },
- {
- id: 4,
- title: '标准发布4',
- },
- {
- id: 5,
- title: '标准发布5',
- },
- {
- id: 6,
- title: '标准发布6',
- },
- ],
+ standardReleaseList: [], //标准发布数据
}
},
computed: {},
watch: {},
mounted() {
this.getDate()
+ this.getAdvice()
},
methods: {
- getDate() {
- //获取当前时间
- var date = new Date()
- var year = date.getFullYear()
- var month = date.getMonth() + 1
- var day = date.getDate()
- if (month < 10) {
- month = '0' + month
- }
- if (day < 10) {
- day = '0' + day
- }
- var nowDate = year + '-' + month + '-' + day
- this.putTime = nowDate
+ //截取时间
+ getDate (date) {
+ return date != null ? date.substring(0, date.indexOf(' ')) : ''
+ },
+ //获取数据
+ getAdvice() {
+ let obj = {}
+ obj.msgType = 'RESOURCE'
+ obj.rowLimit = 8
+ this.$http.get('lawss/msgDynamicInfo/page', obj, {
+ _this: this
+ }, res => {
+ this.standardReleaseList = res.data.list
+ }, e => {
+ })
},
},
+
}
diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue
index f80e55a66..2d884734d 100644
--- a/src/pages/home1/components/searchGroup/index.vue
+++ b/src/pages/home1/components/searchGroup/index.vue
@@ -77,8 +77,10 @@ export default {
::v-deep {
.el-input__inner {
width: 18vm;
- height: 40px;
+ height: 50px;
color: #fff;
+ border: 0;
+ border-radius: 0px;
background: rgba(182, 213, 255, 0.22);
}
}
@@ -88,16 +90,20 @@ export default {
flex: 1;
::v-deep {
.el-input__inner {
- height: 40px;
+ height: 50px;
font-size: 16px;
color: #fff;
+ border: 0;
+ border-radius: 0px;
background: rgba(182, 213, 255, 0.22);
}
}
}
.primary_button {
width: 8.2vw;
- height: 40px;
+ height: 50px;
+ border: 0;
+ border-radius: 0px;
background-color: #1885f5;
}
}
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 37a037897..37a57b2b0 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -4,7 +4,7 @@
@@ -18,55 +18,32 @@ export default {
data() {
return {
putTime: '',
- domesticDynamics: [
- {
- id: 1,
- title: '标准征求意见1',
- },
- {
- id: 2,
- title: '标准征求意见2',
- },
- {
- id: 3,
- title: '标准征求意见3',
- },
- {
- id: 4,
- title: '标准征求意见4',
- },
- {
- id: 5,
- title: '标准征求意见5',
- },
- {
- id: 6,
- title: '标准征求意见6',
- },
- ],
+ domesticDynamics: [], //标准征求意见数据
}
},
computed: {},
watch: {},
mounted() {
this.getDate()
+ this.getAdvice()
},
methods: {
- getDate() {
- //获取当前时间
- var date = new Date()
- var year = date.getFullYear()
- var month = date.getMonth() + 1
- var day = date.getDate()
- if (month < 10) {
- month = '0' + month
- }
- if (day < 10) {
- day = '0' + day
- }
- var nowDate = year + '-' + month + '-' + day
- this.putTime = nowDate
+ //截取时间
+ getDate (date) {
+ return date != null ? date.substring(0, date.indexOf(' ')) : ''
},
+ //获取数据
+ getAdvice() {
+ let obj = {}
+ obj.msgType = 'RESOURCE'
+ obj.rowLimit = 8
+ this.$http.get('lawss/msgDynamicInfo/page', obj, {
+ _this: this
+ }, res => {
+ this.domesticDynamics = res.data.list
+ }, e => {
+ })
+ }
},
}
diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue
index a41709370..e0612529d 100644
--- a/src/pages/home1/index.vue
+++ b/src/pages/home1/index.vue
@@ -7,6 +7,7 @@
您好,{{ $store.getters.userInfo.uName }}
+
退出
@@ -84,7 +85,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$store.commit('setTypeFlag', 'loginOut')
this.$http.get('logout', {}, {
@@ -118,7 +119,8 @@ export default {
.logo {
width: 500px;
height: 70px;
- background: url("../../assets/images/shangqi/home/logo2.png") no-repeat;
+ margin-top: 20px;
+ background: url("../../assets/images/shangqi/home/logo3.png") no-repeat;
.logo_title {
height: 50px;
margin-top: 50px;