From 93fb0c1c98ece2f6eb52c128ea994790d7b44c5e Mon Sep 17 00:00:00 2001 From: A1300399510 Date: Thu, 6 Jul 2023 20:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/edit/about-pop.vue | 15 +- src/components/edit/map.vue | 4 +- src/components/public/head.vue | 6 +- src/utils/axios.js | 7 +- src/views/edit.vue | 395 ++++++++++++++++++++++-------- 5 files changed, 321 insertions(+), 106 deletions(-) diff --git a/src/components/edit/about-pop.vue b/src/components/edit/about-pop.vue index a931597..06d67b4 100644 --- a/src/components/edit/about-pop.vue +++ b/src/components/edit/about-pop.vue @@ -38,7 +38,7 @@ export default { }; const tab = ref("person"); // person intermediary more - + computed(() => { if (props['intermediary'] == 1) tab = "intermediary" else tab = "person" @@ -152,6 +152,19 @@ export default { .about-list-item { padding: 30px 0; + position: relative; + + &::after { + content: ""; + position: absolute; + top: 40px; + left: -22px; + width: 8px; + height: 8px; + border-radius: 50%; + background: rgba(80, 227, 194, 1); + } + &:not(:last-of-type) { border-bottom: 1px dashed #ebebeb; } diff --git a/src/components/edit/map.vue b/src/components/edit/map.vue index 4792ccd..0b86324 100644 --- a/src/components/edit/map.vue +++ b/src/components/edit/map.vue @@ -47,7 +47,9 @@ export default { let that = this let info = this.info - if (!info['latitude']) { + console.log("info['latitude']", info['latitude']); + + if (info['latitude']) { this.latlng = { longitude: info['longitude'], latitude: info['latitude'], diff --git a/src/components/public/head.vue b/src/components/public/head.vue index 2a7d015..363e94b 100644 --- a/src/components/public/head.vue +++ b/src/components/public/head.vue @@ -48,6 +48,7 @@ export default { .container-header-bj { width: 100vw; + min-width: 1200px; height: 260px; background-image: url('@/assets/img/edit/bj-img1920.png'); background-repeat: no-repeat; @@ -62,6 +63,7 @@ export default { left: 50%; transform: translateX(-50%); width: 100vw; + min-width: 1200px; max-width: 1920px; height: 100%; background-color: rgba(0, 0, 0, 0.698039215686274); @@ -70,7 +72,7 @@ export default { .header-nav { height: 46px; - max-width: 1200px; + width: 1200px; justify-content: flex-end; margin: 0 auto; position: relative; @@ -112,7 +114,7 @@ export default { .logo-box { position: relative; margin: 21px auto 0; - max-width: 1200px; + width: 1200px; z-index: 1; .logo-icon { diff --git a/src/utils/axios.js b/src/utils/axios.js index c88e0fb..d61715f 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -6,13 +6,17 @@ import router from '../router/index' // let host = window.location.host; //主机 // axios.defaults.baseURL = protocol + "//" + host; axios.defaults.baseURL = 'https://app.gter.net' +// axios.defaults.emulateJSON = true +// axios.defaults.withCredentials = true axios.interceptors.request.use( //响应拦截 async config => { // 每次发送请求之前判断vuex中是否存在token // 如果存在,则统一在http请求的header都加上token,这样后台根据token判断你的登录情况 // 即使本地存在token,也有可能token是过期的,所以在响应拦截器中要对返回状态进行判断 - config.headers.token = sessionStorage.getItem('token') + // config.headers.withCredentials = true + // config.headers['Content-Type'] = 'multipart/form-data' + if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3" return config; }, @@ -22,6 +26,7 @@ axios.interceptors.request.use( //响应拦截 // 响应拦截器 axios.interceptors.response.use( response => { + console.log("response", response); if (response.status === 200) return Promise.resolve(response); //进行中 else return Promise.reject(response); //失败 diff --git a/src/views/edit.vue b/src/views/edit.vue index 7af4249..4416edf 100644 --- a/src/views/edit.vue +++ b/src/views/edit.vue @@ -98,22 +98,27 @@ -
- - - - +
+
随时
+
+ + + + + + +
随时
-
+
-
@@ -293,14 +298,14 @@
-
{{ item.title }} +
{{ item.title }}
*
-
- -
+
+
@@ -315,10 +320,9 @@ - +
-
-
{{ item }}
@@ -339,11 +344,14 @@
+
- -
-
请选择
+ +
+
+
{{ info['address'] ? info['address'] : "请选择"}}
@@ -369,8 +377,41 @@
重选
+
+ + +
+
所属小区 +
+
+
+
+ {{ info.communityname }} +
+
请选择
+ + + +
+
+ +
+
+
+
+
{{ item.name }}
+
+
+
+ +