diff --git a/src/App.vue b/src/App.vue index e7ad6d5..75af75f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,7 +6,7 @@ import { useRouter } from 'vue-router' const router = useRouter() // router.push(`/edit-choosing`) - diff --git a/src/assets/img/publicImage/empty-duck.png b/src/assets/img/publicImage/empty-duck.png new file mode 100644 index 0000000..6803200 Binary files /dev/null and b/src/assets/img/publicImage/empty-duck.png differ diff --git a/src/assets/img/publicImage/green-arrow-below.svg b/src/assets/img/publicImage/green-arrow-below.svg new file mode 100644 index 0000000..9e22549 --- /dev/null +++ b/src/assets/img/publicImage/green-arrow-below.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/publicImage/green-arrow.svg b/src/assets/img/publicImage/green-arrow.svg new file mode 100644 index 0000000..a004c5a --- /dev/null +++ b/src/assets/img/publicImage/green-arrow.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/publicImage/img-icon.png b/src/assets/img/publicImage/img-icon.png new file mode 100644 index 0000000..a928d4d Binary files /dev/null and b/src/assets/img/publicImage/img-icon.png differ diff --git a/src/assets/img/publicImage/white-cross.svg b/src/assets/img/publicImage/white-cross.svg new file mode 100644 index 0000000..b5f3068 --- /dev/null +++ b/src/assets/img/publicImage/white-cross.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/user/big-circle.svg b/src/assets/img/user/big-circle.svg new file mode 100644 index 0000000..2414258 --- /dev/null +++ b/src/assets/img/user/big-circle.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/user/img-icon.png b/src/assets/img/user/img-icon.png new file mode 100644 index 0000000..a928d4d Binary files /dev/null and b/src/assets/img/user/img-icon.png differ diff --git a/src/assets/img/user/new.png b/src/assets/img/user/new.png new file mode 100644 index 0000000..0cbd2c3 Binary files /dev/null and b/src/assets/img/user/new.png differ diff --git a/src/assets/img/user/small-circle.svg b/src/assets/img/user/small-circle.svg new file mode 100644 index 0000000..235f2b9 --- /dev/null +++ b/src/assets/img/user/small-circle.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/user/u75.png b/src/assets/img/user/u75.png new file mode 100644 index 0000000..7a7e181 Binary files /dev/null and b/src/assets/img/user/u75.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/components/public/empty-duck.vue b/src/components/public/empty-duck.vue new file mode 100644 index 0000000..80c086a --- /dev/null +++ b/src/components/public/empty-duck.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/components/public/head.vue b/src/components/public/head.vue index af28b84..305bf5f 100644 --- a/src/components/public/head.vue +++ b/src/components/public/head.vue @@ -73,6 +73,7 @@ const tabList = [{ position: relative; height: 260px; margin: 0 auto; + min-width: 1200px; .header-bj-box { position: absolute; diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue index 2648be0..76a9705 100644 --- a/src/components/user/systematic-notification-pop.vue +++ b/src/components/user/systematic-notification-pop.vue @@ -1,28 +1,164 @@ - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 7828641..9c81aeb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,13 +36,21 @@ const routes = [ title: "我的" } }, + { + path: '/detail', + name: 'detail', + component: () => import(/* webpackChunkName: "detail" */ '@/views/detail.vue'), + meta: { + title: "详情" + } + }, {//个人房源 - path:'/personHousing', - component:()=> import(/* webpackChunkName: "housing" */ '@/views/housingView/person.vue') + path: '/personHousing', + component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/person.vue') }, {//中介房源 - path:'/intermediaryHousing', - component:()=> import(/* webpackChunkName: "housing" */ '@/views/housingView/intermediary.vue') + path: '/intermediaryHousing', + component: () => import(/* webpackChunkName: "housing" */ '@/views/housingView/intermediary.vue') } ] diff --git a/src/utils/axios.js b/src/utils/axios.js index 5636e5f..f5c11fd 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -1,10 +1,6 @@ import axios from 'axios'; import QS from 'qs'; import { goTologin } from '@/utils/util.js' -//qs.stringify()是将对象 序列化成URL的形式,以&进行拼接 -// let protocol = window.location.protocol; //协议 -// let host = window.location.host; //主机 -// axios.defaults.baseURL = protocol + "//" + host; axios.defaults.baseURL = 'https://app.gter.net' // axios.defaults.baseURL = '/index' axios.defaults.emulateJSON = true @@ -12,12 +8,7 @@ axios.defaults.withCredentials = true axios.interceptors.request.use( //响应拦截 async config => { - // 每次发送请求之前判断vuex中是否存在token - // 如果存在,则统一在http请求的header都加上token,这样后台根据token判断你的登录情况 - // 即使本地存在token,也有可能token是过期的,所以在响应拦截器中要对返回状态进行判断 - // config.headers.withCredentials = true - // config.headers['Content-Type'] = 'multipart/form-data' - + // 开发时登录用的,可以直接替换小程序的 authorization // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3" if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg" return config; @@ -38,10 +29,7 @@ axios.interceptors.response.use( switch (error.response.status) { // 401: 未登录 case 401: - console.log("401"); - goTologin() - console.log("401"); - + goTologin() // 跳转登录页面 break case 403: // router.push('/login') diff --git a/src/utils/util.js b/src/utils/util.js index e537862..91d8137 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -3,7 +3,6 @@ function setSeoTitle(title) { } function redirectToExternalWebsite(url) { - console.log(url, "url"); const link = document.createElement('a'); link.href = url; // link.target = '_blank'; diff --git a/src/views/detail.vue b/src/views/detail.vue new file mode 100644 index 0000000..273ffd2 --- /dev/null +++ b/src/views/detail.vue @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/src/views/edit.vue b/src/views/edit.vue index 1718f92..d01b23b 100644 --- a/src/views/edit.vue +++ b/src/views/edit.vue @@ -293,7 +293,7 @@
-
+
-
+
@@ -547,7 +547,7 @@
目标区域
-
+
{{ item.name }}
@@ -2321,14 +2321,12 @@ export default { &.type-pop-box { width: 640px; height: 181px; - background: inherit; background-color: rgba(255, 255, 255, 1); border: 1px solid rgba(235, 235, 235, 1); -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196); -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196); box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.0784313725490196); padding: 30px; - position: absolute; top: 58px; @@ -2479,37 +2477,18 @@ export default { overflow: auto; padding-top: 16px; - /*滚动条样式*/ - &::-webkit-scrollbar { - width: 8px; - } - - &::-webkit-scrollbar-thumb { - border-radius: 10px; - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - background: rgba(242, 242, 242, 1); - } - - &::-webkit-scrollbar-track { - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - border-radius: 0; - background: transparent; - } - .area-item { height: 70px; - cursor: pointer; - - &:not(:last-of-type) { - border-bottom: 1px solid rgba(242, 242, 242, 1); - } - margin-right: 5px; color: #555; font-size: 16px; justify-content: space-between; + &:not(:last-of-type) { + border-bottom: 1px solid rgba(242, 242, 242, 1); + } + &.pitchpitch { color: #62B1FF; @@ -2558,23 +2537,6 @@ export default { background-color: red; } - /*滚动条样式*/ - &::-webkit-scrollbar { - width: 8px; - } - - &::-webkit-scrollbar-thumb { - border-radius: 10px; - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - background: rgba(242, 242, 242, 1); - } - - &::-webkit-scrollbar-track { - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - border-radius: 0; - background: transparent; - } - .target-area-item { margin-bottom: 20px; @@ -2596,8 +2558,6 @@ export default { border-radius: 4px; background-color: rgba(255, 215, 82, 1); } - - } .box { @@ -2723,23 +2683,6 @@ export default { padding: 10px 30px; overflow: auto; - /*滚动条样式*/ - &::-webkit-scrollbar { - width: 8px; - } - - &::-webkit-scrollbar-thumb { - border-radius: 10px; - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - background: rgba(242, 242, 242, 1); - } - - &::-webkit-scrollbar-track { - box-shadow: inset 0 0 5px rgba(0, 0, 0, 0); - border-radius: 0; - background: transparent; - } - .residential-item { height: 60px; cursor: pointer; diff --git a/src/views/user.vue b/src/views/user.vue index 194ffda..70387b5 100644 --- a/src/views/user.vue +++ b/src/views/user.vue @@ -23,7 +23,7 @@
-
+
{{ newmessagenum }}
@@ -59,18 +59,30 @@
-
我的收藏
-
我的发布
+
我的收藏
+
我的发布 +
+
+
+ +
共收藏 {{ count['fav'] }} 个房源
+
{{ count['publish'] }} 条房源(上架 {{ stat['listing'] }} | 草稿 {{ stat['draft'] + }} | 下架 {{ stat['offshelf'] }})
+ +
+
+
+ - +