abu/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.5号

Browse Source
This commit is contained in:
陈浩 2025-05-05 17:45:22 +08:00
parent af7f967d39
commit ef29aebf9c
13 changed files with 569 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TUIKit/components/TUIContact/contact-list/index.vue
View File

@ -234,6 +234,7 @@ function selectItem(item: any) {
(item: IContactInfoType) => (item as Friend)?.userID === (currentContactInfo.value as Friend)?.userID,
);
} else if ((currentContactInfo.value as IGroupModel)?.groupID) {
targetListItem = contactListMap.value?.groupList?.list?.find(
(item: IContactInfoType) => (item as IGroupModel)?.groupID === (currentContactInfo.value as IGroupModel)?.groupID,
);

6
TUIKit/components/TUIContact/select-friend/index.vue
View File

@ -1,4 +1,5 @@
<template>
<!-- <div></div> -->
<SelectUser
:isRadio="selectOptions.isRadio"
:isNeedSearch="selectOptions.isNeedSearch"
@ -55,8 +56,9 @@ watchEffect(() => {
generateSearchServer(params.isNeedSearch);
}
TUIFriendService.getFriendList().then((res: any) => {
friendList.value = res.data.map((item: any) => item.profile);
userList.value = friendList.value;
// friendList.value = res.data.map((item: any) => item.profile);
userList.value = res.data;
}).catch((err: any) => {
console.warn('getFriendList error:', err);

4
TUIKit/components/TUIContact/select-friend/index1.vue
View File

@ -57,8 +57,8 @@
generateSearchServer(params.isNeedSearch);
}
TUIFriendService.getFriendList().then((res: any) => {
friendList.value = res.data.map((item: any) => item.profile);
userList.value = friendList.value;
// friendList.value = res.data.map((item: any) => item.profile);
userList.value =res.data;
}).catch((err: any) => {
console.warn('getFriendList error:', err);
});

4
TUIKit/components/TUIGroup/manage-group/index.vue
View File

@ -368,6 +368,7 @@ TUIStore.watch(StoreName.GRP, {
}
},
currentGroupMemberList: (memberList: IGroupMember[]) => {
console.log('memberList', memberList);
groupMemberList.value = memberList;
member.value = {
admin: [],
@ -549,7 +550,8 @@ const toggleMask = async (type?: string) => {
const friendList = async () => {
const imResponse = await TUIFriendService.getFriendList();
const friendList = imResponse.data.map((item: any) => item?.profile);
// const friendList = imResponse.data.map((item: any) => item?.profile);
const friendList = imResponse.data
return friendList.filter(
(item: any) =>
!userInfo.value.list.some(

1
TUIKit/components/TUIGroup/manage-group/manage-member.vue
View File

@ -139,6 +139,7 @@ const selfValue = ref<IGroupSelfInfo>({});
watchEffect(() => {
totalMember.value = props.total;
isShowDeleteBtn.value = props.isShowDel;
console.log('-------------', props.list);
memberList.value = props.list as Array<IGroupMember>;
selfValue.value = props.self;
});

1
TUIKit/components/common/SelectUser/index.vue
View File

@ -50,7 +50,6 @@ const props = defineProps({
default: 0,
},
});
const reset = () => {
emits('complete', [],0);
};

3
TUIKit/components/common/Transfer/index.vue
View File

@ -79,7 +79,7 @@
"
onerror="this.onerror=null;this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"
/>
<span class="name">{{ item.nick || item.userID }}</span>
<span class="name">{{ item.remark || item.userID }}</span>
<span v-if="item.isDisabled"
>（{{ TUITranslateService.t("component.已在群中") }}）</span
>
@ -251,6 +251,7 @@ watchEffect(() => {
// eslint-disable-next-line vue/no-mutating-props
props.list.splice(index, 1);
}
console.log("++++++++++", props.list);
transferList.value = props.list as ITransferListItem[];
}
} else {

2
TUIKit/locales/zh_cn/TUIContact.ts
View File

@ -4,7 +4,7 @@ const TUIContact = {
"群聊通知": "群聊通知",
"系统通知": "系统通知",
"我的群聊": "我的群聊",
"输入ID": "请输入用户/群聊 ID，回车搜索",
"输入ID": "请输入用户手机号回车搜索",
"群名称": "群名称",
"群ID": "群ID",
"加入群聊": "加入群聊",

5
config/api.js
View File

@ -18,6 +18,11 @@ const dev = {
};
// 生产环境
const prod = {
// common: "http://192.168.1.211:8890",
// buyer: "http://192.168.1.211:8888",
// vlog: "http://192.168.1.211:8099",
// web: "http://192.168.1.211:8099",
// seller: "http://192.168.1.211:8889",
// common: "http://192.168.1.211:8890",
// buyer: "http://192.168.1.211:8888",
common: "http://43.143.227.203:8890",

10
pages/mine/openShop/ThirdApply.vue
View File

@ -224,11 +224,11 @@ export default {
applyThird(params)
.then((res) => {
this.loading = false;
// uni.showToast({
// title: "请正确输入",
// icon: "none",
// duration: 1500,
// });
uni.showToast({
title: "提交成功",
icon: "none",
duration: 1500,
});
setTimeout(() => {
uni.navigateTo({
url: "/pages/tabbar/user/my",

6
pages/mine/openShop/index.vue
View File

@ -377,10 +377,10 @@ export default {
if (
this.form.legalPhoto != "" &&
this.form.legalId != "" &&
this.form.legalName != ""
this.form.legalName != "" &&
this.form.linkName!= "" &&
this.form.linkPhone!= ""
) {
console.log(params,'========');
applyFirst(params)
.then((res) => {
if (res.data.success) {

187
pages/tabbar/im/index.vue
View File

@ -1,18 +1,11 @@
<template>
<div
style="height: 100%"
@click="handleTouchStart"
>
<div style="height: 100%" @click="handleTouchStart">
<div class="jolkp">
<div
class="fan"
:style="{ marginRight: statue == 0 ? '47.5%' : '47.5%' }"
>
<div
@click="hui(0)"
:style="{ marginTop: '45px' }"
v-if="statue != 0"
>
<div @click="hui(0)" :style="{ marginTop: '45px' }" v-if="statue != 0">
<u-icon name="arrow-left"></u-icon>
</div>
</div>
@ -32,16 +25,9 @@
v-if="statue == 0 || 6"
:style="{ marginTop: '45px' }"
></div>
<view
class="jolkp_l"
:style="{ marginTop: '45px' }"
></view>
<view class="jolkp_l" :style="{ marginTop: '45px' }"></view>
<!-- 弹出框 -->
<view
v-if="isPopupVisible"
class="popup"
ref="popup"
>
<view v-if="isPopupVisible" class="popup" ref="popup">
<ul>
<li @click.stop="handleAddFriend">添加好友/群聊</li>
<li @click.stop="handleMenu()">发起群聊</li>
@ -50,40 +36,28 @@
</view>
</div>
<!-- 搜索添加 -->
<TUIContactsea
v-if="statue == 2"
@switchConversation="hui"
/>
<TUIContactsea v-if="statue == 2" @switchConversation="hui" />
<!-- 联系人 -->
<TUIContact
v-else-if="statue == 1 && isPopupVisible==false"
v-else-if="statue == 1 && isPopupVisible == false"
style="height: 100%"
/>
<!-- 群选择的 -->
<SelectFriend
v-else-if="statue == 3 "
v-else-if="statue == 3"
@con="hui"
:style="{ marginTop: '20px', heigth: '80%' }"
/>
<!-- 群类型 -->
<CreateGroup
v-else-if="statue == 10 "
@con="confn"
/>
<SelectFriendqlioa
v-else-if="statue == 4 "
@concen="concen"
/>
<ContactInfo
v-else-if="statue == 7"
@concen="concen"
/>
<CreateGroup v-else-if="statue == 10" @con="confn" />
<SelectFriendqlioa v-else-if="statue == 4" @concen="concen" />
<ContactInfo v-else-if="statue == 7" @concen="concen" />
<!-- 站内信数据 -->
<!-- <div > -->
<scroll-view
@scrolltolower="lowerBottom"
scroll-y="true"
v-else-if="statue == 6 && isPopupVisible==false"
v-else-if="statue == 6 && isPopupVisible == false"
class="znx"
>
<div
@ -110,17 +84,9 @@
<!-- </div> -->
<!-- 会话 -->
<TUIConversation
style="height: 100%"
v-else
@state="state"
/>
<TUIConversation style="height: 100%" v-else @state="state" />
<!-- 未登录显示 -->
<view
v-if="showNoLoginPage"
class="no-login"
@click="toLogin"
>
<view v-if="showNoLoginPage" class="no-login" @click="toLogin">
请登录
</view>
</div>
@ -128,25 +94,40 @@
<script>
// 导入组件
import TUIConversation from '@/TUIKit/components/TUIConversation/index';
import TUIContact from '@/TUIKit/components/TUIContact/index';
import TUIContactsea from '@/TUIKit/components/TUIContact/indexsea';
import { TUILogin } from '@tencentcloud/tui-core';
import ContactSearch from '@/TUIKit/components/TUIContact/contact-search/index.vue';
import CreateGroup from '@/TUIKit/components/TUIGroup/create-group/index.vue';
import TUIConversation from "@/TUIKit/components/TUIConversation/index";
import TUIContact from "@/TUIKit/components/TUIContact/index";
import TUIContactsea from "@/TUIKit/components/TUIContact/indexsea";
import { TUILogin } from "@tencentcloud/tui-core";
import ContactSearch from "@/TUIKit/components/TUIContact/contact-search/index.vue";
import CreateGroup from "@/TUIKit/components/TUIGroup/create-group/index.vue";
// import { TUIChatKit } from '@/TUIKit';
import SelectFriend from '@/TUIKit/components/TUIContact/select-friend/index.vue';
import ContactInfo from '@/TUIKit/components/TUIContact/contact-info/index.vue';
import SelectFriendqlioa from '@/TUIKit/components/TUIGroup/index.vue';
import SelectFriend from "@/TUIKit/components/TUIContact/select-friend/index.vue";
import ContactInfo from "@/TUIKit/components/TUIContact/contact-info/index.vue";
import SelectFriendqlioa from "@/TUIKit/components/TUIGroup/index.vue";
import TUICore, { ExtensionInfo, TUIConstants } from '@tencentcloud/tui-core';
import storage from '@/utils/storage.js';
import TUICore, { ExtensionInfo, TUIConstants } from "@tencentcloud/tui-core";
import storage from "@/utils/storage.js";
// push
// import { TUIConversationService } from '@tencentcloud/chat-uikit-engine';
// import * as Push from '@/uni_modules/TencentCloud-Push';
import { getUserimInfo, getMember, getMemberstate, getMemberdelete, geterweijki } from '@/api/members';
import { TUITranslateService, TUIStore, StoreName, IGroupModel, TUIFriendService, Friend, FriendApplication, TUIUserService } from '@tencentcloud/chat-uikit-engine';
import {
getUserimInfo,
getMember,
getMemberstate,
getMemberdelete,
geterweijki,
} from "@/api/members";
import {
TUITranslateService,
TUIStore,
StoreName,
IGroupModel,
TUIFriendService,
Friend,
FriendApplication,
TUIUserService,
} from "@tencentcloud/chat-uikit-engine";
// TUIChatKit.init();
// let vueVersion = 2;
// vueVersion = 3;
@ -162,7 +143,7 @@ export default {
SelectFriendqlioa,
// TUIChatKit,
CreateGroup,
ContactInfo
ContactInfo,
},
data() {
return {
@ -179,7 +160,7 @@ export default {
pageSize: 20,
pageNumber: 1,
total: 0,
loadMoreStatus: 'more' // 加载更多状态
loadMoreStatus: "more", // 加载更多状态
};
},
onTabItemTap(e) {
@ -191,7 +172,7 @@ export default {
this.removeTimer();
// 未登录
uni.navigateTo({
url: '/pages/passport/login'
url: "/pages/passport/login",
});
this.showNoLoginPage = true;
} else {
@ -204,7 +185,7 @@ export default {
onUnload() {},
created() {},
onHide() {
console.log('IM页面隐藏');
console.log("IM页面隐藏");
this.removeTimer();
},
onShow() {
@ -224,8 +205,7 @@ export default {
this.setTime();
// 监听自定义全局点击事件
uni.$on('globalClick', (event) => {
// console.log(event, "====+++");
uni.$on("globalClick", (event) => {
this.handleGlobalClick(event);
});
@ -236,39 +216,46 @@ export default {
},
beforeDestroy() {
// 移除全局点击事件监听
uni.$off('globalClick');
uni.$off("globalClick");
// 清除定时器
this.removeTimer();
},
methods: {
toLogin() {
uni.navigateTo({
url: '/pages/passport/login'
url: "/pages/passport/login",
});
},
state(item) {
this.isPopupVisible = item;
},
handleTouchStart(event) {
uni.$emit('globalClick', event);
uni.$emit("globalClick", event);
},
handleGlobalClick(event) {
const query = uni.createSelectorQuery().in(this);
query
.select('.jolkp_l')
.select(".jolkp_l")
// 获取节点的布局位置和尺寸信息
.boundingClientRect((rect) => {
if (rect) {
const clickX = event.clientX || event.touches[0].clientX;
const clickY = event.clientY || event.touches[0].clientY;
if (clickX >= rect.left && clickX <= rect.width + rect.left && clickY >= rect.top && clickY <= rect.top + rect.height * 2) {
if (
clickX >= rect.left &&
clickX <= rect.width + rect.left &&
clickY >= rect.top &&
clickY <= rect.top + rect.height * 2
) {
// this.statue = 0; // 点击在节点范围内，执行相应操作
console.log('点击是在节点范围');
if (this.statue == 2) {
return;
} else {
this.isPopupVisible = !this.isPopupVisible; // 隐藏弹出框
}
} else {
// this.statue = 0; // 点击在节点范围内，执行相应操作
console.log('否');
this.isPopupVisible = false; // 隐藏弹出框
}
}
@ -303,7 +290,7 @@ export default {
const itemJson = encodeURIComponent(JSON.stringify(item));
// 使用 uni.navigateTo 方法跳转到详情页，并传递信息
uni.navigateTo({
url: `/pages/tabbar/im/details/index?item=${itemJson}`
url: `/pages/tabbar/im/details/index?item=${itemJson}`,
});
getMemberstate({ messageId: item.messageId }).then((res) => {
this.getMembermethod();
@ -328,7 +315,7 @@ export default {
getMembermethod() {
const param = {
pageSize: this.pageSize,
pageNumber: this.pageNumber
pageNumber: this.pageNumber,
};
getMember(param).then((res) => {
this.total = res.data.result.total;
@ -338,16 +325,22 @@ export default {
this.meList = this.meList.concat(res.data.result.records);
}
this.swipeStates = new Array(this.meList.length).fill(0);
this.tole = this.meList.filter((item) => item.status === 'UN_READY').length;
this.tole = this.meList.filter(
(item) => item.status === "UN_READY"
).length;
});
},
handleMenu() {
const fn = [...TUICore.getExtensionList(TUIConstants.TUISearch.EXTENSION.SEARCH_MORE.EXT_ID)];
const fn = [
...TUICore.getExtensionList(
TUIConstants.TUISearch.EXTENSION.SEARCH_MORE.EXT_ID
),
];
const item = fn[1];
const {
listener = {
onClicked: () => {}
}
onClicked: () => {},
},
} = item;
listener?.onClicked?.(item);
this.statue = 3;
@ -361,35 +354,35 @@ export default {
this.isPopupVisible = false;
uni.scanCode({
success: (res) => {
console.log('扫码结果:---', res.result);
console.log("扫码结果:---", res.result);
const params = {
userID: res.result //userID
userID: res.result, //userID
};
console.log('params', params);
TUIStore.update(StoreName.CUSTOM, 'currentContactInfo', params);
console.log("params", params);
TUIStore.update(StoreName.CUSTOM, "currentContactInfo", params);
this.statue = 7;
}
},
});
},
startLongPress(item, index) {
this.longPressTimer = setTimeout(() => {
uni.showModal({
title: '确认删除',
content: '确定要删除这条消息吗？',
title: "确认删除",
content: "确定要删除这条消息吗？",
success: (res) => {
if (res.confirm) {
getMemberdelete({ messageId: item.messageId }).then((res) => {
this.getMembermethod();
});
}
}
},
});
}, 2000);
},
endLongPress() {
clearTimeout(this.longPressTimer);
}
}
},
},
};
</script>
@ -436,7 +429,7 @@ page {
.jolkp_l {
width: 1.8rem;
height: 1.8rem;
background-image: url('@/static/im/Frame.png');
background-image: url("@/static/im/Frame.png");
/* 让背景图覆盖整个元素 */
background-size: cover;
/* 背景图不重复 */
@ -448,7 +441,7 @@ page {
.jolkp_h {
width: 1.8rem;
height: 1.8rem;
background-image: url('@/static/im/user.png');
background-image: url("@/static/im/user.png");
/* 让背景图覆盖整个元素 */
background-size: cover;
/* 背景图不重复 */
@ -459,7 +452,7 @@ page {
.jolkp_z {
width: 1.8rem;
height: 1.8rem;
background-image: url('@/static/im/znx.png');
background-image: url("@/static/im/znx.png");
/* 让背景图覆盖整个元素 */
background-size: cover;
/* 背景图不重复 */
@ -503,7 +496,7 @@ page {
.fan {
width: 10%;
height: '100%';
height: "100%";
font-size: 18px;
display: flex;
@ -513,7 +506,7 @@ page {
.fan {
margin-right: 56% !important;
width: 10%;
height: '100%';
height: "100%";
font-size: 18px;
display: flex;
margin-top: 80%;
@ -539,7 +532,7 @@ page {
.three_div1 {
height: 3rem;
width: 40%;
background-image: url('@/static/im/kf.png');
background-image: url("@/static/im/kf.png");
background-size: 100% 100%;
background-repeat: no-repeat;
display: flex;
@ -550,7 +543,7 @@ page {
.three_div2 {
width: 40%;
height: 3rem;
background-image: url('@/static/im/hy.png');
background-image: url("@/static/im/hy.png");
background-size: 100% 100%;
background-repeat: no-repeat;
width: 40%;
@ -558,7 +551,7 @@ page {
.three_div3 {
height: 3rem;
background-image: url('@/static/im/da.png');
background-image: url("@/static/im/da.png");
background-size: 100% 100%;
background-repeat: no-repeat;
width: 40%;

5
utils/request.js
View File

@ -3,9 +3,6 @@ import {
refreshTokenFn
} from "@/api/login.js";
import storage from "@/utils/storage.js";
import {
logout
} from '@/api/login';
import {
md5
} from "@/utils/md5.js";
@ -208,7 +205,6 @@ http.interceptors.response.use(
(response.statusCode == 200 && !response.data.success) ||
response.statusCode == 400
) {
if (response.data.message) {
if (response.data.code == 408) {
uni.showModal({
title: '提示',
@ -232,7 +228,6 @@ http.interceptors.response.use(
duration: 1500,
});
}
}
} else if (response.data.code == 502) {
cleanStorage();
}