Compare commits

..

No commits in common. "6ad4f76fa185dbeec1d092a6a6a5e2850087a8cc" and "7558db05df07f4f30eae762be670b25195327d83" have entirely different histories.

View File

@ -43,9 +43,9 @@
ref="popup" ref="popup"
> >
<ul> <ul>
<li @click.stop="handleAddFriend">添加好友/群聊</li> <li @click="handleAddFriend">添加好友/群聊</li>
<li @click.stop="handleMenu()">发起群聊</li> <li @click="handleMenu()">发起群聊</li>
<li @click.stop="handleScan">扫一扫</li> <li @click="handleScan">扫一扫</li>
</ul> </ul>
</view> </view>
</div> </div>
@ -56,22 +56,22 @@
/> />
<!-- 联系人 --> <!-- 联系人 -->
<TUIContact <TUIContact
v-else-if="statue == 1 && isPopupVisible==false" v-else-if="statue == 1"
style="height: 100%" style="height: 100%"
/> />
<!-- 群选择的 --> <!-- 群选择的 -->
<SelectFriend <SelectFriend
v-else-if="statue == 3 " v-else-if="statue == 3"
@con="hui" @con="hui"
:style="{ marginTop: '20px', heigth: '80%' }" :style="{ marginTop: '20px', heigth: '80%' }"
/> />
<!-- 群类型 --> <!-- 群类型 -->
<CreateGroup <CreateGroup
v-else-if="statue == 10 " v-else-if="statue == 10"
@con="confn" @con="confn"
/> />
<SelectFriendqlioa <SelectFriendqlioa
v-else-if="statue == 4 " v-else-if="statue == 4"
@concen="concen" @concen="concen"
/> />
<ContactInfo <ContactInfo
@ -83,7 +83,7 @@
<scroll-view <scroll-view
@scrolltolower="lowerBottom" @scrolltolower="lowerBottom"
scroll-y="true" scroll-y="true"
v-else-if="statue == 6 && isPopupVisible==false" v-else-if="statue == 6"
class="znx" class="znx"
> >
<div <div
@ -494,7 +494,6 @@ page {
.popup li { .popup li {
padding: 10px 20px; padding: 10px 20px;
cursor: pointer; cursor: pointer;
z-index: 999999;
} }
.popup li:hover { .popup li:hover {