+
![]()
+ />
diff --git a/TUIKit/components/TUIChat/message-list/style/index.scss b/TUIKit/components/TUIChat/message-list/style/index.scss
index 33bac53..5d3ddb7 100644
--- a/TUIKit/components/TUIChat/message-list/style/index.scss
+++ b/TUIKit/components/TUIChat/message-list/style/index.scss
@@ -8,4 +8,12 @@
flex-direction: column;
box-sizing: border-box;
min-width: 0;
+}
+
+.tui-message-list {
+ background: #fff;
+}
+
+.message-li {
+ margin-top: 0 !important;
}
\ No newline at end of file
diff --git a/TUIKit/components/TUIChat/utils/sendMessage.ts b/TUIKit/components/TUIChat/utils/sendMessage.ts
index fb4e0ee..6495192 100644
--- a/TUIKit/components/TUIChat/utils/sendMessage.ts
+++ b/TUIKit/components/TUIChat/utils/sendMessage.ts
@@ -89,7 +89,12 @@ export const sendMessages = async (
options.payload.atUserList = content.payload.atUserList;
await TUIChatService.sendTextAtMessage(options, sendMessageOptions);
} else {
- await TUIChatService.sendTextMessage(options, sendMessageOptions);
+ try {
+ await TUIChatService.sendTextMessage(options, sendMessageOptions);
+ } catch (err) {
+ console.log('发送失败，对方不是你的好友')
+
+ }
}
break;
case 'image':
diff --git a/TUIKit/components/TUIContact/contact-info/index.vue b/TUIKit/components/TUIContact/contact-info/index.vue
index 2e63a73..bd583eb 100644
--- a/TUIKit/components/TUIContact/contact-info/index.vue
+++ b/TUIKit/components/TUIContact/contact-info/index.vue
@@ -1,28 +1,34 @@
-
-
+
{{ generateContactInfoName(contactInfoData) }}
@@ -32,7 +38,7 @@
:key="item.label"
:class="[
'tui-contact-info-basic-text-other',
- !isPC && 'tui-contact-info-h5-basic-text-other',
+ !isPC && 'tui-contact-info-h5-basic-text-other'
]"
>
{{
@@ -44,14 +50,17 @@
![]()
+ />
{{ `${TUITranslateService.t(`TUIContact.${item.label}`)}` }}
@@ -75,20 +84,20 @@
+ />
+
+
-
+
+ -->
@@ -370,6 +370,9 @@
+
+
diff --git a/TUIKit/components/TUISearch/search-input/index.vue b/TUIKit/components/TUISearch/search-input/index.vue
index 82681ab..72f9ef2 100644
--- a/TUIKit/components/TUISearch/search-input/index.vue
+++ b/TUIKit/components/TUISearch/search-input/index.vue
@@ -12,10 +12,7 @@
v-if="!searchingStatus && props.searchType === 'global'"
:class="['tui-search-input', !isPC && 'tui-search-input-h5']"
>
-
{{ item.data }}
@@ -97,39 +106,41 @@
v-if="item.editable"
:class="[
'tui-contact-info-more-item-content-text-icon',
- !isPC && 'tui-contact-info-h5-more-item-content-text-icon',
+ !isPC && 'tui-contact-info-h5-more-item-content-text-icon'
]"
@click="setEditing(item)"
>
-
-
+
-
-
- -
+
-
-
+ {{ groupKey }} ({{ groupData.length }}) +
- {{ groupKey }} ({{ groupData.length }})
-
-
+
+ />
diff --git a/TUIKit/components/TUISearch/style/web.scss b/TUIKit/components/TUISearch/style/web.scss
index 5f87240..28a8a6c 100644
--- a/TUIKit/components/TUISearch/style/web.scss
+++ b/TUIKit/components/TUISearch/style/web.scss
@@ -1,5 +1,5 @@
.tui-search {
- background: #EBF0F6;
+ background: #fff;
&-main-global {
width: 100%;
@@ -14,7 +14,7 @@
}
.tui-search-global {
- padding-bottom: 10px;
+ padding-bottom: 32rpx;
&-header {
display: flex;
flex-direction: row;
diff --git a/TUIKit/components/common/Avatar/index.vue b/TUIKit/components/common/Avatar/index.vue
index 1bd894b..8091cf9 100644
--- a/TUIKit/components/common/Avatar/index.vue
+++ b/TUIKit/components/common/Avatar/index.vue
@@ -4,7 +4,7 @@
:style="{
width: avatarSize,
height: avatarSize,
- borderRadius: avatarBorderRadius,
+ borderRadius: '80rpx'
}"
>
@@ -29,7 +29,7 @@
:src="avatarImageUrl || defaultAvatarUrl"
@load="avatarLoadSuccess"
@error="avatarLoadFailed"
- >
+ />
-
- {{ TUITranslateService.t("TUISearch.取消") }}
+ {{ TUITranslateService.t('TUISearch.取消') }}
-import { ref, toRefs } from '../../../adapter-vue';
-import { isUniFrameWork } from '../../../utils/env';
+ import { ref, toRefs } from '../../../adapter-vue'
+ import { isUniFrameWork } from '../../../utils/env'
-interface IProps {
- url: string;
- size?: string;
- borderRadius?: string;
- useSkeletonAnimation?: boolean;
-}
-
-interface IEmits {
- (key: 'onLoad', e: Event): void;
- (key: 'onError', e: Event): void;
-}
-
-const defaultAvatarUrl = ref('https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png');
-const emits = defineEmits();
-const props = withDefaults(defineProps(), {
- // uniapp vue2 does not support constants in defineProps
- url: 'https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png',
- size: '36px',
- borderRadius: '5px',
- useSkeletonAnimation: false,
-});
-
-const {
- size: avatarSize,
- url: avatarImageUrl,
- borderRadius: avatarBorderRadius,
- useSkeletonAnimation: useAvatarSkeletonAnimation,
-} = toRefs(props);
-
-let reloadAvatarTime = 0;
-const isImgLoaded = ref(false);
-const loadErrorInUniapp = ref(false);
-
-function avatarLoadSuccess(e: Event) {
- isImgLoaded.value = true;
- emits('onLoad', e);
-}
-
-function avatarLoadFailed(e: Event) {
- reloadAvatarTime += 1;
- if (reloadAvatarTime > 3) {
- return;
+ interface IProps {
+ url: string
+ size?: string
+ borderRadius?: string
+ useSkeletonAnimation?: boolean
}
- if (isUniFrameWork) {
- loadErrorInUniapp.value = true;
- } else {
- (e.currentTarget as HTMLImageElement).src = defaultAvatarUrl.value;
+
+ interface IEmits {
+ (key: 'onLoad', e: Event): void
+ (key: 'onError', e: Event): void
+ }
+
+ const defaultAvatarUrl = ref(
+ 'https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'
+ )
+ const emits = defineEmits()
+ const props = withDefaults(defineProps(), {
+ // uniapp vue2 does not support constants in defineProps
+ url: 'https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png',
+ size: '36px',
+ borderRadius: '5px',
+ useSkeletonAnimation: false
+ })
+
+ const {
+ size: avatarSize,
+ url: avatarImageUrl,
+ borderRadius: avatarBorderRadius,
+ useSkeletonAnimation: useAvatarSkeletonAnimation
+ } = toRefs(props)
+
+ let reloadAvatarTime = 0
+ const isImgLoaded = ref(false)
+ const loadErrorInUniapp = ref(false)
+
+ function avatarLoadSuccess(e: Event) {
+ isImgLoaded.value = true
+ emits('onLoad', e)
+ }
+
+ function avatarLoadFailed(e: Event) {
+ reloadAvatarTime += 1
+ if (reloadAvatarTime > 3) {
+ return
+ }
+ if (isUniFrameWork) {
+ loadErrorInUniapp.value = true
+ } else {
+ ;(e.currentTarget as HTMLImageElement).src = defaultAvatarUrl.value
+ }
+ emits('onError', e)
}
- emits('onError', e);
-}
diff --git a/TUIKit/components/common/Navigation/index.vue b/TUIKit/components/common/Navigation/index.vue
index cff4a43..aaf0901 100644
--- a/TUIKit/components/common/Navigation/index.vue
+++ b/TUIKit/components/common/Navigation/index.vue
@@ -9,10 +9,7 @@
-
+
-
{{ title }}
@@ -25,82 +22,85 @@ diff --git a/TUIKit/components/common/Transfer/index.vue b/TUIKit/components/common/Transfer/index.vue index 34bde33..1877870 100644 --- a/TUIKit/components/common/Transfer/index.vue +++ b/TUIKit/components/common/Transfer/index.vue @@ -1,16 +1,16 @@
+
+ />
+ />
我的积分
-
- {{ formatNumberWithWan(userInfo.totalPoints) }}
+
+ {{ formatNumberWithWan(integralData) }}
- {{ item.totalPoints }}
+
+ {{ formatNumberWithWan(item.totalPoints) }}
+
diff --git a/pages/my-index/my-index.vue b/pages/my-index/my-index.vue
index f955fd7..95645be 100644
--- a/pages/my-index/my-index.vue
+++ b/pages/my-index/my-index.vue
@@ -3,6 +3,7 @@
import { onLoad } from '@dcloudio/uni-app'
import { navigateTo } from '@/utils/router'
import { useUI } from '@/utils/use-ui'
+ import { formatNumberWithWan } from '../../utils'
const bottomList = [
{
@@ -40,7 +41,7 @@
]
const { showDialog } = useUI()
- const { userInfo } = useAuthUser()
+ const { userInfo, integralData } = useAuthUser()
onLoad(() => {
// 获取用户信息
@@ -78,7 +79,7 @@
账户积分
- {{ userInfo?.totalPoints }}
+ {{ formatNumberWithWan(integralData) }}
-
@@ -59,13 +59,10 @@
:width="'18px'"
:height="'18px'"
/>
-
- {{
- TUITranslateService.t("component.全选")
- }}
+
+
+ {{ TUITranslateService.t('component.全选') }}
+
- - {{ TUITranslateService.t("component.查看更多") }} + {{ TUITranslateService.t('component.查看更多') }}
-
+
{{ transferTitle }}
-
@@ -199,134 +174,175 @@
+
diff --git a/composables/useAuthUser.js b/composables/useAuthUser.js
index 8d74ebf..12a492d 100644
--- a/composables/useAuthUser.js
+++ b/composables/useAuthUser.js
@@ -10,10 +10,11 @@ export const useAuthUser = () => {
const tokenStore = useTokenStore()
// 响应式状态（state & getters）
- const { userInfo, tencentUserSig, fontSizeData } = storeToRefs(userStore)
+ const { userInfo, tencentUserSig, fontSizeData, integralData } = storeToRefs(userStore)
const { token } = storeToRefs(tokenStore)
return {
+ integralData,
userInfo,
tencentUserSig,
fontSizeData,
diff --git a/manifest.json b/manifest.json
index a20ec78..524310f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "uniapp-imitate-wx",
"appid" : "__UNI__9EFDC69",
"description" : "",
- "versionName" : "1.0.0",
+ "versionName" : "1.0.1",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index 0c4f248..9872615 100644
--- a/pages.json
+++ b/pages.json
@@ -111,14 +111,16 @@
{
"path": "pages/discover/discover",
"style": {
- "navigationBarTitleText": "发现"
+ "navigationBarTitleText": "发现",
+ "navigationBarBackgroundColor": "#ffffff"
}
},
{
"path": "pages/my-index/my-index",
"style": {
"navigationBarTitleText": "我的",
- "backgroundColor": "#f7f7f7"
+ "backgroundColor": "#f7f7f7",
+ "navigationBarBackgroundColor": "#ffffff"
}
},
{
@@ -475,4 +477,4 @@
}
]
}
-}
\ No newline at end of file
+}
diff --git a/pages/discover/punch.vue b/pages/discover/punch.vue
index 5432b5c..10f7b19 100644
--- a/pages/discover/punch.vue
+++ b/pages/discover/punch.vue
@@ -6,10 +6,11 @@
import { useUI } from '@/utils/use-ui'
import { useAuthUser } from '@/composables/useAuthUser'
import { useUserStore } from '@/stores/user'
+ import { formatNumberWithWan } from '../../utils'
const { showToast } = useUI()
- const { userInfo } = useAuthUser()
- const { refreshUserInfo } = useUserStore()
+ const { integralData } = useAuthUser()
+ const { getIntegral } = useUserStore()
const weekList = [
{ name: '一', value: 1 },
@@ -45,7 +46,7 @@
)
if (msg) {
- await refreshUserInfo()
+ await getIntegral()
showToast(msg)
}
@@ -161,22 +162,6 @@
getData()
}
- const formatNumberWithWan = num => {
- if (num < 10000) {
- return num.toString()
- }
-
- // 保留小数：根据需求可调整 toFixed 的位数
- let wan = num / 10000
-
- // 如果是整数万，不显示小数；否则保留两位小数（或你想要的位数）
- if (wan % 1 === 0) {
- return wan + '万'
- } else {
- return wan.toFixed(2).replace(/\.?0+$/, '') + '万' // 去掉不必要的尾随零
- }
- }
-
onLoad(() => {
const now = new Date()
currentYear.value = now.getFullYear()
@@ -200,8 +185,8 @@
-
+
-
- {{ item.nick || item.userID }}
+ />
+
+ {{ item.nick || item.userID }}
+
-
+ - - + +
- {{ TUITranslateService.t("component.已选中") + {{ TUITranslateService.t('component.已选中') }}{{ transferSelectedList.length - }}{{ TUITranslateService.t("component.人") }} + }}{{ TUITranslateService.t('component.人') }}