debug
This commit is contained in:
parent
5407471e65
commit
dcceb5f548
@ -5,11 +5,11 @@
|
|||||||
<input type="text" :placeholder="placeholder" v-model="value">
|
<input type="text" :placeholder="placeholder" v-model="value">
|
||||||
<div class="suffix">
|
<div class="suffix">
|
||||||
<slot v-if="$slots.default"></slot>
|
<slot v-if="$slots.default"></slot>
|
||||||
<img v-if="value.length && (!$slots.default)" src="../assets/img/icon/login/close-full-gray.png"
|
<img v-if="value.length && (!$slots.default)" src="../assets/img/icon/components/gray-close-full2.png"
|
||||||
@click.stop="clear">
|
@click.stop="clear">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="isShowText" class="notice" :style="{color : notice}" @click.stop="$emit('notice')">{{ showText }}</div>
|
<div v-if="isShowRightText" class="rightTextColor" :style="{color : rightTextColor}" @click.stop="$emit('notice')">{{ rightText }}</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -26,11 +26,11 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
default: ''
|
default: ''
|
||||||
},
|
},
|
||||||
notice: {
|
rightTextColor: {
|
||||||
type: String,
|
type: String,
|
||||||
default: 'red'
|
default: 'red'
|
||||||
},
|
},
|
||||||
isShowText: {
|
isShowRightText: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
@ -38,7 +38,7 @@ export default {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true
|
default: true
|
||||||
},
|
},
|
||||||
showText: {
|
rightText: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '搜索'
|
default: '搜索'
|
||||||
},
|
},
|
||||||
@ -93,7 +93,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.notice {
|
.rightTextColor {
|
||||||
margin-left: 1.5rem;
|
margin-left: 1.5rem;
|
||||||
font-size: 1.6rem;
|
font-size: 1.6rem;
|
||||||
}
|
}
|
||||||
@ -130,11 +130,13 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.suffix {
|
.suffix {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 2rem;
|
right: 1.5rem;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 1rem;
|
width: 1.5rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
<div class="header">
|
<div class="header">
|
||||||
<back mode="light" @click="$back" class="mr1r"></back>
|
<back mode="light" @click="$back" class="mr1r"></back>
|
||||||
<BSearch placeholder="搜索用户名字/抖音号"
|
<BSearch placeholder="搜索用户名字/抖音号"
|
||||||
:isShowText="true"
|
:isShowRightText="true"
|
||||||
notice="white"
|
rightTextColor="white"
|
||||||
@notice="$no"
|
@notice="$no"
|
||||||
>
|
>
|
||||||
<img class="scan" src="../../assets/img/icon/scan-gray.png" @click.stop="$nav('/scan')">
|
<img class="scan" src="../../assets/img/icon/scan-gray.png" @click.stop="$nav('/scan')">
|
||||||
|
|||||||
@ -8,11 +8,11 @@
|
|||||||
<div class="content" :style="{minHeight:height}">
|
<div class="content" :style="{minHeight:height}">
|
||||||
<div class="create-chat" v-show="!showJoinedChat">
|
<div class="create-chat" v-show="!showJoinedChat">
|
||||||
<Search
|
<Search
|
||||||
:isShowText="isShowText"
|
:isShowRightText="isShowRightText"
|
||||||
@click="isShowText = true;height = '100vh';"
|
@click="isShowRightText = true;height = '100vh';"
|
||||||
@notice="isShowText = false;height = '70vh';"
|
@notice="isShowRightText = false;height = '70vh';"
|
||||||
showText="取消"
|
rightText="取消"
|
||||||
notice="gray"
|
rightTextColor="gray"
|
||||||
placeholder="搜索"
|
placeholder="搜索"
|
||||||
v-model="searchKey"/>
|
v-model="searchKey"/>
|
||||||
<template v-if="searchKey">
|
<template v-if="searchKey">
|
||||||
@ -119,7 +119,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
height: '70vh',
|
height: '70vh',
|
||||||
showJoinedChat: false,
|
showJoinedChat: false,
|
||||||
isShowText: false,
|
isShowRightText: false,
|
||||||
text: 'AAAAAAA、BBBBBBBB、CCCCCCCCCCCCC',
|
text: 'AAAAAAA、BBBBBBBB、CCCCCCCCCCCCC',
|
||||||
localFriends: [],
|
localFriends: [],
|
||||||
searchResult: [],
|
searchResult: [],
|
||||||
@ -145,7 +145,7 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.searchKey = ''
|
this.searchKey = ''
|
||||||
this.height = '70vh'
|
this.height = '70vh'
|
||||||
this.isShowText = false
|
this.isShowRightText = false
|
||||||
this.showJoinedChat = false
|
this.showJoinedChat = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
<base-header>
|
<base-header>
|
||||||
<template v-slot:center>切换城市</template>
|
<template v-slot:center>切换城市</template>
|
||||||
<template v-slot:bottom>
|
<template v-slot:bottom>
|
||||||
<Search :isShowText="isShowText"
|
<Search :isShowRightText="isShowRightText"
|
||||||
showText="取消"
|
rightText="取消"
|
||||||
@click="isShowText = true"
|
@click="isShowRightText = true"
|
||||||
@notice="isShowText = false;"
|
@notice="isShowRightText = false;"
|
||||||
@clear="isShowText = false"
|
@clear="isShowRightText = false"
|
||||||
class="ml2r mr2r mt1r" placeholder="输入城市或区县名搜索" v-model="searchKey"></Search>
|
class="ml2r mr2r mt1r" placeholder="输入城市或区县名搜索" v-model="searchKey"></Search>
|
||||||
</template>
|
</template>
|
||||||
</base-header>
|
</base-header>
|
||||||
@ -2325,7 +2325,7 @@ export default {
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
history: [],
|
history: [],
|
||||||
isShowText: false,
|
isShowRightText: false,
|
||||||
searchKey: '',
|
searchKey: '',
|
||||||
indexOffsetTop: {},
|
indexOffsetTop: {},
|
||||||
// currentFixedIndicator: null,
|
// currentFixedIndicator: null,
|
||||||
|
|||||||
@ -11,7 +11,7 @@
|
|||||||
<Search class="mt1r mb1r ml2r mr2r" placeholder="搜索大学名称"
|
<Search class="mt1r mb1r ml2r mr2r" placeholder="搜索大学名称"
|
||||||
v-model="schoolName"
|
v-model="schoolName"
|
||||||
@clear="isSearch = false"
|
@clear="isSearch = false"
|
||||||
:is-show-text="true"
|
:is-show-right-text="true"
|
||||||
@notice="search"></Search>
|
@notice="search"></Search>
|
||||||
</template>
|
</template>
|
||||||
</BaseHeader>
|
</BaseHeader>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -44,7 +44,7 @@
|
|||||||
v-model="isShowSetting"
|
v-model="isShowSetting"
|
||||||
mode="white"
|
mode="white"
|
||||||
mask-mode="dark"
|
mask-mode="dark"
|
||||||
height="25rem"
|
height="27rem"
|
||||||
:show-heng-gang="false"
|
:show-heng-gang="false"
|
||||||
>
|
>
|
||||||
<div class="setting-dialog">
|
<div class="setting-dialog">
|
||||||
|
|||||||
@ -13,16 +13,16 @@
|
|||||||
<SlideRowList v-model:active-index="currentSlideItemIndex">
|
<SlideRowList v-model:active-index="currentSlideItemIndex">
|
||||||
<SlideItem class="tab1" style="overflow: auto;">
|
<SlideItem class="tab1" style="overflow: auto;">
|
||||||
<div class="mr2r ml2r mt1r">
|
<div class="mr2r ml2r mt1r">
|
||||||
<Search v-if="!isShowText"
|
<Search v-if="!isShowRightText"
|
||||||
placeholder="搜索用户名字/抖音号"
|
placeholder="搜索用户名字/抖音号"
|
||||||
:is-show-text="false"
|
:is-show-right-text="false"
|
||||||
@click="isShowText = true">
|
@click="isShowRightText = true">
|
||||||
<img src="../../assets/img/icon/scan-gray.png" style="width: 1rem;transform: scale(1.5)"
|
<img src="../../assets/img/icon/scan-gray.png" style="width: 1rem;transform: scale(1.5)"
|
||||||
@click.stop="$nav('/scan')">
|
@click.stop="$nav('/scan')">
|
||||||
</Search>
|
</Search>
|
||||||
<Search v-else v-model="searchKey" :is-show-text="true" @notice="search" @clear="isSearch = false"></Search>
|
<Search v-else v-model="searchKey" :is-show-right-text="true" @notice="search" @clear="isSearch = false"></Search>
|
||||||
</div>
|
</div>
|
||||||
<div class="no-search" v-if="!isShowText">
|
<div class="no-search" v-if="!isShowRightText">
|
||||||
<div class="look-address-list" @click="findAddressListDialog = true">
|
<div class="look-address-list" @click="findAddressListDialog = true">
|
||||||
<img class="left" src="../../assets/img/icon/people/address-book.png" alt="">
|
<img class="left" src="../../assets/img/icon/people/address-book.png" alt="">
|
||||||
<div class="right">
|
<div class="right">
|
||||||
@ -149,7 +149,7 @@ export default {
|
|||||||
moreOptionDialog: false,
|
moreOptionDialog: false,
|
||||||
outWebImgAccountDialog: false,
|
outWebImgAccountDialog: false,
|
||||||
indicatorFixed: false,
|
indicatorFixed: false,
|
||||||
isShowText: false,
|
isShowRightText: false,
|
||||||
isSearch: false,
|
isSearch: false,
|
||||||
searchKey: '',
|
searchKey: '',
|
||||||
|
|
||||||
@ -194,8 +194,8 @@ export default {
|
|||||||
this.isSearch = true
|
this.isSearch = true
|
||||||
},
|
},
|
||||||
back() {
|
back() {
|
||||||
if (this.isShowText) {
|
if (this.isShowRightText) {
|
||||||
this.isShowText = false
|
this.isShowRightText = false
|
||||||
} else {
|
} else {
|
||||||
this.$back()
|
this.$back()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<SlideRowList v-model:active-index="slideIndex" style="height: calc(100vh - 11.1rem)">
|
<SlideRowList v-model:active-index="slideIndex" style="height: calc(100vh - 11.1rem)">
|
||||||
<SlideItem class="tab1">
|
<SlideItem class="tab1">
|
||||||
<Search v-model="searchKey" placeholder="搜索用户备注或名字" :is-show-text="false"/>
|
<Search v-model="searchKey" placeholder="搜索用户备注或名字" :is-show-right-text="false"/>
|
||||||
<div class="is-search" v-if="searchKey">
|
<div class="is-search" v-if="searchKey">
|
||||||
<div class="search-result" v-if="searchFriends.length">
|
<div class="search-result" v-if="searchFriends.length">
|
||||||
<People v-for="item in searchFriends " :people="item"></People>
|
<People v-for="item in searchFriends " :people="item"></People>
|
||||||
@ -97,8 +97,8 @@ export default {
|
|||||||
this.isSearch = true
|
this.isSearch = true
|
||||||
},
|
},
|
||||||
back() {
|
back() {
|
||||||
if (this.isShowText) {
|
if (this.isShowRightText) {
|
||||||
this.isShowText = false
|
this.isShowRightText = false
|
||||||
} else {
|
} else {
|
||||||
this.$back()
|
this.$back()
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user