From 4f2802e3095eb67ddc5422959307c33255f35e40 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 30 Sep 2023 18:36:44 +0800 Subject: [PATCH] =?UTF-8?q?uniapp-=E5=A5=BD=E5=8F=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../implatform/controller/UserController.java | 2 +- im-uniapp/App.vue | 5 +- im-uniapp/common/request.js | 4 +- .../components/friend-item/friend-item.vue | 98 +++++++++++++ im-uniapp/main.js | 18 +-- im-uniapp/pages.json | 131 ++++++++++++++++-- im-uniapp/pages/chat/chat.vue | 22 +++ im-uniapp/pages/common/user-info.vue | 108 +++++++++++++++ im-uniapp/pages/friend/friend-search.vue | 41 ++++++ im-uniapp/pages/friend/friend.vue | 68 +++++++++ im-uniapp/pages/group/group.vue | 22 +++ im-uniapp/pages/index/index.vue | 52 ------- im-uniapp/pages/login/login.vue | 5 +- im-uniapp/pages/mine/mine.vue | 22 +++ im-uniapp/static/iconfont/iconfont.ttf | Bin 0 -> 1932 bytes im-uniapp/static/tarbar/chat.png | Bin 0 -> 3456 bytes im-uniapp/static/tarbar/chat_active.png | Bin 0 -> 3537 bytes im-uniapp/static/tarbar/friend.png | Bin 0 -> 3991 bytes im-uniapp/static/tarbar/friend_active.png | Bin 0 -> 3853 bytes im-uniapp/static/tarbar/group.png | Bin 0 -> 3962 bytes im-uniapp/static/tarbar/group_active.png | Bin 0 -> 4008 bytes im-uniapp/static/tarbar/mine.png | Bin 0 -> 3315 bytes im-uniapp/static/tarbar/mine_active.png | Bin 0 -> 3412 bytes im-uniapp/store/groupStore.js | 1 - im-uniapp/store/index.js | 29 ++-- 25 files changed, 524 insertions(+), 104 deletions(-) create mode 100644 im-uniapp/components/friend-item/friend-item.vue create mode 100644 im-uniapp/pages/chat/chat.vue create mode 100644 im-uniapp/pages/common/user-info.vue create mode 100644 im-uniapp/pages/friend/friend-search.vue create mode 100644 im-uniapp/pages/friend/friend.vue create mode 100644 im-uniapp/pages/group/group.vue delete mode 100644 im-uniapp/pages/index/index.vue create mode 100644 im-uniapp/pages/mine/mine.vue create mode 100644 im-uniapp/static/iconfont/iconfont.ttf create mode 100644 im-uniapp/static/tarbar/chat.png create mode 100644 im-uniapp/static/tarbar/chat_active.png create mode 100644 im-uniapp/static/tarbar/friend.png create mode 100644 im-uniapp/static/tarbar/friend_active.png create mode 100644 im-uniapp/static/tarbar/group.png create mode 100644 im-uniapp/static/tarbar/group_active.png create mode 100644 im-uniapp/static/tarbar/mine.png create mode 100644 im-uniapp/static/tarbar/mine_active.png diff --git a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java index 4d6e06d..685fbfd 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java @@ -36,7 +36,7 @@ public class UserController { @GetMapping("/self") @ApiOperation(value = "获取当前用户信息",notes="获取当前用户信息") - public Result findSelfInfo(){ + public Result findSelfInfo(){ UserSession session = SessionContext.getSession(); User user = userService.getById(session.getUserId()); UserVO userVO = BeanUtils.copyProperties(user,UserVO.class); diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index 8c2b732..23ee413 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -12,6 +12,5 @@ } - + \ No newline at end of file diff --git a/im-uniapp/common/request.js b/im-uniapp/common/request.js index 9daa3e6..e8e5e77 100644 --- a/im-uniapp/common/request.js +++ b/im-uniapp/common/request.js @@ -1,4 +1,4 @@ -const BASE_URL = "http://127.0.0.1:8888" +const BASE_URL = "http://192.168.43.6:8888" const request = (options) => { const header = options.header||{}; @@ -31,7 +31,7 @@ const request = (options) => { const data = await request({ method: 'PUT', url: '/refreshToken', - headers: { + header: { refreshToken: refreshToken } }) diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue new file mode 100644 index 0000000..847abe1 --- /dev/null +++ b/im-uniapp/components/friend-item/friend-item.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/im-uniapp/main.js b/im-uniapp/main.js index 92c0e3c..bbf83ab 100644 --- a/im-uniapp/main.js +++ b/im-uniapp/main.js @@ -1,23 +1,8 @@ import App from './App' import request from './common/request'; import store from './store'; -// #ifndef VUE3 -import Vue from 'vue' -import './uni.promisify.adaptor' - -Vue.prototype.$http = request -console.log(Vue.prototype.$http) -Vue.config.productionTip = false -App.mpType = 'app' -const app = new Vue({ - ...App, - store -}) -app.$mount() -// #endif - -// #ifdef VUE3 import { createSSRApp } from 'vue' + export function createApp() { const app = createSSRApp(App) app.use(store); @@ -26,4 +11,3 @@ export function createApp() { app } } -// #endif \ No newline at end of file diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json index c98ec78..184aa5f 100644 --- a/im-uniapp/pages.json +++ b/im-uniapp/pages.json @@ -1,17 +1,128 @@ { - "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "盒子IM" + "pages": [{ + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "盒子IM" + } + }, { + "path": "pages/chat/chat", + "style": { + "navigationBarTitleText": "聊天消息", + + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "", + "fontSrc": "/static/iconfont/iconfont.ttf", + "fontSize": "40rpx" + }, + { + "text": "", + "fontSrc": "/static/iconFont/iconfont.ttf", + "fontSize": "40rpx" + } + ] + } + } + } + }, { + "path": "pages/friend/friend", + "style": { + "navigationBarTitleText": "好友列表", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": { + "buttons": [{ + "text": "", + "fontSrc": "/static/iconfont/iconfont.ttf", + "fontSize": "40rpx", + "width": "50rpx" + }, + { + "text": "", + "fontSrc": "/static/iconFont/iconfont.ttf", + "fontSize": "30rpx", + "width": "50rpx" + } + ] + } } } - ], + + }, { + "path": "pages/group/group", + "style": { + "navigationBarTitleText": "群聊列表", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/mine/mine", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { + "path": "pages/friend/friend-search", + "style": { + "app-plus": { + "navigationBarTitleText": "好友查找", + "titleNView": { + "buttons": [{ + "text": "取消", + "fontSize": "20rpx", + "width": "80rpx" + } + + ], + "searchInput": { + "autoFocus": true, + "placeholder": "输入好友昵称", + "borderRadius": "10rpx" + }, + "autoBackButton": false + } + + } + } + },{ + "path": "pages/common/user-info" + }], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "navigationBarBackgroundColor": "#F0F0F0", + "backgroundColor": "#fdfdfd" + }, + "tabBar": { + "color": "#999999", + "selectedColor": "#09C160", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/chat/chat", + "iconPath": "static/tarbar/chat.png", + "selectedIconPath": "static/tarbar/chat_active.png", + "text": "消息" + }, + { + "pagePath": "pages/friend/friend", + "iconPath": "static/tarbar/friend.png", + "selectedIconPath": "static/tarbar/friend_active.png", + "text": "好友" + }, + { + "pagePath": "pages/group/group", + "iconPath": "static/tarbar/group.png", + "selectedIconPath": "static/tarbar/group_active.png", + "text": "群聊" + }, + { + "pagePath": "pages/mine/mine", + "iconPath": "static/tarbar/mine.png", + "selectedIconPath": "static/tarbar/mine_active.png", + "text": "我的" + } + ] }, "uniIdRouter": {} -} +} \ No newline at end of file diff --git a/im-uniapp/pages/chat/chat.vue b/im-uniapp/pages/chat/chat.vue new file mode 100644 index 0000000..afa140c --- /dev/null +++ b/im-uniapp/pages/chat/chat.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/im-uniapp/pages/common/user-info.vue b/im-uniapp/pages/common/user-info.vue new file mode 100644 index 0000000..c866b3b --- /dev/null +++ b/im-uniapp/pages/common/user-info.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/friend/friend-search.vue b/im-uniapp/pages/friend/friend-search.vue new file mode 100644 index 0000000..5a5a929 --- /dev/null +++ b/im-uniapp/pages/friend/friend-search.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/im-uniapp/pages/friend/friend.vue b/im-uniapp/pages/friend/friend.vue new file mode 100644 index 0000000..415f0ac --- /dev/null +++ b/im-uniapp/pages/friend/friend.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/im-uniapp/pages/group/group.vue b/im-uniapp/pages/group/group.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/im-uniapp/pages/group/group.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/im-uniapp/pages/index/index.vue b/im-uniapp/pages/index/index.vue deleted file mode 100644 index 6cc614d..0000000 --- a/im-uniapp/pages/index/index.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - - - \ No newline at end of file diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue index 10f9c80..c1133d2 100644 --- a/im-uniapp/pages/login/login.vue +++ b/im-uniapp/pages/login/login.vue @@ -54,7 +54,10 @@ uni.setStorageSync("accessToken", data.accessToken); uni.setStorageSync("refreshToken", data.refreshToken); this.$store.dispatch("initStore").then(()=>{ - console.log("成功") + console.log("登录成功,准备跳转...") + uni.switchTab({ + url:"/pages/chat/chat" + }) }) }) diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/im-uniapp/pages/mine/mine.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/im-uniapp/static/iconfont/iconfont.ttf b/im-uniapp/static/iconfont/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..94eaa3b5c0c9d2ed1839dd57055dd64e59c3f432 GIT binary patch literal 1932 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 literal 0 HcmV?d00001 diff --git a/im-uniapp/static/tarbar/friend.png b/im-uniapp/static/tarbar/friend.png new file mode 100644 index 0000000000000000000000000000000000000000..a92a9c682007c78dc860618ceee61516b94bfb81 GIT binary patch literal 3991 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 Nz+x=XRYtDl{{WMLH7)=E literal 0 HcmV?d00001 diff --git a/im-uniapp/static/tarbar/friend_active.png b/im-uniapp/static/tarbar/friend_active.png new file mode 100644 index 0000000000000000000000000000000000000000..d1d821c4907e7b0b90257b19a826e6b370381a76 GIT binary patch literal 3853 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%0AdwaM~%`v6tzEdn2FXM2(AZ@a9RncMgGWv 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 literal 0 HcmV?d00001 diff --git a/im-uniapp/static/tarbar/mine_active.png b/im-uniapp/static/tarbar/mine_active.png new file mode 100644 index 0000000000000000000000000000000000000000..ece5717eb947e1d1a41fc8af1e3c7005bbfd2715 GIT binary patch literal 3412 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 { context.commit("setGroups", groups); resolve(); - console.log("groupstore") }).catch(() => { reject(); }) diff --git a/im-uniapp/store/index.js b/im-uniapp/store/index.js index acc4a9f..838fe95 100644 --- a/im-uniapp/store/index.js +++ b/im-uniapp/store/index.js @@ -1,25 +1,20 @@ - import chatStore from './chatStore.js'; import friendStore from './friendStore.js'; import userStore from './userStore.js'; import groupStore from './groupStore.js'; import uiStore from './uiStore.js'; - -// #ifndef VUE3 -import Vue from 'vue' -import Vuex from 'vuex' -Vue.use(Vuex) -const store = new Vuex.Store({ -// #endif - -// #ifdef VUE3 -import { createStore } from 'vuex'; - const store = createStore({ -// #endif - modules: {chatStore,friendStore,userStore,groupStore,uiStore}, +import {createStore} from 'vuex'; +const store = createStore({ + modules: { + chatStore, + friendStore, + userStore, + groupStore, + uiStore + }, state: {}, actions: { - initStore(context){ + initStore(context) { const promises = []; promises.push(this.dispatch("initUserStore")); promises.push(this.dispatch("initFriendStore")); @@ -28,6 +23,6 @@ import { createStore } from 'vuex'; } }, strict: true -}); +}) -export default store; +export default store; \ No newline at end of file