From fa0faa6be6e668c31fd6181b5e7c8445a0b781d1 Mon Sep 17 00:00:00 2001
From: cbb <1055026847@qq.com>
Date: Mon, 2 Feb 2026 15:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   2 +-
 .../red-envelope/index.vue                    |   2 -
 .../message-elements/read-status/index.vue    | 357 +++++++++---------
 pages.json                                    |   7 +-
 pages/anchor/index.nvue                       |  22 +-
 pages/discover/discover.vue                   |   2 +-
 pages/my-index/my-index.vue                   |   4 +-
 pages/my-index/my-team.vue                    |   2 +-
 pages/my-index/wallet/invite.vue              |  12 +-
 stores/user.js                                |   4 +-
 10 files changed, 220 insertions(+), 194 deletions(-)

diff --git a/.env b/.env
index 2738c31..50796f8 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # API
-# VITE_SYSTEM_URL = "http://ea252b67.natappfree.cc"
+# VITE_SYSTEM_URL = "http://s7d69cfc.natappfree.cc"
 VITE_SYSTEM_URL = "https://dev.cqjcteach.cn/prod-api"
 
 # 第三方客户 channelId
diff --git a/TUIKit/components/TUIChat/message-input-toolbar/red-envelope/index.vue b/TUIKit/components/TUIChat/message-input-toolbar/red-envelope/index.vue
index d87fe2a..7820e3f 100644
--- a/TUIKit/components/TUIChat/message-input-toolbar/red-envelope/index.vue
+++ b/TUIKit/components/TUIChat/message-input-toolbar/red-envelope/index.vue
@@ -275,7 +275,6 @@
                 :placeholder-style="`font-family: PingFang SC, PingFang SC; font-weight: 500; color: ${
                   errorData.numShow ? '#f56c6c' : '#a9a9a9'
                 }; font-size: 32rpx; font-style: normal; text-transform: none;`"
-                confirm-type="done"
                 type="number"
                 placeholder="填写红包个数"
                 @input="numInput"
@@ -303,7 +302,6 @@
             :placeholder-style="`font-family: PingFang SC, PingFang SC; font-weight: 500; color: ${
               errorData.integralShow ? '#f56c6c' : '#a9a9a9'
             }; font-size: 32rpx; font-style: normal; text-transform: none;`"
-            confirm-type="done"
             type="digit"
             placeholder="0.00"
             @input="monitorInput"
diff --git a/TUIKit/components/TUIChat/message-list/message-elements/read-status/index.vue b/TUIKit/components/TUIChat/message-list/message-elements/read-status/index.vue
index 9c7fba9..38b589e 100644
--- a/TUIKit/components/TUIChat/message-list/message-elements/read-status/index.vue
+++ b/TUIKit/components/TUIChat/message-list/message-elements/read-status/index.vue
@@ -3,8 +3,8 @@
     v-show="isShowReadStatus"
     :class="{
       'message-label': true,
-      'unread': isUseUnreadStyle,
-      'finger-point': isHoverFingerPointer,
+      unread: isUseUnreadStyle,
+      'finger-point': isHoverFingerPointer
     }"
     @click="openReadUserPanel"
   >
@@ -13,188 +13,209 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onMounted, onUnmounted } from '../../../../../adapter-vue';
-import TUIChatEngine, {
-  TUIStore,
-  StoreName,
-  IMessageModel,
-  TUITranslateService,
-} from '@tencentcloud/chat-uikit-engine-lite';
-import TUIChatConfig from '../../../config';
+  import {
+    computed,
+    ref,
+    onMounted,
+    onUnmounted
+  } from '../../../../../adapter-vue'
+  import TUIChatEngine, {
+    TUIStore,
+    StoreName,
+    IMessageModel,
+    TUITranslateService
+  } from '@tencentcloud/chat-uikit-engine-lite'
+  import TUIChatConfig from '../../../config'
 
-interface IProps {
-  message: IMessageModel;
-}
-
-interface IEmits {
-  (e: 'openReadUserPanel'): void;
-}
-
-const emits = defineEmits<IEmits>();
-const props = withDefaults(defineProps<IProps>(), {
-  message: () => ({}) as IMessageModel,
-});
-const ReadStatus = TUIChatConfig.getFeatureConfig('ReadStatus');
-
-enum ReadState {
-  Read,
-  Unread,
-  AllRead,
-  NotShow,
-  PartiallyRead,
-}
-
-const TYPES = TUIChatEngine.TYPES;
-// User-level read receipt toggle has the highest priority.
-const isDisplayMessageReadReceipt = ref<boolean>(TUIStore.getData(StoreName.USER, 'displayMessageReadReceipt'));
-
-onMounted(() => {
-  TUIStore.watch(StoreName.USER, {
-    displayMessageReadReceipt: onDisplayMessageReadReceiptUpdate,
-  });
-});
-
-onUnmounted(() => {
-  TUIStore.unwatch(StoreName.USER, {
-    displayMessageReadReceipt: onDisplayMessageReadReceiptUpdate,
-  });
-});
-
-const isShowReadStatus = computed<boolean>(() => {
-  if (!ReadStatus) {
-    return false;
-  }
-  if (!isDisplayMessageReadReceipt.value) {
-    return false;
-  }
-  const {
-    ID,
-    type,
-    flow,
-    status,
-    hasRiskContent,
-    conversationID,
-    conversationType,
-    needReadReceipt = false,
-  } = props.message;
-
-  // Asynchronous message strike: Determine if there is risky content after the message has been sent
-  if (hasRiskContent) {
-    return false;
+  interface IProps {
+    message: IMessageModel
   }
 
-  const { groupProfile } = TUIStore.getConversationModel(conversationID) || {};
-  // AVCHATROOM and COMMUNITY chats do not display read status
-  if (groupProfile?.type === TYPES.GRP_AVCHATROOM || groupProfile?.type === TYPES.GRP_COMMUNITY) {
-    return false;
+  interface IEmits {
+    (e: 'openReadUserPanel'): void
   }
 
-  if (type === TYPES.MSG_CUSTOM) {
-    const message = TUIStore.getMessageModel(ID);
-    // If it is a signaling message, do not display the read status
-    if (message?.getSignalingInfo() !== null) {
-      return false;
+  const emits = defineEmits<IEmits>()
+  const props = withDefaults(defineProps<IProps>(), {
+    message: () => ({}) as IMessageModel
+  })
+  const ReadStatus = TUIChatConfig.getFeatureConfig('ReadStatus')
+
+  enum ReadState {
+    Read,
+    Unread,
+    AllRead,
+    NotShow,
+    PartiallyRead
+  }
+
+  const TYPES = TUIChatEngine.TYPES
+  // User-level read receipt toggle has the highest priority.
+  const isDisplayMessageReadReceipt = ref<boolean>(
+    TUIStore.getData(StoreName.USER, 'displayMessageReadReceipt')
+  )
+
+  onMounted(() => {
+    TUIStore.watch(StoreName.USER, {
+      displayMessageReadReceipt: onDisplayMessageReadReceiptUpdate
+    })
+  })
+
+  onUnmounted(() => {
+    TUIStore.unwatch(StoreName.USER, {
+      displayMessageReadReceipt: onDisplayMessageReadReceiptUpdate
+    })
+  })
+
+  const isShowReadStatus = computed<boolean>(() => {
+    if (!ReadStatus) {
+      return false
     }
-  }
-
-  // Unsuccessful message: Received messages do not display read status
-  if (flow !== 'out' || status !== 'success') {
-    return false;
-  }
-
-  if (conversationType === 'GROUP') {
-    return needReadReceipt;
-  } else if (conversationType === 'C2C') {
-    return true;
-  }
-  return false;
-});
-
-const readState = computed<ReadState>(() => {
-  const { conversationType, needReadReceipt = false, isPeerRead = false } = props.message;
-  const { readCount = 0, unreadCount = 0, isPeerRead: isReceiptPeerRead = false } = props.message.readReceiptInfo;
-  if (conversationType === 'C2C') {
-    if (needReadReceipt) {
-      return isReceiptPeerRead ? ReadState.Read : ReadState.Unread;
-    } else {
-      return isPeerRead ? ReadState.Read : ReadState.Unread;
+    if (!isDisplayMessageReadReceipt.value) {
+      return false
     }
-  } else if (conversationType === 'GROUP') {
-    if (needReadReceipt) {
-      if (readCount === 0) {
-        return ReadState.Unread;
-      } else if (unreadCount === 0) {
-        return ReadState.AllRead;
-      } else {
-        return ReadState.PartiallyRead;
+    const {
+      ID,
+      type,
+      flow,
+      status,
+      hasRiskContent,
+      conversationID,
+      conversationType,
+      needReadReceipt = false
+    } = props.message
+
+    // Asynchronous message strike: Determine if there is risky content after the message has been sent
+    if (hasRiskContent) {
+      return false
+    }
+
+    const { groupProfile } =
+      TUIStore.getConversationModel(conversationID) || {}
+    // AVCHATROOM and COMMUNITY chats do not display read status
+    if (
+      groupProfile?.type === TYPES.GRP_AVCHATROOM ||
+      groupProfile?.type === TYPES.GRP_COMMUNITY
+    ) {
+      return false
+    }
+
+    if (type === TYPES.MSG_CUSTOM) {
+      const message = TUIStore.getMessageModel(ID)
+      // If it is a signaling message, do not display the read status
+      if (message?.getSignalingInfo() !== null) {
+        return false
       }
-    } else {
-      return ReadState.NotShow;
+    }
+
+    // Unsuccessful message: Received messages do not display read status
+    if (flow !== 'out' || status !== 'success') {
+      return false
+    }
+
+    if (conversationType === 'GROUP') {
+      // return needReadReceipt;
+      return false
+    } else if (conversationType === 'C2C') {
+      return true
+    }
+    return false
+  })
+
+  const readState = computed<ReadState>(() => {
+    const {
+      conversationType,
+      needReadReceipt = false,
+      isPeerRead = false
+    } = props.message
+    const {
+      readCount = 0,
+      unreadCount = 0,
+      isPeerRead: isReceiptPeerRead = false
+    } = props.message.readReceiptInfo
+    if (conversationType === 'C2C') {
+      if (needReadReceipt) {
+        return isReceiptPeerRead ? ReadState.Read : ReadState.Unread
+      } else {
+        return isPeerRead ? ReadState.Read : ReadState.Unread
+      }
+    } else if (conversationType === 'GROUP') {
+      if (needReadReceipt) {
+        if (readCount === 0) {
+          return ReadState.Unread
+        } else if (unreadCount === 0) {
+          return ReadState.AllRead
+        } else {
+          return ReadState.PartiallyRead
+        }
+      } else {
+        return ReadState.NotShow
+      }
+    }
+    return ReadState.Unread
+  })
+
+  const readStatusText = computed(() => {
+    const { readCount = 0 } = props.message.readReceiptInfo
+    switch (readState.value) {
+      case ReadState.Read:
+        return TUITranslateService.t('TUIChat.已读')
+      case ReadState.Unread:
+        return TUITranslateService.t('TUIChat.未读')
+      case ReadState.AllRead:
+        return TUITranslateService.t('TUIChat.全部已读')
+      case ReadState.PartiallyRead:
+        return `${readCount}${TUITranslateService.t('TUIChat.人已读')}`
+      default:
+        return ''
+    }
+  })
+
+  const isUseUnreadStyle = computed(() => {
+    const { conversationType } = props.message
+    if (conversationType === 'C2C') {
+      return readState.value !== ReadState.Read
+    } else if (conversationType === 'GROUP') {
+      return readState.value !== ReadState.AllRead
+    }
+    return false
+  })
+
+  const isHoverFingerPointer = computed<boolean>(() => {
+    return (
+      props.message.needReadReceipt &&
+      props.message.conversationType === 'GROUP' &&
+      (readState.value === ReadState.PartiallyRead ||
+        readState.value === ReadState.Unread)
+    )
+  })
+
+  function openReadUserPanel() {
+    if (isHoverFingerPointer.value) {
+      // emits('openReadUserPanel');
     }
   }
-  return ReadState.Unread;
-});
 
-const readStatusText = computed(() => {
-  const { readCount = 0 } = props.message.readReceiptInfo;
-  switch (readState.value) {
-    case ReadState.Read:
-      return TUITranslateService.t('TUIChat.已读');
-    case ReadState.Unread:
-      return TUITranslateService.t('TUIChat.未读');
-    case ReadState.AllRead:
-      return TUITranslateService.t('TUIChat.全部已读');
-    case ReadState.PartiallyRead:
-      return `${readCount}${TUITranslateService.t('TUIChat.人已读')}`;
-    default:
-      return '';
+  function onDisplayMessageReadReceiptUpdate(isDisplay: boolean) {
+    isDisplayMessageReadReceipt.value = isDisplay
   }
-});
-
-const isUseUnreadStyle = computed(() => {
-  const { conversationType } = props.message;
-  if (conversationType === 'C2C') {
-    return readState.value !== ReadState.Read;
-  } else if (conversationType === 'GROUP') {
-    return readState.value !== ReadState.AllRead;
-  }
-  return false;
-});
-
-const isHoverFingerPointer = computed<boolean>(() => {
-  return (
-    props.message.needReadReceipt
-    && props.message.conversationType === 'GROUP'
-    && (readState.value === ReadState.PartiallyRead || readState.value === ReadState.Unread)
-  );
-});
-
-function openReadUserPanel() {
-  if (isHoverFingerPointer.value) {
-    // emits('openReadUserPanel');
-  }
-}
-
-function onDisplayMessageReadReceiptUpdate(isDisplay: boolean) {
-  isDisplayMessageReadReceipt.value = isDisplay;
-}
 </script>
 
 <style scoped lang="scss">
-.message-label {
-  align-self: flex-end;
-  font-size: 12px;
-  color: #b6b8ba;
-  word-break: keep-all;
-  flex: 0 0 auto;
+  .message-label {
+    align-self: flex-end;
+    font-size: 12px;
+    color: #b6b8ba;
+    word-break: keep-all;
+    flex: 0 0 auto;
 
-  &.unread {
-    color: #679ce1 !important;
+    &.unread {
+      color: #679ce1 !important;
+    }
   }
-}
 
-.finger-point {
-  cursor: pointer;
-  -webkit-tap-highlight-color: transparent;
-}
+  .finger-point {
+    cursor: pointer;
+    -webkit-tap-highlight-color: transparent;
+  }
 </style>
diff --git a/pages.json b/pages.json
index 3e76b35..09da6b4 100644
--- a/pages.json
+++ b/pages.json
@@ -204,7 +204,7 @@
     {
       "path": "pages/my-index/my-team",
       "style": {
-        "navigationBarTitleText": "我的团队",
+        "navigationBarTitleText": "拼团伙伴",
         "navigationBarBackgroundColor": "#ffffff"
       }
     },
@@ -339,7 +339,7 @@
     {
       "path": "pages/shop-together/index",
       "style": {
-        "navigationBarTitleText": "我的拼团"
+        "navigationBarTitleText": "拼团"
       }
     },
     {
@@ -429,7 +429,8 @@
         "backgroundColor": "#000000",
         "navigationBarTextStyle": "white",
         "app-plus": {
-          "titleNView": false
+          "titleNView": false,
+					"popGesture": "none"
         }
       }
     },
diff --git a/pages/anchor/index.nvue b/pages/anchor/index.nvue
index 8fd8de0..49cf2e7 100644
--- a/pages/anchor/index.nvue
+++ b/pages/anchor/index.nvue
@@ -60,11 +60,10 @@
 						<text v-else class="count-text">{{ audienceCount }}</text>
 					</view>
 				</view>
-				<view class="control-icons">
+				<view class="control-icons" @tap="navigateBack()">
 					<!-- <image class="control-icon" src="/static/images/live-share.png" /> -->
 					<image
 						class="control-icon"
-						@tap="navigateBack()"
 						src="/static/images/live-end.png"
 					/>
 				</view>
@@ -811,6 +810,7 @@
 			imDataEndLive(roomDataId.value, audienceCount.value).then(() => {
 				uni.redirectTo({ url: '/pages/liveend/index' })
 			})
+			// ===================原本代码
 			// endLive({
 			// 	success: () => {
 			// 		console.warn(` 退出直播  imDataEndLive`)
@@ -830,8 +830,9 @@
 
 	const roomDataId = ref('')
 	const startLive = async () => {
+		console.log(uni.$liveID, '点击开始直播')
+
 		try {
-			console.log('点击开始直播')
 			const data = {
 				coverUrl: coverURL.value,
 				roomName: liveTitle.value,
@@ -842,8 +843,8 @@
 			uni.$liveID = roomId
 			liveID.value = roomId
 			const res = await imDataStartLive(roomId)
-			console.log(roomData, '========11111')
-			console.log(res, '========22222')
+			console.log('========11111', roomData)
+			console.log('========22222', res)
 			roomDataId.value = roomId
 			const params = {
 				cursor: '', // 首次拉起传空（不能是null),然后根据回调数据的cursor确认是否拉完
@@ -859,9 +860,6 @@
 			console.log(err, '====22')
 		}
 		// ======================原本代码
-		// uni.$liveID = `live_${212211}`
-
-		// console.log(uni?.$liveID, '=====点击开始直播')
 		// createLive({
 		// 	liveInfo: {
 		// 		liveID: uni?.$liveID,
@@ -886,6 +884,8 @@
 		// 		setLocalVideoMuteImage()
 		// 	},
 		// 	fail: (errCode, errMsg) => {
+		// 		console.log('============1111',errCode)
+		// 						console.log('============2222',errMsg)
 		// 		uni.showToast({
 		// 			title: '创建直播间失败'
 		// 		})
@@ -1215,9 +1215,9 @@
 	}
 
 	.control-icon {
-		width: 36rpx;
-		height: 36rpx;
-		margin-left: 16rpx;
+		width: 40rpx;
+		height: 40rpx;
+		margin-left: 20rpx;
 	}
 
 	.live-content {
diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue
index 010a7b0..938263c 100644
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -11,7 +11,7 @@
     { name: '公司介绍', icon: 'company' },
     { name: '朋友圈', icon: 'circle' },
     { name: '线上商城', icon: 'mall' },
-    { name: '我的拼团', icon: 'team' },
+    { name: '我的拼团伙伴', icon: 'team' },
     { name: '项目入口', icon: 'project' },
     { name: '直播列表', icon: 'liveStream' }
   ]
diff --git a/pages/my-index/my-index.vue b/pages/my-index/my-index.vue
index 7672702..985fa4f 100644
--- a/pages/my-index/my-index.vue
+++ b/pages/my-index/my-index.vue
@@ -12,14 +12,12 @@
       icon: 'wallet',
       url: '/pages/my-index/wallet/index'
     },
-    // #ifdef H5
     {
       name: '邀请好友',
       icon: 'user-code',
       url: '/pages/my-index/wallet/invite'
     },
-    // #endif
-    { name: '我的拼团', icon: 'team', url: '/pages/my-index/my-team' },
+    { name: '我的拼团伙伴', icon: 'team', url: '/pages/my-index/my-team' },
     // { name: '群创建直播', icon: 'videocam', url: '' },
     {
       name: '直播记录',
diff --git a/pages/my-index/my-team.vue b/pages/my-index/my-team.vue
index e2fb953..1dd4274 100644
--- a/pages/my-index/my-team.vue
+++ b/pages/my-index/my-team.vue
@@ -9,7 +9,7 @@
     <!-- 顶部卡片 -->
     <view class="top-card">
       <view class="num-box">
-        <text>我的拼团(人)</text>
+        <text>我的拼团伙伴(人)</text>
         <text>{{ userInfo.teamCount }}</text>
       </view>
       <image
diff --git a/pages/my-index/wallet/invite.vue b/pages/my-index/wallet/invite.vue
index e5d776d..fb1111e 100644
--- a/pages/my-index/wallet/invite.vue
+++ b/pages/my-index/wallet/invite.vue
@@ -8,7 +8,7 @@
     const { origin } = window.location
     return `${origin}/pages/login/phone-register/phone-register?invitationCode=${userInfo.value.invitationCode}`
   })
- 
+
   // 复制文本通用函数
   const copyText = text => {
     uni.setClipboardData({
@@ -42,7 +42,7 @@
           </button>
         </view>
       </view>
-
+      <!-- #ifdef H5 -->
       <view class="divider"></view>
 
       <view class="card-item">
@@ -54,11 +54,19 @@
           </button>
         </view>
       </view>
+      <!-- #endif -->
     </view>
 
+    <!-- #ifdef H5 -->
+    <view class="share-tips">
+      <text>将邀请码发送给好友即可完成邀请</text>
+    </view>
+    <!-- #endif -->
+    <!-- #ifdef APP-NVUE -->
     <view class="share-tips">
       <text>将链接或邀请码发送给好友即可完成邀请</text>
     </view>
+    <!-- #endif -->
 
     <!-- 可选：添加分享按钮（如微信、朋友圈等） -->
     <!-- <button class="share-btn">分享到微信</button> -->
diff --git a/stores/user.js b/stores/user.js
index 8c016fb..dacb067 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -110,13 +110,13 @@ export const useUserStore = defineStore('user', () => {
 
     // #ifdef APP-PLUS
     await useLoginState().login({
-      sdkappID: tencentUserSig.value.sdkappID,
+      sdkAppID: tencentUserSig.value.sdkappID,
       userID: tencentUserSig.value.userId,
       userSig: tencentUserSig.value.userSig
     })
     uni.$TUICallKit = uni.requireNativePlugin('TencentCloud-TUICallKit')
 
-    console.log(uni.$TUICallKit, "TUICallKit ｜ ok"); // 本地日志 
+    console.log(uni.$TUICallKit, "TUICallKit ｜ ok"); // 本地日志
     // try {
     //   await uni.$TUICallKit.login({
     //     SDKAppID: tencentUserSig.value.sdkappID,