修改BUG

This commit is contained in:
cbb
2026-01-15 17:22:20 +08:00
parent 220b12e945
commit cfdc2ea7b0
24 changed files with 569 additions and 83 deletions

7
.env
View File

@@ -1,5 +1,12 @@
# API
VITE_SYSTEM_URL = "http://w6972efb.natappfree.cc"
# VITE_SYSTEM_URL = "https://dev.cqjcteach.cn/prod-api"
# 第三方客户 channelId
VITE_CHANNEL_ID = "7b81ec142eca42baa045820793b821bb"
# 第三方客户 groupId
VITE_GROUP_ID = "793db3a29c7846e198d71a1100d9d67b"
#文档地址
VITE_DOC_URL = "http://f69dbab6.natappfree.cc"

15
App.vue
View File

@@ -1,13 +1,13 @@
<script setup lang="ts">
// #ifdef APP-PLUS
import { setSdkLanguageFromSystem } from '@/uni_modules/tuikit-atomic-x/utils/setSdkLanguageFromSystem'
// #endif
import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
import { reLaunch } from './utils/router'
import { useAuthUser } from './composables/useAuthUser'
import { useUserStore } from './stores/user'
import { TUIChatKit } from './TUIKit'
// #ifdef APP-PLUS
import { setSdkLanguageFromSystem } from '@/uni_modules/tuikit-atomic-x/utils/setSdkLanguageFromSystem'
// #endif
import { getIpBlack } from './api'
TUIChatKit.init()
@@ -38,7 +38,12 @@
console.log('App Show222')
})
onHide(() => {
onHide(async () => {
if (token.value) {
const show = await getIpBlack(false)
console.log(show.data.data, '======')
}
console.log('App Hide333')
})
</script>

View File

@@ -138,3 +138,12 @@ export const getTencentUserSig = () => {
})
}
/** 根据ip判断是否黑名单 */
export const getIpBlack = (loading = true) => {
return http({
url: '/api/free/black/isBlack',
method: 'get',
loading
})
}

View File

@@ -267,3 +267,11 @@ export const getUserNoticeDetail = id => {
method: 'get'
})
}
/** 客服列表 */
export const getUserServiceList = () => {
return http({
url: '/api/service/customerStaff/list',
method: 'get'
})
}

View File

@@ -139,3 +139,20 @@ export const getLiveActivityRecord = id => {
method: 'get'
})
}
/** 直播记录列表 */
export const getLiveRecordList = data => {
return http({
url: `/api/service/imLiveRoom/list`,
method: 'get',
data
})
}
/** 直播记录详情 */
export const getLiveRecordDetail = id => {
return http({
url: `/api/service/imLiveRoom/${id}`,
method: 'get'
})
}

View File

@@ -208,7 +208,7 @@
{
"path": "pages/my-index/meeting-record/index",
"style": {
"navigationBarTitleText": "会议记录",
"navigationBarTitleText": "直播记录",
"navigationBarBackgroundColor": "#ffffff"
}
},
@@ -225,6 +225,12 @@
"navigationBarTitleText": "客服"
}
},
{
"path": "pages/my-index/customer-service/third-party",
"style": {
"navigationBarTitleText": "第三方客服"
}
},
{
"path": "pages/my-index/set-up/index",
"style": {
@@ -323,6 +329,12 @@
"navigationBarTitleText": "拼团记录"
}
},
{
"path": "pages/shop-together/share",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/discover/ranking-list",
"style": {
@@ -400,6 +412,12 @@
"titleNView": false
}
}
},
{
"path": "pages/adduser/index",
"style": {
"navigationBarTitleText": "添加好友"
}
}
],
"globalStyle": {

View File

@@ -126,6 +126,9 @@
<style lang="scss" scoped>
@import '@/styles/global.scss';
page {
background: #f9f9f9;
}
.top-right-name {
font-family: PingFang SC, PingFang SC;
font-weight: 500;
@@ -144,6 +147,7 @@
align-items: center;
padding: 22rpx;
border-bottom: 2rpx solid #f4f4f4;
background: #ffffff;
// margin-bottom: 22rpx;
// padding-bottom: 22rpx;
.left-box {

218
pages/adduser/index.vue Normal file
View File

@@ -0,0 +1,218 @@
<script setup>
import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import TUIChatEngine, {
TUIFriendService,
TUIUserService
} from '@tencentcloud/chat-uikit-engine-lite'
import { useUI } from '../../utils/use-ui'
import { navigateBack } from '@/utils/router'
const { showLoading, hideLoading, showToast } = useUI()
const loading = ref(true)
/** 验证信息输入 */
const verificationInfo = ref('')
/** 备注名 */
const remark = ref('')
/** 用户 id */
const userId = ref('')
/** 好友信息 */
const friendInfo = ref({})
/** 点击查看头像 */
const onViewAvatar = url => {
uni.previewImage({
urls: [url] // 图片路径数组(本地或网络)
})
}
/** 获取好友信息 */
const getFriendInfo = async () => {
loading.value = true
showLoading()
TUIUserService.getUserProfile({
userIDList: [userId.value]
})
.then(res => {
friendInfo.value = res.data[0]
console.log('获取好友信息成功', friendInfo.value)
})
.finally(() => {
loading.value = false
hideLoading()
})
}
const submit = async () => {
// 在这里可以添加提交验证信息的逻辑
let source = 'AddSource_Type_Web' // 来源渠道
// #ifdef H5
source = 'AddSource_Type_H5'
// #endif
// 判断是否为 App5+ App
// #ifdef APP-PLUS
source = 'AddSource_Type_App'
// #endif
showLoading()
await TUIFriendService.addFriend({
to: userId.value,
source,
remark: remark.value || '',
wording: verificationInfo.value,
type: TUIChatEngine.TYPES.SNS_ADD_TYPE_BOTH
})
hideLoading()
await showToast('好友请求已发送', 'success')
navigateBack()
}
onLoad(e => {
userId.value = e?.id || '7616mobile'
getFriendInfo()
})
</script>
<template>
<view v-if="!loading">
<!-- 顶部用户信息 -->
<view class="top-info">
<image
v-if="friendInfo?.avatar"
:src="friendInfo?.avatar"
mode="aspectFill"
class="avatar"
@tap="onViewAvatar(friendInfo?.avatar)"
></image>
<uni-icons v-else type="contact-filled" size="80"></uni-icons>
<view class="right-box">
<text>{{ friendInfo.nick }}</text>
<text>ID: {{ friendInfo.userID }}</text>
<text>
个性签名: {{ friendInfo.selfSignature || '暂无个性签名' }}
</text>
</view>
</view>
<!-- 验证信息输入 -->
<view class="input-wrapper">
<text class="title">请填写验证信息</text>
<textarea
v-model="verificationInfo"
:maxlength="200"
placeholder="请输入验证信息"
class="input-text"
/>
</view>
<!-- 备注 -->
<view class="remark">
<text>备注名</text>
<input
v-model="remark"
:maxlength="80"
placeholder="请输入备注名"
placeholder-class="input-placeholder"
/>
</view>
<!-- 发送申请按钮 -->
<view class="send-btn" @tap="submit">
<text>发送申请</text>
</view>
</view>
</template>
<style scoped lang="scss">
// 背景色
page {
background: #f9f9f9;
}
.send-btn {
margin-top: 20rpx;
background: #ffffff;
padding: 20rpx 32rpx;
text-align: center;
text {
font-size: 28rpx;
color: #2542c0;
}
}
.remark {
margin-top: 20rpx;
background: #ffffff;
padding: 20rpx 32rpx;
display: flex;
justify-content: space-between;
text {
font-size: 28rpx;
color: #333333;
}
input {
width: 80%;
text-align: right;
}
}
.input-wrapper {
margin-top: 20rpx;
background: #ffffff;
padding: 20rpx 32rpx;
display: flex;
flex-direction: column;
.title {
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 28rpx;
color: #333333;
font-style: normal;
text-transform: none;
margin-bottom: 20rpx;
}
.input-text {
width: calc(100% - 40rpx);
border: 2rpx solid #eeeeee;
border-radius: 8rpx;
padding: 20rpx;
}
}
.top-info {
background: #ffffff;
padding: 20rpx 32rpx;
display: flex;
align-items: center;
.avatar {
flex-shrink: 0;
width: 120rpx;
height: 120rpx;
border-radius: 60rpx;
}
.right-box {
height: 100%;
margin-left: 20rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
text {
// 第一个
&:first-child {
font-size: 32rpx;
color: #333333;
}
font-size: 26rpx;
color: #999999;
&:last-child {
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
box-orient: vertical;
line-clamp: 1;
overflow: hidden;
}
}
}
}
</style>

View File

@@ -1,6 +1,9 @@
<script setup>
import { navigateTo } from '@/utils/router'
import { ref } from 'vue'
import { useUI } from '@/utils/use-ui'
const { showDialog } = useUI()
const btnList = [
{ name: '等级排行榜', icon: 'grade' },
@@ -16,6 +19,17 @@
]
const onGo = item => {
// ============测试添加好友===============
// if (item === 'project') {
// navigateTo('/pages/adduser/index')
// return
// }
// ===========================
if (item === 'project') {
showDialog('提示', '外部链接暂未提供', false)
return
}
if (item === 'grade') {
navigateTo('/pages/discover/ranking-list')
return

View File

@@ -21,7 +21,6 @@
onLoad(() => {
getData()
})
</script>
<template>
@@ -93,13 +92,13 @@
<uni-col :span="12">
<view class="table-name">
<image
src="/static/images/public/random2.png"
mode="aspectFit"
:src="item.avatar || '/static/images/public/random2.png'"
mode="aspectFill"
class="left-icon"
></image>
<view class="name">
<text>名字</text>
<text>158****98874</text>
<text>{{ item.userName }}</text>
<text>{{ item.mobile }}</text>
</view>
</view>
</uni-col>
@@ -149,6 +148,7 @@
.left-icon {
width: 64rpx;
height: 64rpx;
border-radius: 64rpx;
margin-right: 8rpx;
}
.name {

View File

@@ -3,11 +3,11 @@
import { onLoad } from '@dcloudio/uni-app'
import { useUI } from '@/utils/use-ui'
import { reLaunch, navigateTo } from '@/utils/router'
import { userLogin } from '@/api'
import { userLogin, getIpBlack } from '@/api'
import { useTokenStore } from '@/stores/token'
import { useUserStore } from '@/stores/user'
const { showToast } = useUI()
const { showToast, showDialog } = useUI()
const { setToken } = useTokenStore()
const { fetchUserInfo } = useUserStore()
@@ -22,13 +22,18 @@
showToast('请同意协议')
return
}
const res = await userLogin({
account: formData.username,
password: formData.password
})
setToken(res.token)
await fetchUserInfo()
reLaunch('/TUIKit/components/TUIConversation/index')
const show = await getIpBlack()
if (show.data.data) {
const res = await userLogin({
account: formData.username,
password: formData.password
})
setToken(res.token)
await fetchUserInfo()
reLaunch('/TUIKit/components/TUIConversation/index')
} else {
showDialog('提示', '当前账号或者IP已被限制登录', false)
}
}
const onRegister = () => {

View File

@@ -1,4 +1,18 @@
<script setup></script>
<script setup>
import { navigateTo } from '@/utils/router'
// import { onLoad } from '@dcloudio/uni-app'
// import { ref } from 'vue'
// import { getUserServiceList } from '@/api/my-index'
// const list = ref([])
// const getList = async () => {
// const res = await getUserServiceList()
// list.value = res.data
// }
// onLoad(() => {
// getList()
// })
</script>
<template>
<view class="customer-service-index">
@@ -9,8 +23,12 @@
class="avatar"
></image>
<text class="tisp">Hi~有什么可以帮到你</text>
<button>第三方客服</button>
<button>APP客服</button>
<button
@tap="navigateTo('/pages/my-index/customer-service/third-party')"
>
第三方客服
</button>
<!-- <button>APP客服</button> -->
</view>
</view>
</template>
@@ -52,7 +70,7 @@
background: linear-gradient(0deg, #00d993 0%, #00d9c5 100%);
border-radius: 16rpx;
box-sizing: border-box;
&:last-child {
&:nth-child(2) {
background: #ffffff;
color: #00d993;
border: 2rpx solid #00d993;

View File

@@ -0,0 +1,35 @@
<script setup>
import { onLoad } from '@dcloudio/uni-app'
import { ref } from 'vue'
import { useAuthUser } from '@/composables/useAuthUser'
const { userInfo } = useAuthUser()
const windowHeight = ref(0)
const url = ref('')
onLoad(() => {
const info = uni.getSystemInfoSync()
windowHeight.value = info.windowHeight - 4
url.value = `https://www.axd01wf.cfd/chat/index?channelId=${
import.meta.env.VITE_CHANNEL_ID
}&groupId=${import.meta.env.VITE_GROUP_ID}&userName=${
userInfo.value.userName
}&phone=${userInfo.value.mobile}&email=${userInfo.value.email}`
})
</script>
<template>
<view :style="{ height: windowHeight + 'px' }" class="webview-box">
<web-view
:fullscreen="false"
:src="url"
style="width: 100%; height: 100%"
></web-view>
</view>
</template>
<style lang="scss" scoped>
.webview-box {
width: 100%;
}
</style>

View File

@@ -1,22 +1,40 @@
<script setup>
import { onLoad } from '@dcloudio/uni-app'
import { getLiveRecordDetail } from '@/api/tui-kit'
import { ref } from 'vue'
const viewData = ref({})
const loading = ref(true)
const getData = async id => {
loading.value = true
const res = await getLiveRecordDetail(id)
viewData.value = res.data
loading.value = false
}
onLoad(e => {
console.log(e, '==')
getData(e.id)
})
</script>
<template>
<view class="details-index">
<view v-if="!loading" class="details-index">
<view class="top-name">
<text class="title">Admin的视频的会议</text>
<text class="title">{{ viewData.roomName }}</text>
<view class="date-box">
<image
src="/static/images/my-index/date-icon.png"
mode="heightFix"
class="icon-img"
></image>
<text class="des">12月14日(周五) 13:45-16:09</text>
<text class="des">开始时间{{ viewData.startTime }}</text>
</view>
<view class="date-box">
<image
src="/static/images/my-index/date-icon.png"
mode="heightFix"
class="icon-img"
></image>
<text class="des">结束时间{{ viewData.endTime }}</text>
</view>
<view class="id-box">
<image
@@ -24,9 +42,9 @@
mode="heightFix"
class="icon-img"
></image>
<text class="des">会议ID8755 8445</text>
<text class="des">会议ID{{ viewData.roomId }}</text>
</view>
<view class="user-box">
<!-- <view class="user-box">
<view class="user-text">
<image
src="/static/images/my-index/user-icon.png"
@@ -45,18 +63,18 @@
<text>名字</text>
</view>
</view>
</view>
</view> -->
</view>
<view v-for="item in 3" class="public-meeting-card">
<view class="public-meeting-card">
<image
src="https://q9.itc.cn/q_70/images01/20241011/856bff05ebe54098ad4af2cb59e02ae8.png"
:src="viewData.coverUrl"
mode="aspectFill"
class="left-img"
></image>
<view class="right-box">
<text>Admin的视频的会议</text>
<text>12月27日13:27</text>
<text>{{ viewData.roomName }}</text>
<text>{{ viewData.startTime }}</text>
</view>
</view>
</view>
@@ -93,13 +111,11 @@
}
.date-box,
.id-box {
margin-top: 12rpx;
display: flex;
align-items: center;
}
.date-box {
margin: 32rpx 0;
}
.user-box {
margin-top: 32rpx;
display: flex;
@@ -137,8 +153,8 @@
}
.public-meeting-card {
margin-top: 47rpx;
padding-top: 47rpx;
margin-top: 27rpx;
padding-top: 27rpx;
border-top: 2rpx solid #f9f9f9;
}
</style>

View File

@@ -1,27 +1,57 @@
<script setup>
import { navigateTo } from '@/utils/router'
import { ref } from 'vue'
import { getLiveRecordList } from '@/api/tui-kit'
const dataList = ref([])
const paging = ref(null)
const getList = async (pageNum, pageSize) => {
console.log(pageSize, '====')
try {
const res = await getLiveRecordList({
pageNum,
pageSize
})
paging.value.complete(res.rows)
} catch (error) {
paging.value.complete(false)
}
}
</script>
<template>
<view class="meeting-record-index">
<view
v-for="item in 3"
class="public-meeting-card"
@click="
navigateTo('/pages/my-index/meeting-record/details', { id: item })
"
>
<image
src="https://q9.itc.cn/q_70/images01/20241011/856bff05ebe54098ad4af2cb59e02ae8.png"
mode="aspectFill"
class="left-img"
></image>
<view class="right-box">
<text>Admin的视频的会议</text>
<text>12月27日13:27</text>
<z-paging
ref="paging"
v-model="dataList"
safe-area-inset-bottom
use-safe-area-placeholder
:default-page-size="15"
@query="getList"
>
<view class="meeting-record-index">
<view
v-for="item in dataList"
:key="item.id"
class="public-meeting-card"
@click="
navigateTo('/pages/my-index/meeting-record/details', {
id: item.id
})
"
>
<image
:src="item.coverUrl"
lazy-load
mode="aspectFill"
class="left-img"
></image>
<view class="right-box">
<text>{{ item.roomName }}</text>
<text>{{ item.createTime }}</text>
</view>
</view>
</view>
</view>
</z-paging>
</template>
<style lang="scss" scoped>

View File

@@ -13,7 +13,7 @@
{ name: '我的团队', icon: 'team', url: '/pages/my-index/my-team' },
// { name: '群创建直播', icon: 'videocam', url: '' },
{
name: '会议记录',
name: '直播记录',
icon: 'meeting',
url: '/pages/my-index/meeting-record/index'
},
@@ -22,11 +22,11 @@
// icon: 'circle',
// url: '/pages/discover/dynamic/dynamic'
// },
{
name: '我的收藏',
icon: 'collection',
url: '/pages/my-index/collection/index'
},
// {
// name: '我的收藏',
// icon: 'collection',
// url: '/pages/my-index/collection/index'
// },
{
name: '在线客服',
icon: 'customer',

View File

@@ -1,4 +1,8 @@
<script setup></script>
<script setup>
import { useAuthUser } from '@/composables/useAuthUser'
const { userInfo } = useAuthUser()
</script>
<template>
<view class="team-index">
@@ -6,7 +10,7 @@
<view class="top-card">
<view class="num-box">
<text>我的团队()</text>
<text>2933</text>
<text>{{ userInfo.teamCount }}</text>
</view>
<image
src="/static/images/my-index/team-bg.png"

View File

@@ -154,13 +154,7 @@
<template>
<view v-if="!stateData.loading">
<nav-bar isTopBg isPlaceholder :title="stateData.title">
<template #right>
<text class="public-navbar__right-btn" @click="onAdd">
{{ formData.id ? '修改' : '添加' }}
</text>
</template>
</nav-bar>
<nav-bar isTopBg isPlaceholder :title="stateData.title"></nav-bar>
<view
v-if="!['101', '102'].includes(stateData.state)"
@@ -208,6 +202,13 @@
></cb-file-picker>
</CardInput>
</view>
<!-- 底部按钮 -->
<bottom-view>
<cb-button @click="onAdd">
{{ formData.id ? '修改' : '添加' }}
</cb-button>
</bottom-view>
</view>
</template>

View File

@@ -94,9 +94,7 @@
<template>
<view class="edit-password">
<nav-bar isTopBg isPlaceholder title="交易密码">
<template #right>
<text class="top-right-name" @click="onEdit">确认</text>
</template>
</nav-bar>
<view v-if="formData.state === '1'" class="input-box">
@@ -123,6 +121,13 @@
type="password"
></CardInput>
</view>
<!-- 底部按钮 -->
<bottom-view>
<cb-button @click="onEdit">
确认
</cb-button>
</bottom-view>
</view>
</template>

View File

@@ -74,6 +74,7 @@
const onTop = id => {
formData.type = id
dataList.value = []
getData(1, formData.pageSize)
}

View File

@@ -2,7 +2,7 @@
import { onLoad } from '@dcloudio/uni-app'
import { GROUP_STATUS } from '@/constants/mall-data'
import { getGroupDetail } from '@/api/mall'
import { navigateBack, redirectTo } from '@/utils/router'
import { navigateBack, navigateTo, redirectTo } from '@/utils/router'
import { ref } from 'vue'
const viewData = ref({})
@@ -21,7 +21,8 @@
}
const onShare = () => {
console.log('分享')
// productId
navigateTo('/pages/shop-together/share')
}
onLoad(e => {

View File

@@ -0,0 +1,59 @@
<script setup></script>
<template>
<view class="share-box">
<nav-bar title="拼单" targetColor="transparent"></nav-bar>
<view class="code-box">
<view class="code-content">
<view class="code">二维码</view>
<view class="btn-box">
<text>分享二维码</text>
<text>保存到本地</text>
</view>
</view>
</view>
</view>
</template>
<style lang="scss" scoped>
.share-box {
height: 100vh;
width: 100vw;
// 导入背景图
background: url('/static/images/discover/share-bg.png');
background-size: 100%;
background-position: center;
background-repeat: no-repeat;
.code-box {
padding-top: 20vh;
display: flex;
justify-content: center;
.code-content {
width: 560rpx;
height: 618rpx;
background: linear-gradient(0deg, #00d993 0%, #00d9c5 100%);
border-radius: 32rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.code {
width: 332rpx;
height: 332rpx;
background: rgb(202, 118, 118);
}
.btn-box {
margin-top: 60rpx;
width: 332rpx;
display: flex;
justify-content: space-between;
font-weight: bold;
font-size: 28rpx;
color: #ffffff;
}
}
}
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 KiB

View File

@@ -11,6 +11,9 @@ import {
setFontSize,
removeFontSize
} from '@/utils/storage'
// #ifdef APP-PLUS
import { useLoginState } from '@/uni_modules/tuikit-atomic-x/state/LoginState'
// #endif
import { useTokenStore } from './token'
import { getUserData, userLogout, updateUserData } from '@/api'
import { ref } from 'vue'
@@ -18,13 +21,11 @@ import { useUI } from '@/utils/use-ui'
import { reLaunch } from '@/utils/router'
import { getTencentUserSig } from '@/api'
import { TUILogin } from '@tencentcloud/tui-core-lite'
// #ifdef APP-PLUS
import { useLoginState } from '@/uni_modules/tuikit-atomic-x/state/LoginState'
// #endif
import { TUIChatEngine } from '@tencentcloud/chat-uikit-engine-lite'
export const useUserStore = defineStore('user', () => {
const { clearToken } = useTokenStore()
const { showDialog } = useUI()
const { showDialog, showToast } = useUI()
const userInfo = ref(
getUserInfoData() ? JSON?.parse(getUserInfoData()) : {}
@@ -71,12 +72,20 @@ export const useUserStore = defineStore('user', () => {
* 登录腾讯 IM
*/
const loginTencentIM = async () => {
await refreshUserInfo()
await TUILogin.login({
SDKAppID: tencentUserSig.value.sdkappID,
userID: tencentUserSig.value.userId,
userSig: tencentUserSig.value.userSig,
framework: `vue3`
})
await TUIChatEngine.login({
SDKAppID: tencentUserSig.value.sdkappID,
userID: tencentUserSig.value.userId,
userSig: tencentUserSig.value.userSig,
useUploadPlugin: true // 使用文件上传插件
})
// #ifdef APP-PLUS
await useLoginState().login({
sdkAppID: tencentUserSig.value.sdkappID,
@@ -92,6 +101,7 @@ export const useUserStore = defineStore('user', () => {
const clearUserInfo = async () => {
const show = await showDialog('提示', '确定要退出登录吗?')
if (show) {
showToast('退出登录成功', 'success')
await userLogout()
await logout()
}
@@ -109,6 +119,7 @@ export const useUserStore = defineStore('user', () => {
await TUILogin.logout().then(() => {
reLaunch('/pages/login/login')
})
await TUIChatEngine.logout()
// #ifdef APP-PLUS
await useLoginState().logout()
// #endif