gter.net/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
A1300399510 2023-07-31 11:45:50 +08:00
parent 6793e4cd3e
commit 44d03fc9c3
10 changed files with 85 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/img/publicImage/defaultAvatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

19
src/components/apartment/seachModule.vue
View File

@ -372,10 +372,11 @@ const selectOption = (type, value) => {
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
font-size: 14px;
margin-top: 20px;
padding-top: 3px;
.seach-box {
background: #FFFFFF;
transform: translate(0, 3px);
// transform: translate(0, 3px);
border-radius: 16px;
.top-seach {
@ -460,19 +461,25 @@ const selectOption = (type, value) => {
line-height: 48px;
cursor: pointer;
&:hover {
opacity: 0.8;
}
&.add-btn {
background: rgba(253, 218, 85, 1);
margin-left: 20px;
&:hover {
background: rgba(253, 218, 85, 0.8);
}
}
&.consult-btn {
background: rgba(144, 216, 72, 1);
margin-left: 20px;
&:hover {
opacity: 0.8;
}
.consult-icon {
width: 22px;
height: 22px;
@ -577,7 +584,7 @@ const selectOption = (type, value) => {
width: 600px;
&:not(:last-of-type) {
border-right: 1px #ebebeb dashed;
border-right: 1px #ebebeb dotted;
}
.option-item {
@ -587,7 +594,7 @@ const selectOption = (type, value) => {
margin: 0 30px 0 20px;
&:not(:last-of-type) {
border-bottom: 1px #ebebeb dashed;
border-bottom: 1px #ebebeb dotted;
}
.option-title {

58
src/components/pageTopBar/pageTopBar.vue
View File

@ -7,10 +7,10 @@
<div class="index-top-navigation dis-f al-item body-maxWidth">
<div class="navigation-text" @click="topTabSelect(i, item)"
:class="{ 'navigation-text-click': item.key === topTabNum }" v-for="(item, i) in topTab.data" :key="i">
{{
item.name }}</div>
<div class="user-box">
{{ item.name }}</div>
<div class="user-box" v-if="user.data['uid'] > 0">
<img :src="user.data.avatar" class="user-img" alt="">
<!-- <img v-else src="@/assets/img/publicImage/defaultAvatar.png" class="user-img" alt=""> -->
<div class="user-out-box">
<div class="box-bg dis-f jus-x">
<div class="top-box"></div>
@ -20,6 +20,11 @@
</div>
</div>
</div>
<div class="login-box" v-else>
<div class="login-box-item" @click="loginBtn('login')">登录</div>
<div class="login-box-item" @click="loginBtn('register')">注册</div>
</div>
</div>
</div>
<div class="dis-f jus-x al-item body-maxWidth" style="margin: auto;">
@ -39,8 +44,7 @@
</el-carousel>
</div>
</div>
<div class="btm-seach-btn-box dis-f al-item jus-x"
v-if="pageTopBarShow">
<div class="btm-seach-btn-box dis-f al-item jus-x" v-if="pageTopBarShow">
<div class="body-maxWidth dis-f" style="height:48px;">
<div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': item.path === tabBtnType }"
v-for="(item, i) in seachTab.data" :key="i" @click="changeTabBtnType(item)">
@ -62,6 +66,7 @@
import store from '../../store/index';
import { useRoute, useRouter } from 'vue-router'
import { reactive, watchEffect, ref, defineProps } from "vue";
import { goTologin } from '@/utils/util.js'
const props = defineProps({
bannerList: {
@ -120,8 +125,13 @@ let topTabSelect = (type, item) => {
const router = useRouter()
let tabBtnType = ref('/')
let pageTopBarShow= router.currentRoute.value.meta.topBarShow
let pageTopBarShow = router.currentRoute.value.meta.topBarShow
let changeTabBtnType = (item) => {
// 判断点击进入 user 时是否已经登录
if (item['path'] == '/user' && user.data['uid'] == 0) {
loginBtn('login')
return
}
tabBtnType.value = item.path
router.push({
path: item.path
@ -138,6 +148,16 @@ let routePath = ref('')
routePath.value = route.meta.path
tabBtnType.value = route.meta.path
// 点击登录注册 type login 登录 register注册
const loginBtn = type => {
if (type == 'login') {
store.state.showloginmodal = true
return
}
goTologin()
}
</script>
<style scoped>
.pos-r {
@ -370,5 +390,31 @@ tabBtnType.value = route.meta.path
.dropdown {
background: #000;
}
.login-box {
font-size: 14px;
color: #333;
line-height: 40px;
text-align: right;
display: flex;
align-items: center;
.login-box-item {
background: #000;
color: #fff;
text-align: center;
border-radius: 57px;
width: 50px;
height: 26px;
line-height: 26px;
cursor: pointer;
&:last-child {
background: #fff;
color: #000;
margin-left: 18px;
}
}
}
</style>

7
src/components/public/circle-btn.vue
View File

@ -1,13 +1,13 @@
<template>
<div class="circle-btn flexcenter" @click="circleState = true">
<div class="circle-inside flexcenter">
<div class="circle-btn flexcenter">
<div class="circle-inside flexcenter" @click="circleState = !circleState">
<img class="circle-bj" src="@/assets/img/publicImage/half-circle-green.svg" />
<img class="circle-icon" src="@/assets/img/publicImage/consult-hollow-out.png" />
<div class="circle-text">咨询</div>
</div>
<div class="circle-pop flexacenter" v-if="circleState">
<img class="close-icon" src="@/assets/img/publicImage/circle-close.png" alt=""
@click.stop="circleState = false">
@click.stop="circleState = !circleState">
<img class="circle-bj" src="@/assets/img/publicImage/circle-pop-bj.svg">
<img class="circle-bj-green" src="@/assets/img/publicImage/circle-pop-bj-green.svg">
<div class="circle-title flexacenter">欢迎联系 <b>{{ wechat['nickname'] }}</b> 咨询房源</div>
@ -40,7 +40,6 @@ let circleState = ref(false)
.circle-btn {
position: fixed;
bottom: 98px;
// right: 58px;
right: calc((100vw - 1200px) / 2 - 75px);
width: 60px;

3
src/components/public/login.vue
View File

@ -8,10 +8,8 @@ import { ref, watch, onMounted, getCurrentInstance, nextTick, createApp } from '
import store from '@/store/index';
let showLoginModal = ref(false);
watch(() => store.state.showloginmodal, (newValue) => {
// store.state.showloginmodal = false
if (newValue) init1()
});
@ -68,7 +66,6 @@ const executeScripts = () => {
const newScript = document.createElement('script');
newScript.src = script.src;
newScript.onload = () => {
console.log('外部脚本已加载');
// 可以在这里使用外部脚本提供的功能
};
document.body.appendChild(newScript);

6
src/components/public/phoneQRcode.vue
View File

@ -54,9 +54,9 @@ const props = defineProps({
background-color: rgba(255, 255, 255, 1);
border-radius: 50%;
overflow: hidden;
-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
// -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
// -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
// box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
margin-bottom: 33px;
.QRcode-img {

3
src/components/seachModule/seachModule.vue
View File

@ -307,10 +307,11 @@ defineExpose({
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
font-size: 14px;
margin-top: 20px;
padding-top: 5px;
.seach-box {
background: #FFFFFF;
transform: translate(0, 5px);
/* transform: translate(0, 5px); */
border-radius: 16px;
.top-seach {

14
src/components/user/systematic-notification-pop.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="pop-mask flexcenter">
<div class="pop-mask flexcenter" v-if="show">
<div class="content flexflex">
<div class="header flexflex">
<img class="header-icon" src="@/assets/img/user/inform-icon.png" />
@ -120,7 +120,6 @@
</div>
</div>
</div>
</template>
@ -142,25 +141,32 @@ onMounted(() => {
init()
})
let show = ref(false) //是否展示
let qrcode = ref("") // 关注二维码
let issubscribe = ref(0) // 是否已经关注公众号
let list = ref([]) // 列表数据
let state = false // 请求状态
let page = 1 // 页数
const init = () => {
// proxy.$post("/tenement/message/lists").then((res) => {
if (page == 0 || state) return
state = true
proxy.$post("/tenement/pc/api/user/messageList", {
page
}).then((res) => {
if (res.code != 200) return
if (res.code != 200) {
emit('close')
return
}
let data = res.data
qrcode.value = data['qrcode']
issubscribe.value = data['issubscribe']
list.value = list.value.concat(data['data'])
page = data['page'] * data['limit'] < data['count'] ? page + 1 : 0
show.value = true
}).catch((err) => {
emit('close')
}).finally(() => {
state = false
})

2
src/utils/axios.js
View File

@ -79,7 +79,7 @@ const $post = (url, params) => {
}).catch(err => {
console.log("err", err.data);
if (err.data.code == 401) {
resolve(err.data);
} else reject(err.data)
})

2
src/utils/util.js
View File

@ -6,7 +6,7 @@ function setSeoTitle(title) {
function redirectToExternalWebsite(url) {
const link = document.createElement('a');
link.href = url;
// link.target = '_blank';
link.target = '_blank';
link.click();
}