From ff546bd9a970c117bba86db26051ebe3419349b5 Mon Sep 17 00:00:00 2001 From: pengxiaolong <15716207+pengxiaolong711@user.noreply.gitee.com> Date: Mon, 19 May 2025 18:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 13 +++- .../evaluate/CustomMessage.vue | 13 +--- .../message-elements/message-custom.vue | 7 ++ components/contentList/contentList.vue | 3 +- components/request.js | 28 +++---- components/topNavigation/topNavigation.vue | 20 ++--- pages/Home/Home.vue | 3 + pages/UserInformation/UserInformation.vue | 34 ++------ pages/login/login.vue | 31 ++------ .../evaluate/CustomMessage.js.map | 2 +- .../message-elements/message-custom.js.map | 2 +- .../dist/dev/.sourcemap/mp-weixin/app.js.map | 2 +- .../components/contentList/contentList.js.map | 2 +- .../mp-weixin/components/request.js.map | 2 +- .../topNavigation/topNavigation.js.map | 2 +- .../mp-weixin/pages/Home/Home.js.map | 2 +- .../UserInformation/UserInformation.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../evaluate/CustomMessage.js | 4 +- .../message-elements/message-custom.js | 1 + unpackage/dist/dev/mp-weixin/app.js | 11 ++- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../components/contentList/contentList.wxml | 2 +- .../components/contentList/contentList.wxss | 1 + .../dist/dev/mp-weixin/components/request.js | 4 +- .../components/topNavigation/topNavigation.js | 14 ++-- .../topNavigation/topNavigation.wxml | 2 +- .../topNavigation/topNavigation.wxss | 4 +- .../dist/dev/mp-weixin/pages/Home/Home.js | 3 + .../pages/UserInformation/UserInformation.js | 78 +++++++++---------- .../dist/dev/mp-weixin/pages/login/login.js | 73 ++++++++--------- 31 files changed, 174 insertions(+), 195 deletions(-) diff --git a/App.vue b/App.vue index 404f88e..35e9664 100644 --- a/App.vue +++ b/App.vue @@ -2,6 +2,8 @@ import { TUILogin } from '@tencentcloud/tui-core'; // #ifdef APP-PLUS || H5 import { TUIChatKit } from './TUIKit'; + + TUIChatKit.init(); // #endif @@ -15,10 +17,17 @@ vueVersion = 3; // Deploy production environment please get it from your server. // View https://cloud.tencent.com/document/product/269/32688 uni.$SDKAppID = 1600086550; // Your SDKAppID -uni.$userID = 'oi'; // Your userID -uni.$userSig = 'eJwtzEELwiAYxvHv4jmGWjobdInIwGCHgsFuI529tS1bQ4zou2fbjs-vgf8HnY*nxJseZYgmGC3GDdp0A9Qw8gNmfel75RxolBGOMRacMTw9JjjoTXTGGI3XpAO0f0tX6XJNORdzBWyM2qe9HhTfVabLSQCSt14Wb6NuRVOyC9nL0ssmKLwFsUHfH3s4MI4_'; // Your userSig +uni.$userID = '123'; // Your userID +uni.$userSig = 'eJwtzF0LgjAYhuH-suOQ132K0IkYdGAYOaQOs614GclaI4Lov7fUw*d64P4Q3XTZywZSEpoBWU0bjR0jXnHinLKFn8advUdDylwCQCGFgPmxb4-BJhdC0HTNGvH*N8WVZBx4sVTwlqrq4f2muYQKtj090GPdQhwBtaqHE9OwE1UbBu-2Xe-W5PsDP3YvSw__'; // Your userSig export default { + provide() { + return { + $global: { + lastPage: null + } + } + }, onLaunch: function () { TUILogin.login({ SDKAppID: uni.$SDKAppID, diff --git a/TUIKit/components/TUIChat/message-input-toolbar/evaluate/CustomMessage.vue b/TUIKit/components/TUIChat/message-input-toolbar/evaluate/CustomMessage.vue index 31176df..fbc47a8 100644 --- a/TUIKit/components/TUIChat/message-input-toolbar/evaluate/CustomMessage.vue +++ b/TUIKit/components/TUIChat/message-input-toolbar/evaluate/CustomMessage.vue @@ -22,21 +22,14 @@ import TUIChatConfig from "../../config"; import ToolbarItemContainer from "../toolbar-item-container/index.vue"; import InvitationDark from "../../../../assets/icon/InvitationDark.png"; import InvitationLight from "../../../../assets/icon/InvitationLight.png"; -import { CHAT_MSG_CUSTOM_TYPE } from "../../../../constant"; import { ref } from "vue"; import TUIChatEngine, { - TUITranslateService, TUIStore, StoreName, - IConversationModel, TUIChatService, - SendMessageParams, - SendMessageOptions, } from "@tencentcloud/chat-uikit-engine"; import { isEnabledMessageReadReceiptGlobal } from "../../utils/utils"; -import OfflinePushInfoManager, { - IOfflinePushInfoCreateParams, -} from "../../offlinePushInfoManager/index"; +import OfflinePushInfoManager from "../../offlinePushInfoManager/index"; const evaluateIcon = TUIChatConfig.getTheme() === "dark" ? InvitationDark : InvitationLight; @@ -65,8 +58,8 @@ const submitEvaluate = () => { buttonText1: "接受邀请", buttonText2: "拒绝邀请", }), - description: "", - extension: "", + description: "邀请参加PK", + extension: "邀请参加PK", }; //````````````````````````````````````````````````````` diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue index a0b110c..ba18091 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue @@ -102,11 +102,18 @@ import { CHAT_MSG_CUSTOM_TYPE } from '../../../../constant'; import { ICustomMessagePayload } from '../../../../interface'; import Icon from '../../../common/Icon.vue'; import star from '../../../../assets/icon/star-light.png'; +import TUIChatEngine, { + TUIStore, + StoreName, +} from "@tencentcloud/chat-uikit-engine"; interface Props { messageItem: IMessageModel; content: any; } +//``````````````````````````````````````````````````` +const currentConversation = ref('123'); +//``````````````````````````````````````````````````` const props = withDefaults(defineProps(), { messageItem: undefined, content: undefined, diff --git a/components/contentList/contentList.vue b/components/contentList/contentList.vue index 7aea203..59ebdf7 100644 --- a/components/contentList/contentList.vue +++ b/components/contentList/contentList.vue @@ -14,7 +14,7 @@ 房间ID:{{ item.id }} 魅力值 - {{ item.score }} + {{ item.score }}W @@ -218,5 +218,6 @@ export default { font-size: 23rpx; color: #161616; line-height: 38rpx; + font-weight: 600; } diff --git a/components/request.js b/components/request.js index dbf9a2f..ba9fde5 100644 --- a/components/request.js +++ b/components/request.js @@ -1,15 +1,15 @@ export default function request(urldata) { - const {url, data, method, header,userInfo} = urldata; - const baseUrl = - "http://192.168.0.218:8086" - +url; - console.log("``````````````````````````````````",userInfo); + const { url, data, method, header, userInfo } = urldata; + const baseUrl = + "http://192.168.0.218:8086/" + + url; + console.log("``````````````````````````````````", userInfo); if (userInfo) { uni.getStorage({ key: "userinfo", success: (res) => { - if(res.data){ - if(res.data.nickName){ + if (res.data) { + if (res.data.nickName) { return new Promise((resolve, reject) => { uni.request({ url: baseUrl, @@ -24,16 +24,18 @@ export default function request(urldata) { } }); }); - }else{ - uni.reLaunch({ url: "/pages/UserInformation/UserInformation"}) + } else { + this.$global.lastPage = uni.page.route; + uni.reLaunch({ url: "/pages/UserInformation/UserInformation" }) } - }else{ + } else { + this.$global.lastPage = uni.page.route; uni.navigateTo({ url: '/pages/login/login' }) } } - }); - }else{ - return new Promise((resolve, reject) => { + }); + } else { + return new Promise((resolve, reject) => { uni.request({ url: baseUrl, data: data, diff --git a/components/topNavigation/topNavigation.vue b/components/topNavigation/topNavigation.vue index 3988a2b..cd6559d 100644 --- a/components/topNavigation/topNavigation.vue +++ b/components/topNavigation/topNavigation.vue @@ -1,17 +1,17 @@