diff --git a/src/components/FooterNav.vue b/src/components/FooterNav.vue index e000066..b264054 100644 --- a/src/components/FooterNav.vue +++ b/src/components/FooterNav.vue @@ -1,10 +1,23 @@ @@ -15,15 +28,16 @@ export default { data () { return { imgUrl: { - foot: require('../../static/img/foot.png') + foot: require('../../static/img/foot.png'), + foot1: require('../../static/img/foot1.png') } } }, computed: {}, watch: {}, methods: {}, - created () {}, - mounted () {} + created () { }, + mounted () { } } @@ -31,14 +45,37 @@ export default { #wrapper-w { // width: 1280px; width: 100%; - height: 227px !important; + height: 292px !important; background-size: 100% 100%; background-color: rgba($color: #000000, $alpha: 0.6); display: flex; justify-content: center; align-items: center; + flex-direction: column; - & > div { + .div2 { + width: 540px; + height: 110px; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 34px; + + img { + margin-bottom: 11px; + } + + p { + font-family: "MicrosoftYaHei"; + font-size: 16px; + font-weight: normal; + font-stretch: normal; + letter-spacing: 0px; + color: #ffffff; + } + } + + & > .div1 { display: inline-block; height: 64px; text-align: center; @@ -57,7 +94,7 @@ export default { font-size: 16px; font-weight: bold; font-stretch: normal; - line-height: 60px; + margin-top: 30px; letter-spacing: 0px; color: #ffffff; } diff --git a/src/http.js b/src/http.js index 7d65dea..edf16bb 100644 --- a/src/http.js +++ b/src/http.js @@ -12,9 +12,9 @@ axios.interceptors.request.use(config => { ) { // 如果是登录和注册操作,则不需要携带header里面的token } else { - if (localStorage.token) { + if (sessionStorage.token) { config.headers = { - Authorization: localStorage.token + Authorization: sessionStorage.token } } } @@ -37,7 +37,7 @@ axios.interceptors.response.use( router.beforeEach((to, from, next) => { if (to.meta.requireAuth) { // 判断该路由是否需要登录权限 - if (localStorage.token) { + if (sessionStorage.token) { // 获取当前的token是否存在 console.log('token存在') next() diff --git a/src/views/InformationQuery.vue b/src/views/InformationQuery.vue index ecf85aa..31fbafd 100644 --- a/src/views/InformationQuery.vue +++ b/src/views/InformationQuery.vue @@ -79,7 +79,8 @@ {{info.status}} - {{info.status}} + {{info.status}} + {{info.status}} @@ -121,7 +123,7 @@ export default { data() { return { index_num: 1, - text: ["全部", "异常名单", "白名单"], + text: ["全部", "异常名单", "信用良好名录"], sub: 0, imgUrl: { xa: require("../../static/img/xa.png") @@ -276,7 +278,7 @@ export default { url: 'v1/society/society', data: {} }).then(res => { - if (res.data.code !== 200) { + if (res.data.data.code !== 200) { return; } _this.bgData = res.data.data.data.info @@ -474,7 +476,7 @@ export default { width: 110px; } &:nth-of-type(3) { - width: 89px; + width: 121px; } } diff --git a/src/views/Login.vue b/src/views/Login.vue index 2b8a174..17b64d2 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -30,6 +30,7 @@ export default { imgUrl: { login: require('../../static/img/login.png'), yh: require('../../static/img/yh.png'), + registered: require('../../static/img/registered.png'), mm: require('../../static/img/mm.png') }, account: '', @@ -49,12 +50,11 @@ export default { password: _this.password } }).then(res => { - if (res.data.code === 200) { - console.log(res.data) + if (res.data.data.code === 200) { this.$message.success('登陆成功') - this.$router.push('/personalZte') + this.$router.push('/') // 全局存储token - window.localStorage['token'] = JSON.stringify(res.data.data.data.id) + window.sessionStorage['token'] = res.data.data.data.id } else { this.$message.error('请求数据有问题!') } @@ -75,6 +75,7 @@ export default { min-width: 1280px; height: 720px; background-size: 100% 100%; + background-repeat: no-repeat; display: flex; justify-content: center; align-items: center; diff --git a/src/views/Registered.vue b/src/views/Registered.vue index dc6769e..e6d9b0f 100644 --- a/src/views/Registered.vue +++ b/src/views/Registered.vue @@ -183,7 +183,6 @@ export default { }).then(res => { if (res.data.code === 200) { _this.reg = res.data - console.log(res.data) } else { _this.$message.error('请求数据有问题!') } diff --git a/src/views/home/ApplyFor.vue b/src/views/home/ApplyFor.vue index 4559214..5b4bdad 100644 --- a/src/views/home/ApplyFor.vue +++ b/src/views/home/ApplyFor.vue @@ -261,7 +261,7 @@ export default { s = n; this.sub = s; if (this.sub == 2) { - let sid = localStorage.token + let sid = sessionStorage.token let _this = this // console.log(_this.type, // _this.reg_manage, _this.supervisor, _this.work_person, _this.flow_party_person, diff --git a/src/views/home/NewsDetails.vue b/src/views/home/NewsDetails.vue index a358d61..7c1bbf6 100644 --- a/src/views/home/NewsDetails.vue +++ b/src/views/home/NewsDetails.vue @@ -79,11 +79,11 @@ export default { watch: {}, methods: { collection(article_id) { - if (!localStorage.token) { + if (!sessionStorage.token) { alert('请先登录~') return; } - this.coll = !this.coll; + let _this = this this.$http({ method: 'post', @@ -93,7 +93,11 @@ export default { article_id: article_id } }).then(res => { - console.log(res) + if (res.data.data.code === 200) { + _this.coll = !_this.coll; + } else { + _this.$message.error('请求数据有问题!') + } }) // eslint-disable-next-line handle-callback-err .catch(err => { @@ -109,7 +113,7 @@ export default { id: id } }).then(res => { - if (res.data.code === 200) { + if (res.data.data.code === 200) { _this.bgData = res.data.data.data } else { _this.$message.error('请求数据有问题!') diff --git a/src/views/home/NewsList.vue b/src/views/home/NewsList.vue index 3515fcf..f31aea8 100644 --- a/src/views/home/NewsList.vue +++ b/src/views/home/NewsList.vue @@ -72,7 +72,7 @@ export default { type: _this.getType } }).then(res => { - if (res.data.code === 200) { + if (res.data.data.code === 200) { _this.bgData = res.data.data.data _this.totalCount = _this.bgData.allNum _this.pageSize = _this.bgData.info.length diff --git a/src/views/personal/Declare.vue b/src/views/personal/Declare.vue index 52f9b6e..482155f 100644 --- a/src/views/personal/Declare.vue +++ b/src/views/personal/Declare.vue @@ -17,25 +17,25 @@
初筛通过 - 10 + {{bgValue.overview_one}}
立项通过 - 10 + {{bgValue.overview_two}}
执行中 - 10 + {{bgValue.overview_three}}
已完结 - 10 + {{bgValue.overview_four}}
@@ -47,12 +47,14 @@ 项目申报 @@ -69,33 +71,33 @@
-