diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index 9dd3b5d..c9de844 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -154,8 +154,8 @@ export default { util.successMsg("登录成功"); this.setCustomer(res.customer); this.setCustomerName(res.customerName); - let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index"; - this.$router.replace(redirect); + // let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index"; + this.$router.replace('/index'); }).catch(res => {}); }, phoneCountdown() { diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue index 22f1900..422d757 100644 --- a/src/pages/station/list/index.vue +++ b/src/pages/station/list/index.vue @@ -11,10 +11,13 @@
@@ -54,12 +57,12 @@ export default { } .search { position: relative; - padding: 121px 0 167px; + padding: 100px 0 130px; text-align: center; background: url(../../../assets/img/station-bg.png) 0 0/100% 100% no-repeat; h6 { margin-bottom: 25px; - font-size: 32px; + font-size: 26px; color: #fff; } .input { @@ -98,25 +101,32 @@ export default { } .item { position: relative; - width: 256px; - height: 195px; - margin: 0 6px 4px; + padding: 0 10px; + margin: 0 10px 40px; + text-align: center; + background-color: #fff; + border-radius: 8px; cursor: pointer; &:hover { opacity: .9; } img { - width: 100%; - height: 100%; + width: 215px; + height: 118px; + margin-top: -20px; } - .text { - position: absolute; - bottom: 14px; - left: 25px; + .bottom { display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 5px; + } + .text { + display: inline-flex; align-items: center; width: 130px; - height: 50px; + height: 40px; + text-align: left; font-size: 12px; line-height: 1.6; overflow: hidden; @@ -124,6 +134,14 @@ export default { @include mul-ellipsis(2); } } + a { + padding: 0 8px; + line-height: 28px; + font-size: 14px; + color: #7A7A7A; + border-radius: 20px; + border: 1px solid #DADADA; + } } } \ No newline at end of file diff --git a/src/setting.js b/src/setting.js index 25c21c5..02a46e6 100644 --- a/src/setting.js +++ b/src/setting.js @@ -65,6 +65,7 @@ const Setting = { errorModalType: "Message", // 接口请求返回错误时,弹窗的类型,可选值为 Message 或 Notice cookiesExpires: 1, // Cookies 默认保存时间,单位:天 tokenExpires: 1296000000, // token在localStorage的时间(毫秒) + bankPath, /** * localStorage里保存的token的key */