From ad658710f7a03aa73508b606904b67e97203a855 Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Thu, 26 Dec 2024 17:02:48 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=B9=B6=E6=8E=A5=E5=85=A5=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/api/search/index.js | 11 ++ src/pages.json | 8 + src/pages/index/index.vue | 8 +- src/pages/search/components/searchItem.vue | 166 +++++++++++++++++++ src/pages/search/index.vue | 179 +++++++++++++++++++++ src/static/css/color.scss | 4 +- src/static/css/font.scss | 3 + src/static/image/search/search-no-data.png | Bin 0 -> 27001 bytes src/uni_modules/tmui/locale/zh-Hans.json | 152 ++++++++--------- 10 files changed, 456 insertions(+), 76 deletions(-) create mode 100644 src/api/search/index.js create mode 100644 src/pages/search/components/searchItem.vue create mode 100644 src/pages/search/index.vue create mode 100644 src/static/css/font.scss create mode 100644 src/static/image/search/search-no-data.png diff --git a/src/App.vue b/src/App.vue index 1d8d768..b29303b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,6 +18,7 @@ init() diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue new file mode 100644 index 0000000..f408bee --- /dev/null +++ b/src/pages/search/index.vue @@ -0,0 +1,179 @@ + + + diff --git a/src/static/css/color.scss b/src/static/css/color.scss index 17e5143..c3b492d 100644 --- a/src/static/css/color.scss +++ b/src/static/css/color.scss @@ -1 +1,3 @@ -$theme-primary: #46299D; +$theme-primary: #46299d; +$theme-text: #191919; +$theme-hint-text: #999999; diff --git a/src/static/css/font.scss b/src/static/css/font.scss new file mode 100644 index 0000000..313323c --- /dev/null +++ b/src/static/css/font.scss @@ -0,0 +1,3 @@ +.font-regular { + font-weight: 400; +} diff --git a/src/static/image/search/search-no-data.png b/src/static/image/search/search-no-data.png new file mode 100644 index 0000000000000000000000000000000000000000..af19a6ed82b148f9faa329d0c31f7eda1109da3c GIT binary patch literal 27001 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 z Date: Fri, 27 Dec 2024 16:57:32 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E5=86=85=E5=AE=B9=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B9=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 62 +++---- src/pages/search/components/highLightText.vue | 70 ++++++++ src/pages/search/components/searchItem.vue | 163 +++++++++--------- src/pages/search/index.vue | 42 ++++- src/static/css/color.scss | 1 + src/uni_modules/tmui/locale/zh-Hans.json | 5 +- 7 files changed, 230 insertions(+), 115 deletions(-) create mode 100644 src/pages/search/components/highLightText.vue diff --git a/package.json b/package.json index ccf5355..fb66a73 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "quill-mention": "^6.0.2", "vconsole": "^3.15.1", "vue": "^3.3.8", - "vue-i18n": "^9.6.5" + "vue-i18n": "11.0.0-rc.1" }, "devDependencies": { "@dcloudio/types": "^3.4.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 26ae4d6..591bdda 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,8 +93,8 @@ importers: specifier: ^3.3.8 version: 3.4.35(typescript@5.5.4) vue-i18n: - specifier: ^9.6.5 - version: 9.13.1(vue@3.4.35(typescript@5.5.4)) + specifier: 11.0.0-rc.1 + version: 11.0.0-rc.1(vue@3.4.35(typescript@5.5.4)) devDependencies: '@dcloudio/types': specifier: ^3.4.7 @@ -1391,26 +1391,26 @@ packages: '@iconify/utils@2.1.32': resolution: {integrity: sha512-LeifFZPPKu28O3AEDpYJNdEbvS4/ojAPyIW+pF/vUpJTYnbTiXUHkCh0bwgFRzKvdpb8H4Fbfd/742++MF4fPQ==} + '@intlify/core-base@11.0.0-rc.1': + resolution: {integrity: sha512-fnfZoa9pb1dKM3L1UkDUGLLrPFQ2BK98x4/fMqwS/fktUor34vQR/itPtfv652ZTplenXXLCEYjUYTGfDZgMTQ==} + engines: {node: '>= 16'} + '@intlify/core-base@9.1.9': resolution: {integrity: sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==} engines: {node: '>= 10'} - '@intlify/core-base@9.13.1': - resolution: {integrity: sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==} - engines: {node: '>= 16'} - '@intlify/devtools-if@9.1.9': resolution: {integrity: sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==} engines: {node: '>= 10'} + '@intlify/message-compiler@11.0.0-rc.1': + resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==} + engines: {node: '>= 16'} + '@intlify/message-compiler@9.1.9': resolution: {integrity: sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==} engines: {node: '>= 10'} - '@intlify/message-compiler@9.13.1': - resolution: {integrity: sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==} - engines: {node: '>= 16'} - '@intlify/message-resolver@9.1.9': resolution: {integrity: sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==} engines: {node: '>= 10'} @@ -1419,14 +1419,14 @@ packages: resolution: {integrity: sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==} engines: {node: '>= 10'} + '@intlify/shared@11.0.0-rc.1': + resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==} + engines: {node: '>= 16'} + '@intlify/shared@9.1.9': resolution: {integrity: sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==} engines: {node: '>= 10'} - '@intlify/shared@9.13.1': - resolution: {integrity: sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==} - engines: {node: '>= 16'} - '@intlify/vue-devtools@9.1.9': resolution: {integrity: sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==} engines: {node: '>= 10'} @@ -4819,8 +4819,8 @@ packages: '@vue/composition-api': optional: true - vue-i18n@9.13.1: - resolution: {integrity: sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==} + vue-i18n@11.0.0-rc.1: + resolution: {integrity: sha512-qbdCbA537HEdr2yXQ4ec/OMDsoHjod1DwnWbrf+l4Cu/O7CYTCKsOyITUm3RmrCJgRnoVycuR6i/JWdNTJvD5g==} engines: {node: '>= 16'} peerDependencies: vue: ^3.0.0 @@ -6730,6 +6730,11 @@ snapshots: transitivePeerDependencies: - supports-color + '@intlify/core-base@11.0.0-rc.1': + dependencies: + '@intlify/message-compiler': 11.0.0-rc.1 + '@intlify/shared': 11.0.0-rc.1 + '@intlify/core-base@9.1.9': dependencies: '@intlify/devtools-if': 9.1.9 @@ -6739,26 +6744,21 @@ snapshots: '@intlify/shared': 9.1.9 '@intlify/vue-devtools': 9.1.9 - '@intlify/core-base@9.13.1': - dependencies: - '@intlify/message-compiler': 9.13.1 - '@intlify/shared': 9.13.1 - '@intlify/devtools-if@9.1.9': dependencies: '@intlify/shared': 9.1.9 + '@intlify/message-compiler@11.0.0-rc.1': + dependencies: + '@intlify/shared': 11.0.0-rc.1 + source-map-js: 1.2.0 + '@intlify/message-compiler@9.1.9': dependencies: '@intlify/message-resolver': 9.1.9 '@intlify/shared': 9.1.9 source-map: 0.6.1 - '@intlify/message-compiler@9.13.1': - dependencies: - '@intlify/shared': 9.13.1 - source-map-js: 1.2.0 - '@intlify/message-resolver@9.1.9': {} '@intlify/runtime@9.1.9': @@ -6767,9 +6767,9 @@ snapshots: '@intlify/message-resolver': 9.1.9 '@intlify/shared': 9.1.9 - '@intlify/shared@9.1.9': {} + '@intlify/shared@11.0.0-rc.1': {} - '@intlify/shared@9.13.1': {} + '@intlify/shared@9.1.9': {} '@intlify/vue-devtools@9.1.9': dependencies: @@ -10890,10 +10890,10 @@ snapshots: dependencies: vue: 3.4.35(typescript@5.5.4) - vue-i18n@9.13.1(vue@3.4.35(typescript@5.5.4)): + vue-i18n@11.0.0-rc.1(vue@3.4.35(typescript@5.5.4)): dependencies: - '@intlify/core-base': 9.13.1 - '@intlify/shared': 9.13.1 + '@intlify/core-base': 11.0.0-rc.1 + '@intlify/shared': 11.0.0-rc.1 '@vue/devtools-api': 6.6.3 vue: 3.4.35(typescript@5.5.4) diff --git a/src/pages/search/components/highLightText.vue b/src/pages/search/components/highLightText.vue new file mode 100644 index 0000000..2839885 --- /dev/null +++ b/src/pages/search/components/highLightText.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/pages/search/components/searchItem.vue b/src/pages/search/components/searchItem.vue index 62807dd..883800f 100644 --- a/src/pages/search/components/searchItem.vue +++ b/src/pages/search/components/searchItem.vue @@ -5,17 +5,21 @@
- - {{ resultName }} - +
{{ resultType }}
- - {{ resultDetail }} - +
@@ -24,109 +28,108 @@ import zu4992 from '@/static/image/chatList/zu4992@2x.png' import zu4991 from '@/static/image/chatList/zu4991@2x.png' import zu4989 from '@/static/image/chatList/zu4989@2x.png' -import { - ref, - watch, - computed, - onMounted, - onUnmounted, - reactive, - getCurrentInstance, -} from 'vue' -const { proxy } = getCurrentInstance() +import zu5296 from '@/static/image/chatList/zu5296@2x.png' +import { ref, watch, computed, onMounted, onUnmounted, reactive } from 'vue' +import HighlightText from './highLightText.vue' +import { useI18n } from 'vue-i18n' +const { t } = useI18n() const props = defineProps({ searchItem: Object | Number, searchResultKey: String, + searchText: String, }) +// 映射表-查找对应结构下的属性名 +const keyMapping = { + user_infos: { avatar: 'avatar', name: 'nickname' }, + group_infos: { avatar: 'avatar', name: 'name' }, + group_member_infos: { + avatar: 'group_avatar', + name: 'group_name', + detailKey: 'user_name', + }, + general_infos: { + avatar: 'receiver_avatar', + name: 'receiver_name', + detailKey: 'count', + }, +} +//获取key对应值 +const getKeyValue = (keys) => { + let keyValue = '' + if (keys) { + keyValue = props.searchItem[keys] + } + return keyValue +} +//头像 const avatarImg = computed(() => { - let srcT = '' - switch (props.searchItem?.group_type) { - case 0: - srcT = zu5296 - break - case 1: - srcT = zu4992 - break - case 2: - srcT = zu4991 - break - case 3: - srcT = zu4989 - break - default: - srcT = zu4992 + let avatar = getKeyValue(keyMapping[props.searchResultKey]?.avatar) + if (!avatar) { + avatar = groupTypeMapping[props.searchItem?.group_type]?.defaultImg } - return srcT + return avatar }) +//名称 const resultName = computed(() => { - let data_key = '' - switch (props.searchResultKey) { - case 'user_infos': - data_key = props.searchItem?.nickname - break - case 'group_member_infos': - data_key = props.searchItem?.group_name - break - case 'general_infos': - data_key = props.searchItem?.receiver_name - break - default: - data_key = '' - } - return data_key + return getKeyValue(keyMapping[props.searchResultKey]?.name) }) +// 映射表-根据groupType设置对应值 +const groupTypeMapping = { + 0: {}, + 1: { + defaultImg: zu4992, + }, + 2: { + result_type: t('index.mine.department'), + defaultImg: zu4989, + }, + 3: { + result_type: t('index.mine.project'), + defaultImg: zu4991, + }, + 4: { + defaultImg: zu5296, + }, +} +//群类型tag const resultType = computed(() => { - let result_type = '' - switch (props.searchItem?.group_type) { - case 0: - result_type = '' - break - case 1: - result_type = '' - break - case 2: - result_type = proxy.$t('index.mine.department') - break - case 3: - result_type = proxy.$t('index.mine.project') - break - case 4: - result_type = '' - break - default: - result_type = '' - } - return result_type + return groupTypeMapping[props.searchItem?.group_type]?.result_type }) +//详细内容 const resultDetail = computed(() => { - let data_key = '' - switch (props.searchResultKey) { - case 'user_infos': - data_key = '' + let result_detail = + props.searchItem[keyMapping[props.searchResultKey]?.detailKey] + switch (keyMapping[props.searchResultKey]?.detailKey) { + case 'count': + result_detail = result_detail + t('search.chat.count') break - case 'group_member_infos': - data_key = '' - break - case 'general_infos': - data_key = props.searchItem?.count + proxy.$t('search.chat.count') + case 'user_name': + result_detail = t('search.result.include') + result_detail break default: - data_key = '' + result_detail = '' } - return data_key + return result_detail }) diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue index 97ed4fc..4b15dae 100644 --- a/src/pages/search/index.vue +++ b/src/pages/search/index.vue @@ -33,19 +33,42 @@ searchResultIndex) in state.searchResult" :key="searchResultKey" > -
- {{ getResultKeysValue(searchResultKey) }} +
+
+ + {{ getResultKeysValue(searchResultKey) }} + +
+
+
+ +
+
+
+ + {{ getHasMoreResult(searchResultKey) }} + +
-
- -
-
@@ -65,6 +88,7 @@ import { ServeSeachQueryAll } from '@/api/search/index' import { ref, watch, computed, onMounted, onUnmounted, reactive } from 'vue' import { useAuth } from '@/store/auth' import { useI18n } from 'vue-i18n' +import { nextTick } from 'process' const { t } = useI18n() const state = reactive({ searchText: '', //搜索内容 @@ -92,6 +116,9 @@ const getResultKeysValue = (keys) => { case 'group_member_infos': resultKey = t('chat.type.group') break + case 'combinedGroup': + resultKey = t('chat.type.group') + break case 'general_infos': resultKey = t('chat.type.record') break @@ -101,6 +128,49 @@ const getResultKeysValue = (keys) => { return resultKey } +//是否还有更多数据 +const getHasMoreResult = (searchResultKey) => { + let has_more_result = '' + switch (searchResultKey) { + case 'user_infos': + if ( + state.searchResult['user_count'] && + state.searchResult['user_count'] > 3 + ) { + has_more_result = t('has_more') + t('index.mine.addressBook') + } + break + case 'group_infos': + if ( + state.searchResult['group_count'] && + state.searchResult['group_count'] > 3 + ) { + has_more_result = t('has_more') + t('chat.type.group') + } + break + case 'group_member_infos': + if ( + state.searchResult['group_count'] && + state.searchResult['group_count'] > 3 + ) { + has_more_result = t('has_more') + t('chat.type.group') + } + break + case 'combinedGroup': + if ( + state.searchResult['group_count'] && + state.searchResult['group_count'] > 3 + ) { + has_more_result = t('has_more') + t('chat.type.group') + } + break + case 'general_infos': + break + default: + } + return has_more_result +} + // ES搜索聊天记录-主页搜索什么都有 const queryAllSearch = (searchText) => { let params = { @@ -111,6 +181,40 @@ const queryAllSearch = (searchText) => { resp.then(({ code, data }) => { console.log(data) if (code == 200) { + // data.group_infos = [ + // { + // id: 888898, + // type: 4, + // name: '泰丰国际', + // avatar: '', //群头像 + // created_at: '2024-10-31 14:31:11', + // group_num: 730, + // }, + // ] + if ((data.user_infos || []).length > 0) { + ;(data.user_infos || []).forEach((item) => { + item.group_type = 0 + }) + } + if ((data.group_infos || []).length > 0) { + ;(data.group_infos || []).forEach((item) => { + item.group_type = item.type + item.groupTempType = 'group_infos' + }) + } + if ((data.group_member_infos || []).length > 0) { + ;(data.group_member_infos || []).forEach((item) => { + item.groupTempType = 'group_member_infos' + }) + } + let tempGeneral_infos = Array.isArray(data.general_infos) + ? [...data.general_infos] + : data.general_infos + delete data.general_infos + data.combinedGroup = (data.group_infos || []).concat( + data.group_member_infos || [], + ) + data.general_infos = tempGeneral_infos state.searchResult = data } else { } @@ -186,9 +290,19 @@ page { margin: 46rpx 0 0; .result-title { - line-height: 40rpx; padding: 0 0 10rpx; - color: $theme-hint-text; + span { + line-height: 40rpx; + color: $theme-hint-text; + } + } + .result-has-more { + padding: 10px 0; + border-bottom: 1px solid $theme-border-color; + span { + color: #191919; + line-height: 40rpx; + } } } } diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json index a67286d..5552323 100644 --- a/src/uni_modules/tmui/locale/zh-Hans.json +++ b/src/uni_modules/tmui/locale/zh-Hans.json @@ -79,5 +79,7 @@ "index.mine.project": "项目", "chat.type.group": "群聊", "chat.type.record": "聊天记录", - "search.result.include": "包含:" + "search.result.include": "包含:", + "has_more": "更多", + "index.type.company": "公司" } From 3109e74a41536d447e196255dfb0ea7c4feb7950 Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Mon, 30 Dec 2024 17:03:40 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E9=A1=B5=EF=BC=9B=E5=B0=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8=E5=B0=81?= =?UTF-8?q?=E8=A3=85=E7=BB=84=E4=BB=B6=EF=BC=9B=E6=8E=A5=E5=85=A5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95-=E7=BE=A4?= =?UTF-8?q?=E4=B8=8E=E7=94=A8=E6=88=B7=E6=A6=82=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/search/index.js | 9 ++ src/pages.json | 8 + src/pages/search/components/searchList.vue | 22 ++- src/pages/search/index.vue | 174 +-------------------- src/pages/search/moreResult/moreResult.vue | 156 ++++++++++++++++++ 5 files changed, 199 insertions(+), 170 deletions(-) create mode 100644 src/pages/search/moreResult/moreResult.vue diff --git a/src/api/search/index.js b/src/api/search/index.js index 6ad3d50..3fe5dbe 100644 --- a/src/api/search/index.js +++ b/src/api/search/index.js @@ -9,3 +9,12 @@ export const ServeSeachQueryAll = (data) => { data, }) } + +// ES搜索聊天记录-指定用户、指定群、群与用户概览 +export const ServeTalkRecord = (data) => { + return request({ + url: '/api/v1/elasticsearch/query-talk-record', + method: 'POST', + data, + }) +} diff --git a/src/pages.json b/src/pages.json index e79e9b1..85387a9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -66,6 +66,14 @@ "navigationStyle": "custom", "enablePullDownRefresh":false } + }, + { + "path": "pages/search/moreResult/moreResult", + "type": "page", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh":false + } } diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue index 44034b4..cb1eae9 100644 --- a/src/pages/search/components/searchList.vue +++ b/src/pages/search/components/searchList.vue @@ -36,7 +36,11 @@ >
-
+
{{ getHasMoreResult(searchResultKey) }} @@ -126,9 +130,25 @@ const getHasMoreResult = (searchResultKey) => { } return has_more_result } + +//点击跳转到更多结果页面 +const toMoreResultPage = (searchResultKey) => { + uni.navigateTo({ + url: + '/pages/search/moreResult/moreResult?searchResultKey=' + + searchResultKey + + '&searchText=' + + props.searchText, + }) +} diff --git a/src/pages/search/moreResult/moreResult.vue b/src/pages/search/moreResult/moreResult.vue new file mode 100644 index 0000000..c3bb605 --- /dev/null +++ b/src/pages/search/moreResult/moreResult.vue @@ -0,0 +1,156 @@ + + + From 82d6d529baf43ba6c80741cc89a15f50d27c21dd Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Tue, 31 Dec 2024 11:04:11 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8F=8A=E5=AD=90=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=85=A5zPaging?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/search/index.js | 18 ++ src/pages/search/components/searchList.vue | 35 +--- src/pages/search/index.vue | 150 +++++++------- src/pages/search/moreResult/moreResult.vue | 185 +++++++++++++----- .../search/moreResult/moreResultDetail.vue | 0 5 files changed, 241 insertions(+), 147 deletions(-) create mode 100644 src/pages/search/moreResult/moreResultDetail.vue diff --git a/src/api/search/index.js b/src/api/search/index.js index 3fe5dbe..30f7fd1 100644 --- a/src/api/search/index.js +++ b/src/api/search/index.js @@ -10,6 +10,24 @@ export const ServeSeachQueryAll = (data) => { }) } +// ES搜索用户数据 +export const ServeQueryUser = (data) => { + return request({ + url: '/api/v1/elasticsearch/query-user', + method: 'POST', + data, + }) +} + +// ES搜索群组数据 +export const ServeQueryGroup = (data) => { + return request({ + url: '/api/v1/elasticsearch/query-group', + method: 'POST', + data, + }) +} + // ES搜索聊天记录-指定用户、指定群、群与用户概览 export const ServeTalkRecord = (data) => { return request({ diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue index cb1eae9..42d0461 100644 --- a/src/pages/search/components/searchList.vue +++ b/src/pages/search/components/searchList.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue index 42d0461..67b59a8 100644 --- a/src/pages/search/components/searchList.vue +++ b/src/pages/search/components/searchList.vue @@ -1,65 +1,282 @@ + diff --git a/src/pages/search/moreResult/moreResult.vue b/src/pages/search/moreResult/moreResult.vue index 3332f73..3b99442 100644 --- a/src/pages/search/moreResult/moreResult.vue +++ b/src/pages/search/moreResult/moreResult.vue @@ -1,65 +1,20 @@ - + diff --git a/src/pages/search/moreResult/moreResultDetail.vue b/src/pages/search/moreResult/moreResultDetail.vue index e69de29..e493eb7 100644 --- a/src/pages/search/moreResult/moreResultDetail.vue +++ b/src/pages/search/moreResult/moreResultDetail.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/static/image/search/search-item-pointer.png b/src/static/image/search/search-item-pointer.png new file mode 100644 index 0000000000000000000000000000000000000000..c026df4146f5689e68f85891cbea6b0a5fbee790 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^+(0bE!3-pKt-j(8q!^2X+?^QKos)S9f)G&v$uk##nH^oNYr! zP(Q;o-&dLkcAZ?#5TUx?@_^pT;|#x_7_;6mS;>9CawXdV&6QOLG%NWVy+6HTI=~!g5kzC#(%1^oKs7y7GD8c$l&Sf=d#Wzp$PyaQI&`Q literal 0 HcmV?d00001 diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json index 5552323..299741d 100644 --- a/src/uni_modules/tmui/locale/zh-Hans.json +++ b/src/uni_modules/tmui/locale/zh-Hans.json @@ -81,5 +81,6 @@ "chat.type.record": "聊天记录", "search.result.include": "包含:", "has_more": "更多", - "index.type.company": "公司" + "index.type.company": "公司", + "search.result.relevant": "相关" } From 3824ab7638b3c945646e3ab94d6079eeaf39f96c Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Thu, 2 Jan 2025 16:01:36 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B=E8=81=8A=E5=A4=A9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=9A=84=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=E6=96=B0=E5=A2=9E=E8=81=8A=E5=A4=A9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 8 + .../components/settingFormItem.vue | 73 +++ src/pages/chatSettings/index.vue | 494 ++++++++++++++++++ src/pages/dialog/index.vue | 9 +- src/pages/search/components/searchItem.vue | 2 +- src/pages/search/components/searchList.vue | 19 +- src/pages/search/moreResult/moreResult.vue | 10 +- .../search/moreResult/moreResultDetail.vue | 19 + src/static/image/chatSettings/edit-btn.png | Bin 0 -> 519 bytes src/static/image/chatSettings/pointer.png | Bin 0 -> 370 bytes .../chatSettings/recordSearchTypeDate.png | Bin 0 -> 1890 bytes .../chatSettings/recordSearchTypeFiles.png | Bin 0 -> 2128 bytes .../recordSearchTypeGroupMembers.png | Bin 0 -> 1880 bytes .../recordSearchTypeImgAndVideo.png | Bin 0 -> 2117 bytes .../chatSettings/recordSearchTypeLink.png | Bin 0 -> 2298 bytes src/uni_modules/tmui/locale/zh-Hans.json | 20 +- 16 files changed, 647 insertions(+), 7 deletions(-) create mode 100644 src/pages/chatSettings/components/settingFormItem.vue create mode 100644 src/pages/chatSettings/index.vue create mode 100644 src/static/image/chatSettings/edit-btn.png create mode 100644 src/static/image/chatSettings/pointer.png create mode 100644 src/static/image/chatSettings/recordSearchTypeDate.png create mode 100644 src/static/image/chatSettings/recordSearchTypeFiles.png create mode 100644 src/static/image/chatSettings/recordSearchTypeGroupMembers.png create mode 100644 src/static/image/chatSettings/recordSearchTypeImgAndVideo.png create mode 100644 src/static/image/chatSettings/recordSearchTypeLink.png diff --git a/src/pages.json b/src/pages.json index 31a6aca..ce3ce4c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -82,6 +82,14 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path": "pages/chatSettings/index", + "type": "page", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue new file mode 100644 index 0000000..2ea0871 --- /dev/null +++ b/src/pages/chatSettings/components/settingFormItem.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue new file mode 100644 index 0000000..77e8136 --- /dev/null +++ b/src/pages/chatSettings/index.vue @@ -0,0 +1,494 @@ + + + diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue index c779c98..f7ee122 100644 --- a/src/pages/dialog/index.vue +++ b/src/pages/dialog/index.vue @@ -8,7 +8,7 @@
@@ -680,6 +680,13 @@ const initData = async () => { zpagingRef.value?.complete(records.value) } +//点击跳转到聊天设置页面 +const toChatSettingsPage = () => { + uni.navigateTo({ + url: '/pages/chatSettings/index' + }) +} + onMounted(async () => { initData() }) diff --git a/src/pages/search/components/searchItem.vue b/src/pages/search/components/searchItem.vue index 0258d60..d1ca369 100644 --- a/src/pages/search/components/searchItem.vue +++ b/src/pages/search/components/searchItem.vue @@ -228,7 +228,7 @@ const resultDetail = computed(() => { result_detail = t('search.result.include') + result_detail break case 'extra': - result_detail = JSON.parse(props.searchItem?.extra).content + result_detail = props.searchItem?.extra break default: result_detail = '' diff --git a/src/pages/search/components/searchList.vue b/src/pages/search/components/searchList.vue index 67b59a8..fb6401d 100644 --- a/src/pages/search/components/searchList.vue +++ b/src/pages/search/components/searchList.vue @@ -29,8 +29,11 @@ :round="1" prefix="tmicon-search" prefixColor="#46299D" + :prefixLabel="state?.first_talk_record_infos?.receiver_name" v-model.lazy="state.searchText" @input="inputSearchText" + :showClear="true" + @clear="clearInput" > { } }) +//清除输入的搜索内容 +const clearInput = () => { + inputSearchText('') +} + //输入搜索文本 const inputSearchText = (e) => { // console.log(e) @@ -254,7 +262,11 @@ const queryAllSearch = (pageNum, searchResultPageSize) => { data.last_group_id, data.last_member_id, ) - zPaging.value?.completeByTotal([data], data.count) + let total = data.count + if (props.searchRecordDetail) { + total = data.group_record_count + } + zPaging.value?.completeByTotal([data], total) } else { zPaging.value?.complete([data]) } @@ -377,6 +389,11 @@ const clickSearchItem = (searchResultKey, searchItem) => { width: 100%; } + .searchRoot_input::v-deep .tmicon-times-circle-fill::before { + content: '\e82a'; + color: #d2d2d5; + } + .searchRoot_cancelBtn { line-height: 44rpx; color: $theme-primary; diff --git a/src/pages/search/moreResult/moreResult.vue b/src/pages/search/moreResult/moreResult.vue index 3b99442..d946698 100644 --- a/src/pages/search/moreResult/moreResult.vue +++ b/src/pages/search/moreResult/moreResult.vue @@ -28,11 +28,13 @@ const state = reactive({ apiRequest: Function, apiParams: String, searchText: String, + searchResultKey: String, }) onLoad((options) => { console.log(options) if (options.searchResultKey) { + state.searchResultKey = options.searchResultKey if (options.searchResultKey === 'user_infos') { state.apiParams = encodeURIComponent( JSON.stringify({ @@ -85,9 +87,11 @@ const lastIdChange = (last_id, last_group_id, last_member_id) => { //点击了搜索结果项 const clickSearchItem = (searchText) => { - uni.navigateTo({ - url: '/pages/search/moreResult/moreResultDetail?searchText=' + searchText, - }) + if (state.searchResultKey === 'general_infos') { + uni.navigateTo({ + url: '/pages/search/moreResult/moreResultDetail?searchText=' + searchText, + }) + } } diff --git a/src/pages/search/moreResult/moreResultDetail.vue b/src/pages/search/moreResult/moreResultDetail.vue index e493eb7..163b444 100644 --- a/src/pages/search/moreResult/moreResultDetail.vue +++ b/src/pages/search/moreResult/moreResultDetail.vue @@ -9,6 +9,7 @@ :searchText="state.searchText" :isPagination="true" :searchRecordDetail="true" + @lastIdChange="lastIdChange" >
@@ -48,5 +49,23 @@ onLoad((options) => { console.log(JSON.parse(decodeURIComponent(state.apiParams))) }) + +//分页查询时,最后一条id变化 +const lastIdChange = (last_id, last_group_id, last_member_id) => { + let idChanges = { + last_id, + last_group_id, + last_member_id, + } + state.apiParams = encodeURIComponent( + JSON.stringify( + Object.assign( + {}, + JSON.parse(decodeURIComponent(state.apiParams)), + idChanges, + ), + ), + ) +} diff --git a/src/static/image/chatSettings/edit-btn.png b/src/static/image/chatSettings/edit-btn.png new file mode 100644 index 0000000000000000000000000000000000000000..58d371c5b89640361ccc72e4cd4580b423b785c0 GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z7>k44ofy`glX(f`tO)Q4aRt&2 z4h~saS;fW0K(e5qps=v8tgH;kEh#Aha)FG}(o!J1sHg}?0=Yl{WCN8!7!X0A2#|}c z49G_2g0z7Zz!^YUG&V#8qzzRH$X&eLVmi>R<|RRX!3-=sA`%KJ>KZx*HuetA-T@)u z5zz_h8QJ;O_4Uo&{gWq8pFMx^>dm|NA3lEi{PpYiA3uNn{`>FHm*Q)IMx63=aSX9I zefRQqp+g1&t{2-4C53&@9dt=P&~X3%e@P`?5s&Psysbwy%eE*#$TqdNI-4UQ{pp%v zvXQdtHbu#_Gs~E*4OX@{25JhIzPlW|v}D<@Id9kA@-=AKs$Sg0xGTlg=vvf)G&v$uk##nH^oNYr! zP(Q;o-&dLkcAZ?#5TUx?@_^pT;|#x_7_;6mS;>9CawXdV&6QOLG%NWVy+6HTI=~!g5kzC#(%1^oKs7y7GD8c$l&Sf=d#Wzp$PyaQI&`Q literal 0 HcmV?d00001 diff --git a/src/static/image/chatSettings/recordSearchTypeDate.png b/src/static/image/chatSettings/recordSearchTypeDate.png new file mode 100644 index 0000000000000000000000000000000000000000..747cc793b054657ae2c0cc45a2cdeb511b32c305 GIT binary patch literal 1890 zcmZ`(3pkT&9RK8&Bu7m_q@;dzF#sHCa z=;$cK$H&J(GV!(Ka{1)sBsc{TB2!aS;1tB^>FJrT1$t&@XCWs@ASZ~R2P#nfhyFc+ zyQ%Hm`JUl!yGBPSEDmprvL?Wf8rjp6zw6rt|g_540e&fas zDwRs3(Xz9%b8>R>^75EWW^r*bo6Y9&c-7U_wY9Z%b#?Xi^$iUTjg5^hEiD3ppr@zj z&6_v<{ry8jLsF@9WMl+9Bx7S^(3b_@TbceP9z0QTVt7O}>CD;Ki;2nLHmEl>txzZ$diPH9UOMvO19+fipFWR`jmsyeXJ+UAXw>fkuaAl{ z%5gXTM8BYK`bg?-BlSQXPX** znU$U8)A;j)ukyE=!gD%_oY;5T_S_`O#FLL4xW7eY(_v2!Z0lk1vrO?yP3+{5dpn%7 zQRXl2SbO?}RiBY-hP8zW+H_Z|m7RBnKDwc5%@dm49TjxZF}jjj$QnXxBi!rcCzpG) z`uM5B6WRpw`Yfj`EO`OWxa}s>y?}y0a2%ysZD!Vw3^(6RyCgvuqC(xwtlUBaoyj)3 zS>;CqQAdMxjofLmEqO_giOr)K`q(E7o?>} zCX^RHUT3ku&sAa-l3%fxVZZOELutjbV5!%RwU;QzHxtB@MG?U@w#>?YB>)&SsF%ug z{726p+uso#Kd{H-3nMW^JnBBP(L)Ic=#j*GE#*91Ugt`k1x&P+1B=3&m!c zUdAJlgxDhu)Be!0)zgs&9uZHOW0BL|0msR^CuvsB~`gNz+#4OQX7BN?#LG9Qsu zyC1q~9$TuqSNCun=2k|Pe)5LW&E9;?g%1+lI(y4Bd=oxgEw|pGrN2a}qRVhe&DQHL z;tw+7Z$A`R%O`GbO^S+t18-|n(QIhS7G2$9li;64l`ppYEq}{Qp@F2!%ocrIu9tW} z=9LYM=FD|V9Gz$=IpZPG`CyY@rPsc#_R34Or`J4!?&Mw<+(BeH!4CAhqlgxF*QsCR zsWfqRV5Mp1Kl6MX-G$Zn`RA=|=Yu}y>U9plugEs1#`#SD%;R#wzZZZ)VjMXL@3=n! DfaaM+ literal 0 HcmV?d00001 diff --git a/src/static/image/chatSettings/recordSearchTypeFiles.png b/src/static/image/chatSettings/recordSearchTypeFiles.png new file mode 100644 index 0000000000000000000000000000000000000000..a0d60a504e9e0b24ac3bb9ec1e05387b4d20ae95 GIT binary patch literal 2128 zcmZ`(3pAAL8Xn0dOyyD-<+AG(+R1Iyt}VHY`~A|k?UYGLv#DrA5=LW?$;LDzx5PBY zFotB3QEZNbEDV|nIc}Sn8IrpgyUy4C&#_wPoZhwm=X>7gd){ZQf35fbQ`}wc;Bp8# z7z_q?u($C9C+5o|D+w_0vndT664yQLtYECJJwh043)|h<8wJGA->C8Nad0CL2%!7- z@88eP&O&@~aS@Q^ziMS=Wp#BGv;ZOU@#9C(0$f{LTmP$oM=TaYPCy_hK;VH2i2tGg zKEW)gjg1Y6KnSIMjhja74WMpJiR8(|ybWBW4Y;0^?TwHv7JRXlH z5D3Z1$wVSCEiElQJv}2MBQrCTL?V&NWD13nm6es9ot>MTo1dRwP*6}R$B9UljW(I8C+}zy4 z!ot$h5?CSdIvFwpwqS9oSWj0kn8X&zty0o5vfH-FE5Nt!*r~EhO&zgEQ&UUlyM6l) z>Kh`>emH*8;*^!O4a(Nm!O7Xh)y>_@`}9wK{^tVF=L3U+FJH!lgoIwXa`jqR_;qYV z)XnHyaX3OsTH0@9N>+A$VG)haC@o`_S5!WETFqwHwYGJ1c5%CVdSCPSZ{GCvza1PI z9UU7Re>XWP5Q?T}X25syVQzk5VR2=3ZC$+asYSI9e3e^s9BeGT)zsOIsewM%VKQ?c zBFavXe*6^`SdF=7l1{-)Z+gALXi!w+LL^X8|v zUiO;XZn4My7b_Xc<3^U#Lo-40`~{^D^(Tb1a&?Jmr65BC6QzKjcU%)!uD`SsAyK_% z&d}HJMS?*|o0T)Q@Aa-}yM2UP3Y_K#vR+gLPD>jhr9+=nqOa`7P~_+v%OYOsaG2k# zJK|8-p+8{W3qqXGUCs4~+Rw+V8^WWDm|C1%)NdVDN7a{{rCpVMExAkqjx|e9nzdHF z-L&Lhvg7!WlbefG(%GxsUKPt$bs?CIXViMz=E^Xy@dl!fMrfCxEv=Y~NAgDs9x*Nk zn>=uAoyK2Wb}=R2J-z0=?%3abEi-7Lr|43$zFp$sy5Py7hrtvS&Af?nj~;wLzVqRu zUNbb;C?`8bcLbv!s^}m3wuhhfOBWU&G`u8XUznqkkJ)Z?Ru2}=IDn!TsMVZ-NqLis z?p)ZAgT+0-cw&Pu@ZvrlRiJGh=7 z(pZ#SDbhyjyIX>8ZxBxt&G*1~Yukg4S2b`N?E#NS@O1#4siEkjG`c59#B7%5r5B-= zNA^d`m&HEnQtF@+RLUoC7KpM$A90C^mJ~0&DP?bkoQcUhWBzWM|I6H}Su^PzY+^<;HzB7(j>L~QTt?%%Me=JHSC4Rc2! z!_(q8kxmcq)(by1B=&>ZP_K zRiehDbhjPONsa+V{x!NV+JrIZ`}+#_EWvJP%9TT#exM4@X;G8%QigMypKBNqSw)9R zub`a!>;wsI5tZ8Pys%qGc2N}0{C@1Pnr!Np*YK9csQs{MLXxmwe6)#zOT-GYozQ*k zBR#mR3Y;WPPw}nFO>NjEgB(9wjduE3g{f#aUsS5&!6n<6jh`$&Nd)>W`VzDZj$N8~ zN;dWQ+0R%p19iXGu0GY|4A6QD3|Kwc!x}G?9Ke6=|z}OGNy7SZd!?< UXb?ZG41TIG2b8M~%PJt@U&ovTmH+?% literal 0 HcmV?d00001 diff --git a/src/static/image/chatSettings/recordSearchTypeGroupMembers.png b/src/static/image/chatSettings/recordSearchTypeGroupMembers.png new file mode 100644 index 0000000000000000000000000000000000000000..ab31147bcc24849712259492c9eec181171031a2 GIT binary patch literal 1880 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 literal 0 HcmV?d00001 diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json index 299741d..14e8854 100644 --- a/src/uni_modules/tmui/locale/zh-Hans.json +++ b/src/uni_modules/tmui/locale/zh-Hans.json @@ -82,5 +82,23 @@ "search.result.include": "包含:", "has_more": "更多", "index.type.company": "公司", - "search.result.relevant": "相关" + "search.result.relevant": "相关", + "index.chat.settings": "聊天设置", + "chat.settings.clearChatRecord": "清空聊天记录", + "chat.settings.groupName": "群名称", + "chat.settings.groupNotice": "群公告", + "chat.settings.groupType": "群类型", + "chat.settings.topSession": "置顶会话", + "chat.settings.messageNoDisturb": "消息免打扰", + "chat.settings.groupGag": "群内禁言", + "chat.settings.groupAdmin": "群管理员", + "chat.settings.groupMember": "群成员", + "search.chat.record": "搜索聊天记录", + "record.searchType.date": "日期", + "record.searchType.imgAndVideo": "图片及视频", + "record.searchType.files": "文件", + "record.searchType.link": "链接", + "group.identify.admin": "管理员", + "group.disband.btn": "解散该群", + "group.quit.btn": "退出群聊" } From 0db50f2216bea01123b35b8638180d1be666dbcb Mon Sep 17 00:00:00 2001 From: wangyifeng <812766448@qq.com> Date: Thu, 2 Jan 2025 17:10:31 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BE=A4=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/chatSettings/index.js | 11 ++++++ .../components/settingFormItem.vue | 2 ++ src/pages/chatSettings/index.vue | 34 +++++++++++++++++-- src/pages/dialog/index.vue | 2 +- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 src/api/chatSettings/index.js diff --git a/src/api/chatSettings/index.js b/src/api/chatSettings/index.js new file mode 100644 index 0000000..e194d2c --- /dev/null +++ b/src/api/chatSettings/index.js @@ -0,0 +1,11 @@ +import request from '@/service/index.js' +import qs from 'qs' + +// 群信息查询 +export const ServeQueryGroupInfo = (data) => { + return request({ + url: '/api/v1/group/detail', + method: 'GET', + data, + }) +} diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue index 2ea0871..685da61 100644 --- a/src/pages/chatSettings/components/settingFormItem.vue +++ b/src/pages/chatSettings/components/settingFormItem.vue @@ -13,6 +13,8 @@ src="/src/static/image/chatSettings/pointer.png" /> { + if (options.groupId) { + console.log(options.groupId) + state.groupId = Number(options.groupId) + getGroupInfo() + } +}) + const state = reactive({ chatGroupMembers: [], //群成员 chatGroupInfos: [], //群聊信息 recordSearchTypeList: [], //聊天记录搜索类型 chatSettings: [], //群聊设置 chatManagement: [], //群聊管理 + groupId: '', //群id + groupInfo: null, //群信息 }) onMounted(() => { @@ -176,7 +188,7 @@ onMounted(() => { { label: t('chat.settings.groupName'), hasPointer: true, - value: '泰丰国际', + value: groupName, subValue: '', customInfo: '', }, @@ -258,7 +270,7 @@ const groupAvatar = computed(() => { //群名称 const groupName = computed(() => { - return '泰丰国际' + return state?.groupInfo?.group_name }) //群人数 @@ -270,6 +282,24 @@ const groupNum = computed(() => { const groupType = computed(() => { return '公司' }) + +//查询群信息 +const getGroupInfo = () => { + let params = { + group_id: state.groupId, + } + const resp = ServeQueryGroupInfo(params) + console.log(resp) + resp.then(({ code, data }) => { + console.log(data) + if (code == 200) { + state.groupInfo = data + } else { + } + }) + + resp.catch(() => {}) +} diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index 09a7d8d..f6fa3fa 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -23,8 +23,24 @@ {{ '(' + groupNum + ')' }} -
- {{ groupType }} +
+ + {{ groupType }} +
@@ -41,13 +57,20 @@
- - - {{ memberItem.avatar }} + + + {{ + memberItem.nickname.length >= 2 + ? memberItem.nickname.slice(-2) + : memberItem.nickname + }}
@@ -57,7 +80,7 @@
- {{ memberItem.name }} + {{ memberItem.nickname }}
@@ -71,7 +94,10 @@ v-for="(item, index) in state.chatGroupInfos" :key="index" > - +
diff --git a/src/static/image/search/down-pointer.png b/src/static/image/search/down-pointer.png new file mode 100644 index 0000000000000000000000000000000000000000..6f6b2cff4003b393bf874b59fa4add0cc7d1a6de GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^LO{&T!VDxEEDx9iDaPU;cPEB*=VV?2If?;3A+8{~ zhK8P=p5ESG2nlCExQ>jgJ%Nh2N`m}?8CYzBL(2P?fBx;q`%eKV>h9^{7{YNqS-?Dj zfpHr{+p3cZVb_A#&QDcv+!pG~qqEteDN - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/src/uni_modules/tmui/components/tm-calendar-view/tm-calendar-view.vue b/src/uni_modules/tmui/components/tm-calendar-view/tm-calendar-view.vue index 02b9d28..230572c 100644 --- a/src/uni_modules/tmui/components/tm-calendar-view/tm-calendar-view.vue +++ b/src/uni_modules/tmui/components/tm-calendar-view/tm-calendar-view.vue @@ -1,137 +1,139 @@ diff --git a/src/uni_modules/tmui/components/tm-time-picker/tm-time-picker.vue b/src/uni_modules/tmui/components/tm-time-picker/tm-time-picker.vue index 18beac2..bc42457 100644 --- a/src/uni_modules/tmui/components/tm-time-picker/tm-time-picker.vue +++ b/src/uni_modules/tmui/components/tm-time-picker/tm-time-picker.vue @@ -123,7 +123,8 @@ const props = defineProps({ day: true, hour: false, minute: false, - second: false + second: false, + am_pm: true } } }, diff --git a/src/uni_modules/tmui/components/tm-time-view/interface.ts b/src/uni_modules/tmui/components/tm-time-view/interface.ts index fedd600..3599dda 100644 --- a/src/uni_modules/tmui/components/tm-time-view/interface.ts +++ b/src/uni_modules/tmui/components/tm-time-view/interface.ts @@ -5,6 +5,7 @@ export interface showDetail { hour: boolean, minute: boolean, second: boolean, + am_pm: boolean } export enum timeDetailType { year = "year", @@ -25,4 +26,4 @@ export interface timeArrayType { hour: Array, minute: Array, second: Array, -} \ No newline at end of file +} diff --git a/src/uni_modules/tmui/components/tm-time-view/tm-time-view.vue b/src/uni_modules/tmui/components/tm-time-view/tm-time-view.vue index a68c94d..ddb4729 100644 --- a/src/uni_modules/tmui/components/tm-time-view/tm-time-view.vue +++ b/src/uni_modules/tmui/components/tm-time-view/tm-time-view.vue @@ -1,11 +1,14 @@ diff --git a/src/pages/chatSettings/groupManage/editGroupName.vue b/src/pages/chatSettings/groupManage/editGroupName.vue new file mode 100644 index 0000000..451ca22 --- /dev/null +++ b/src/pages/chatSettings/groupManage/editGroupName.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/pages/chatSettings/groupManage/manageGroupMembers.vue b/src/pages/chatSettings/groupManage/manageGroupMembers.vue new file mode 100644 index 0000000..40d55bf --- /dev/null +++ b/src/pages/chatSettings/groupManage/manageGroupMembers.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/pages/chatSettings/groupManage/manageGroupSilence.vue b/src/pages/chatSettings/groupManage/manageGroupSilence.vue new file mode 100644 index 0000000..282b1e1 --- /dev/null +++ b/src/pages/chatSettings/groupManage/manageGroupSilence.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/pages/chatSettings/groupManage/manageNotice.vue b/src/pages/chatSettings/groupManage/manageNotice.vue index 369eefd..b0a5fc1 100644 --- a/src/pages/chatSettings/groupManage/manageNotice.vue +++ b/src/pages/chatSettings/groupManage/manageNotice.vue @@ -17,7 +17,10 @@
{ //输入群公告 const inputGroupNotice = (e) => { state.groupNotice = e + if (e.trim()) { + state.canDoComplete = true + } else { + state.canDoComplete = false + } } diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index f6fa3fa..b36bf13 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -13,7 +13,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -53,39 +53,14 @@ v-for="(item, index) in state.chatGroupMembers" :key="index" > - -
-
-
-
- - - {{ - memberItem.nickname.length >= 2 - ? memberItem.nickname.slice(-2) - : memberItem.nickname - }} - -
-
- - {{ $t('group.identify.admin') }} - -
-
- - {{ memberItem.nickname }} - -
-
-
-
+ +
@@ -127,7 +102,12 @@ v-for="(item, index) in state.chatSettings" :key="index" > - +
@@ -136,7 +116,10 @@ v-for="(item, index) in state.chatManagement" :key="index" > - +
@@ -173,25 +156,34 @@ import recordSearchTypeIcon_files from '@/static/image/chatSettings/recordSearch import recordSearchTypeIcon_link from '@/static/image/chatSettings/recordSearchTypeLink.png' import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue' import settingFormItem from './components/settingFormItem.vue' +import groupMemberList from './components/groupMembersList.vue' import { computed, onMounted, reactive } from 'vue' +import { useUserStore, useTalkStore, useDialogueStore } from '@/store' import { onLoad } from '@dcloudio/uni-app' import { ServeQueryGroupInfo, ServeQueryGroupMembers, ServeQueryGroupNotice, + ServeTopTalk, + ServeDisturbTalk, } from '@/api/chatSettings/index' import { useI18n } from 'vue-i18n' const { t } = useI18n() - -onLoad((options) => { - if (options.groupId) { - console.log(options.groupId) - state.groupId = Number(options.groupId) - getGroupInfo() - getGroupMembers() - getGroupNotice() - } +const userStore = useUserStore() +const talkStore = useTalkStore() +const dialogueStore = useDialogueStore() +const talkParams = reactive({ + uid: computed(() => userStore.uid), + index_name: computed(() => dialogueStore.index_name), + type: computed(() => dialogueStore.talk.talk_type), + receiver_id: computed(() => dialogueStore.talk.receiver_id), + username: computed(() => dialogueStore.talk.username), + online: computed(() => dialogueStore.online), + keyboard: computed(() => dialogueStore.keyboard), + num: computed(() => dialogueStore.members.length), }) +const topItems = computed(() => talkStore.topItems) +const disturbItems = computed(() => talkStore.disturbItems) const state = reactive({ chatGroupMembers: [], //群成员form-item @@ -203,6 +195,35 @@ const state = reactive({ groupInfo: null, //群信息 memberList: [], //群成员列表 groupNotice: [], //群公告 + sessionId: '', //会话id +}) + +onLoad((options) => { + console.log(talkParams) + if (options.groupId) { + console.log(options.groupId) + state.groupId = Number(options.groupId) + getGroupInfo() + getGroupMembers() + getGroupNotice() + } + if (options.sessionId) { + state.sessionId = Number(options.sessionId) + if (topItems.value.length > 0) { + topItems.value.forEach((item) => { + if (item.id == options.sessionId) { + state.sessionInfo = item + } + }) + } + if (disturbItems.value.length > 0) { + disturbItems.value.forEach((item) => { + if (item.id == options.sessionId) { + state.sessionInfo = item + } + }) + } + } }) onMounted(() => { @@ -403,13 +424,49 @@ const updateGroupInfos = () => { ] } +//点击跳转到修改群信息页面 +const toEditGroupInfoPage = () => { + uni.navigateTo({ + url: + '/pages/chatSettings/groupManage/editGroupName?groupAvatar=' + + groupAvatar.value, + }) +} + +//点击跳转到修改头像页面 +const toEditAvatarPage = () => { + uni.navigateTo({ + url: + '/pages/chatSettings/groupManage/editAvatar?groupAvatar=' + + groupAvatar.value, + }) +} + //点击跳转到管理页面 const toManagePage = (label) => { console.log(label) - if (label && label === t('chat.settings.groupNotice')) { - uni.navigateTo({ - url: '/pages/chatSettings/groupManage/manageNotice', - }) + if (label) { + if (label === t('chat.settings.groupName')) { + uni.navigateTo({ + url: + '/pages/chatSettings/groupManage/editGroupName?groupAvatar=' + + groupAvatar.value, + }) + } else if (label === t('chat.settings.groupNotice')) { + uni.navigateTo({ + url: '/pages/chatSettings/groupManage/manageNotice', + }) + } else if (label === t('chat.settings.groupMember')) { + uni.navigateTo({ + url: + '/pages/chatSettings/groupManage/manageGroupMembers?groupId=' + + state.groupId, + }) + } else if (label === t('chat.settings.groupGag')) { + uni.navigateTo({ + url: '/pages/chatSettings/groupManage/manageGroupSilence', + }) + } } } @@ -427,6 +484,46 @@ const toSearchByConditionPage = (flag) => { state.groupId, }) } + +//切换开关选择 +const changeSwitch = (switchStatus, label) => { + let params + let resp + if (label == t('chat.settings.topSession')) { + params = { + list_id: state.sessionId, //聊天会话的id + type: switchStatus ? 1 : 2, + } + resp = ServeTopTalk(params) + } else if (label == t('chat.settings.messageNoDisturb')) { + params = { + talk_type: talkParams.type, //1私聊;2群聊 + receiver_id: talkParams.receiver_id, //接收人id或群id + is_disturb: switchStatus ? 1 : 0, //是否开启免打扰,0不免打扰,1免打扰 + } + resp = ServeDisturbTalk(params) + } + console.log(resp) + resp.then(({ code, data }) => { + console.log(data) + if (code == 200) { + if (label == t('chat.settings.topSession')) { + talkStore.updateItem({ + index_name: talkParams.index_name, + is_top: switchStatus ? 1 : 2, + }) + } else if (label == t('chat.settings.messageNoDisturb')) { + talkStore.updateItem({ + index_name: talkParams.index_name, + is_disturb: switchStatus ? 1 : 0, + }) + } + } else { + } + }) + + resp.catch(() => {}) +} diff --git a/src/pages.json b/src/pages.json index be2de0b..69299ec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -138,6 +138,22 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path": "pages/chatSettings/groupManage/selectMembers", + "type": "page", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/chatSettings/groupManage/manageGroupAdmin", + "type": "page", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/src/pages/chatSettings/components/select-member-item.vue b/src/pages/chatSettings/components/select-member-item.vue new file mode 100644 index 0000000..4a03bc7 --- /dev/null +++ b/src/pages/chatSettings/components/select-member-item.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue new file mode 100644 index 0000000..35bc10c --- /dev/null +++ b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue @@ -0,0 +1,106 @@ + + + diff --git a/src/pages/chatSettings/groupManage/manageGroupMembers.vue b/src/pages/chatSettings/groupManage/manageGroupMembers.vue index 40d55bf..235a77d 100644 --- a/src/pages/chatSettings/groupManage/manageGroupMembers.vue +++ b/src/pages/chatSettings/groupManage/manageGroupMembers.vue @@ -6,8 +6,6 @@ :show-scrollbar="false" :use-virtual-list="true" :virtual-list-col="5" - v-model="state.memberList" - @query="getGroupMembers" :auto="false" :refresher-enabled="false" :loading-more-enabled="false" @@ -22,7 +20,9 @@
- +
@@ -32,43 +32,16 @@ import groupMemberList from '../components/groupMembersList.vue' import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue' import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js' -import { onLoad } from '@dcloudio/uni-app' -import { ref, reactive } from 'vue' -import { ServeQueryGroupMembers } from '@/api/chatSettings/index' +import { ref, computed, reactive } from 'vue' +import { useDialogueStore } from '@/store' -const state = reactive({ - memberList: [], //人员列表 +const dialogueStore = useDialogueStore() +const talkParams = reactive({ + memberList: computed(() => dialogueStore.members), }) const zPaging = ref() useZPaging(zPaging) - -onLoad((options) => { - console.log(options) - if (options.groupId) { - state.groupId = Number(options.groupId) - getGroupMembers() - } -}) - -//查看群成员 -const getGroupMembers = () => { - let params = { - group_id: state.groupId, - } - console.log(params) - const resp = ServeQueryGroupMembers(params) - console.log(resp) - resp.then(({ code, data }) => { - console.log(data) - if (code == 200) { - zPaging.value?.completeByNoMore(data.items, true) - } else { - } - }) - - resp.catch(() => {}) -} diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index b36bf13..7719454 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -27,7 +27,7 @@ class="base-info-tag" :style="{ borderColor: - groupTypeMapping[state?.groupInfo?.group_type] + groupTypeMapping[groupParams?.groupInfo?.group_type] ?.result_type_color, }" > @@ -35,7 +35,7 @@ class="text-[24rpx] font-medium" :style="{ color: - groupTypeMapping[state?.groupInfo?.group_type] + groupTypeMapping[groupParams?.groupInfo?.group_type] ?.result_type_color, }" > @@ -58,7 +58,7 @@ @toManagePage="toManagePage" > @@ -76,14 +76,7 @@