From 7913a63a3927a2ca707bc52bbc91ce7e99ecbd68 Mon Sep 17 00:00:00 2001 From: cansnow Date: Fri, 9 Jan 2026 09:15:59 +0800 Subject: [PATCH] 20 --- App.vue | 531 +++++++++++++++++- api/login.js | 37 +- common/config.js | 2 +- components/MyAvatar/index.vue | 68 ++- manifest.json | 10 +- pages.json | 18 +- pages/common/contactChoose/choose.vue | 13 +- .../contactChoose/chooseGroupMember.vue | 2 - pages/common/login/index.vue | 61 +- pages/common/upgrade.vue | 130 ++++- pages/contact/groupList/index.vue | 262 ++++----- .../MessageItem/PictureMessageRender.vue | 4 +- .../MessageItem/VideoMessageRender.vue | 6 +- .../components/ChatHeader.vue | 81 ++- .../components/ConversationItem.vue | 16 +- pages/conversation/conversationList/index.vue | 21 +- pages/conversation/groupSettings/index.vue | 2 +- pages/find/index/index.vue | 36 +- pages/index/launch.vue | 67 ++- pages/user/about/index.vue | 50 +- pages/user/index/index.vue | 2 +- pages/user/selfInfo/index.vue | 6 +- static/images/logo.png | Bin 0 -> 198499 bytes static/images/upgrade.png | Bin 0 -> 22629 bytes store/modules/contact.js | 8 +- .../ly-map/components/ly-map/ly-map.vue | 4 +- unpackage/res/cover.bak/1080_1882.9.png | Bin 0 -> 225630 bytes unpackage/res/cover.bak/480_762.9.png | Bin 0 -> 69395 bytes unpackage/res/cover.bak/720_1242.9.png | Bin 0 -> 108179 bytes unpackage/res/cover/1080_1882.9.png | Bin 225630 -> 201347 bytes unpackage/res/cover/480_762.9.png | Bin 69395 -> 63103 bytes unpackage/res/cover/720_1242.9.png | Bin 108179 -> 100455 bytes unpackage/res/icons/1024x1024.png | Bin 206296 -> 236896 bytes unpackage/res/icons/120x120.png | Bin 4149 -> 5484 bytes unpackage/res/icons/144x144.png | Bin 5813 -> 7377 bytes unpackage/res/icons/152x152.png | Bin 6076 -> 7668 bytes unpackage/res/icons/167x167.png | Bin 7277 -> 8997 bytes unpackage/res/icons/180x180.png | Bin 8667 -> 10557 bytes unpackage/res/icons/192x192.png | Bin 6330 -> 9505 bytes unpackage/res/icons/20x20.png | Bin 532 -> 1143 bytes unpackage/res/icons/29x29.png | Bin 777 -> 1429 bytes unpackage/res/icons/40x40.png | Bin 1062 -> 1788 bytes unpackage/res/icons/58x58.png | Bin 1543 -> 2411 bytes unpackage/res/icons/60x60.png | Bin 1784 -> 2644 bytes unpackage/res/icons/72x72.png | Bin 2456 -> 3431 bytes unpackage/res/icons/76x76.png | Bin 2414 -> 3333 bytes unpackage/res/icons/80x80.png | Bin 2559 -> 3498 bytes unpackage/res/icons/87x87.png | Bin 2501 -> 3497 bytes unpackage/res/icons/96x96.png | Bin 2837 -> 4056 bytes util/imCommon.js | 19 +- util/index.js | 41 +- 51 files changed, 1048 insertions(+), 449 deletions(-) create mode 100644 static/images/logo.png create mode 100644 static/images/upgrade.png create mode 100644 unpackage/res/cover.bak/1080_1882.9.png create mode 100644 unpackage/res/cover.bak/480_762.9.png create mode 100644 unpackage/res/cover.bak/720_1242.9.png diff --git a/App.vue b/App.vue index a01d067..9fc1727 100644 --- a/App.vue +++ b/App.vue @@ -1,5 +1,11 @@ diff --git a/manifest.json b/manifest.json index 093cccf..7f5596f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "瞬聊", "appid" : "__UNI__E41111F", "description" : "一款即时聊天软件", - "versionName" : "3.3.5", - "versionCode" : 335, + "versionName" : "3.3.6", + "versionCode" : 336, "transformPx" : false, "app-plus" : { "bounce" : "none", @@ -54,7 +54,7 @@ ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "minSdkVersion" : 21, - "targetSdkVersion" : 26, + "targetSdkVersion" : 36, "schemes" : "shunliao" }, "ios" : { @@ -97,7 +97,7 @@ "push" : { "unipush" : { "version" : "2", - "offline" : true, + "offline" : false, "icons" : { "small" : { "ldpi" : "static/images/about_logo.png", @@ -111,7 +111,7 @@ } }, "splashscreen" : { - "androidStyle" : "default", + "androidStyle" : "common", "iosStyle" : "common", "android" : { "hdpi" : "unpackage/res/cover/480_762.9.png", diff --git a/pages.json b/pages.json index 4fc1837..82e0bc9 100644 --- a/pages.json +++ b/pages.json @@ -1,10 +1,8 @@ { "pages": [ + //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path": "pages/index/guide", - "style": { - "navigationBarTitleText": "" - } + "path": "pages/common/login/index" }, { "path": "pages/index/launch", @@ -12,9 +10,11 @@ "navigationBarTitleText": "" } }, - //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path": "pages/common/login/index" + "path": "pages/index/guide", + "style": { + "navigationBarTitleText": "" + } }, { "path": "pages/common/registerOrForget/index" @@ -277,7 +277,11 @@ { "path": "pages/common/upgrade", "style": { - "navigationBarTitleText": "" + "navigationStyle": "custom", + "backgroundColor": "transparent", + "navigationBarTextStyle": "white", + "navigationBarTitleText": "系统更新", + "enablePullDownRefresh": false } }, { diff --git a/pages/common/contactChoose/choose.vue b/pages/common/contactChoose/choose.vue index 8040288..2e2d8f0 100644 --- a/pages/common/contactChoose/choose.vue +++ b/pages/common/contactChoose/choose.vue @@ -235,6 +235,7 @@ } }, confirm() { + const _this = this; //console.log(this.checkedUserIDList,this.checkedGroupIDList); //return false; // if (this.activeTab) { @@ -262,16 +263,20 @@ return; } if (this.type === ContactChooseTypes.Invite) { + console.log(_this.getCheckedUserInfo,_this.groupID); IMSDK.asyncApi(IMSDK.IMMethods.InviteUserToGroup, IMSDK.uuid(), { - groupID: this.groupID, + groupID: _this.groupID, reason: "", - userIDList: this.getCheckedUserInfo.map((user) => user.userID), + userIDList: _this.getCheckedUserInfo.map((user) => user.userID), }) .then(() => { toastWithCallback("操作成功", () => uni.navigateBack()); - this.comfirmLoading = false; + _this.comfirmLoading = false; }) - .catch(() => toastWithCallback("操作失败")); + .catch((e) => { + console.log(e); + toastWithCallback("操作失败") + }); return; } diff --git a/pages/common/contactChoose/chooseGroupMember.vue b/pages/common/contactChoose/chooseGroupMember.vue index 734b42d..c1182af 100644 --- a/pages/common/contactChoose/chooseGroupMember.vue +++ b/pages/common/contactChoose/chooseGroupMember.vue @@ -66,8 +66,6 @@ return true; } return false; - console.log(friend.nickname); - return friend.nickname.indexOf(this.keyword) !==-1 || friend?.remark.indexOf(this.keyword) !==-1 } ), ], diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue index cf27a58..34d88db 100644 --- a/pages/common/login/index.vue +++ b/pages/common/login/index.vue @@ -158,37 +158,35 @@ export default { }); }, async startLogin() { - this.$refs.loginForm.validate().then(async (valid) => { - this.loading = true; - this.saveLoginInfo(); - let data = {}; - try { - data = await businessLogin({ - mobile: this.loginInfo.phoneNumber, - email: this.loginInfo.email, - region: `+${this.loginInfo.region}`, - password: this.isPwdLogin ? md5(this.loginInfo.password) : "", - platform: uni.$u.os(), - type: this.active === 0 ? 'mobile' : 'email', - code: this.loginInfo.verificationCode, - }); - const { imToken, userID } = data; - this.saveLoginProfile(data); - this.$store.commit("user/SET_AUTH_DATA", data); - this.loginInfo.password = ""; - // #ifdef APP - // await IMSDK.asyncApi(IMSDK.IMMethods.Login, uuidv4(), { - // userID, - // token: imToken, - // }); - plus.runtime.restart(); - // #endif - } catch (err) { - console.error(err); - uni.$u.toast(checkLoginError(err)); - } - this.loading = false; - }); + this.loading = true; + this.saveLoginInfo(); + let data = {}; + try { + data = await businessLogin({ + mobile: this.loginInfo.phoneNumber, + email: this.loginInfo.email, + region: `+${this.loginInfo.region}`, + password: this.isPwdLogin ? md5(this.loginInfo.password) : "", + platform: uni.$u.os(), + type: this.active === 0 ? 'mobile' : 'email', + code: this.loginInfo.verificationCode, + }); + const { imToken, userID } = data; + this.saveLoginProfile(data); + this.$store.commit("user/SET_AUTH_DATA", data); + this.loginInfo.password = ""; + // #ifdef APP + // await IMSDK.asyncApi(IMSDK.IMMethods.Login, uuidv4(), { + // userID, + // token: imToken, + // }); + plus.runtime.restart(); + // #endif + } catch (err) { + console.error(err); + uni.$u.toast(checkLoginError(err)); + } + this.loading = false; }, saveLoginProfile(data) { const { imToken, token, userID } = data; @@ -275,6 +273,7 @@ export default { align-items: center; img { + border-radius: 32rpx; width: 160rpx; height: 160rpx; } diff --git a/pages/common/upgrade.vue b/pages/common/upgrade.vue index 9a80f46..3b69475 100644 --- a/pages/common/upgrade.vue +++ b/pages/common/upgrade.vue @@ -1,24 +1,32 @@ - diff --git a/pages/contact/groupList/index.vue b/pages/contact/groupList/index.vue index 6446d70..6a4df2f 100644 --- a/pages/contact/groupList/index.vue +++ b/pages/contact/groupList/index.vue @@ -1,157 +1,135 @@ + .pane_title { + font-size: 14px; + color: #999; + padding: 6px 22px; + background-color: #f8f8f8; + } + } + } + } + \ No newline at end of file diff --git a/pages/conversation/chating/components/MessageItem/PictureMessageRender.vue b/pages/conversation/chating/components/MessageItem/PictureMessageRender.vue index 551c04e..c887372 100644 --- a/pages/conversation/chating/components/MessageItem/PictureMessageRender.vue +++ b/pages/conversation/chating/components/MessageItem/PictureMessageRender.vue @@ -33,7 +33,7 @@ conversationID:String, }, data() { - console.log(this.message); + //console.log(this.message); return { loadingWidth: "120px", src:"", @@ -64,7 +64,7 @@ util.cacheFile(snapshotUrl,`${this.conversationID}`).then((fn)=>{ self.coverDownloading = false; self.src = fn; - console.log(fn); + //console.log(fn); }); }, clickMediaItem() { diff --git a/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue b/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue index 9c7c06b..1b0e5e7 100644 --- a/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue +++ b/pages/conversation/chating/components/MessageItem/VideoMessageRender.vue @@ -117,10 +117,10 @@ methods: { async init(){ const self = this; - console.log(this.message?.videoElem); - const snapshotUrl = this.message?.videoElem?.snapshotPath || this.message?.videoElem?.snapshotUrl; + //console.log(this.message?.videoElem); + const snapshotUrl = this.message?.videoElem?.snapshotUrl; self.coverDownloading = true; - console.log(snapshotUrl); + //console.log(snapshotUrl); util.cacheFile(snapshotUrl,`${this.conversationID}`).then((fn)=>{ self.coverDownloading = false; self.src = fn; diff --git a/pages/conversation/conversationList/components/ChatHeader.vue b/pages/conversation/conversationList/components/ChatHeader.vue index 2148c9e..1fef882 100644 --- a/pages/conversation/conversationList/components/ChatHeader.vue +++ b/pages/conversation/conversationList/components/ChatHeader.vue @@ -24,7 +24,7 @@ 添加好友 - + 扫一扫 @@ -191,6 +191,45 @@ padding: 0 24rpx 10rpx; //margin-top: var(--status-bar-height); background: #f4f4f4; + .status_notice{ + .err-tag { + display: flex; + justify-content: center; + align-items: center; + height: 44rpx; + background: #ffe1dd; + border-radius: 12rpx 12rpx 12rpx 12rpx; + margin-left: 8rpx; + + .status { + font-size: 24rpx; + margin-left: 8rpx; + font-weight: 400; + color: #ff381f; + } + } + + .tag { + display: flex; + justify-content: center; + align-items: center; + height: 44rpx; + background: #f2f8ff; + border-radius: 12rpx 12rpx 12rpx 12rpx; + margin-left: 8rpx; + + .loading { + animation: loading 1.5s infinite; + } + + .status { + font-size: 24rpx; + margin-left: 8rpx; + font-weight: 400; + color: #0089ff; + } + } + } .self_info { @include btwBox(); @@ -216,46 +255,6 @@ max-width: 240rpx; } - .err-tag { - display: flex; - justify-content: center; - align-items: center; - width: 152rpx; - height: 44rpx; - background: #ffe1dd; - border-radius: 12rpx 12rpx 12rpx 12rpx; - margin-left: 8rpx; - - .status { - font-size: 24rpx; - margin-left: 8rpx; - font-weight: 400; - color: #ff381f; - } - } - - .tag { - display: flex; - justify-content: center; - align-items: center; - width: 152rpx; - height: 44rpx; - background: #f2f8ff; - border-radius: 12rpx 12rpx 12rpx 12rpx; - margin-left: 8rpx; - - .loading { - animation: loading 1.5s infinite; - } - - .status { - font-size: 24rpx; - margin-left: 8rpx; - font-weight: 400; - color: #0089ff; - } - } - .online_state { @include vCenterBox(); margin-left: 24rpx; diff --git a/pages/conversation/conversationList/components/ConversationItem.vue b/pages/conversation/conversationList/components/ConversationItem.vue index c7136e8..5993159 100644 --- a/pages/conversation/conversationList/components/ConversationItem.vue +++ b/pages/conversation/conversationList/components/ConversationItem.vue @@ -1,7 +1,10 @@