diff --git a/im-uniapp/components/image-upload/image-upload.vue b/im-uniapp/components/image-upload/image-upload.vue index 30723ec..54a4875 100644 --- a/im-uniapp/components/image-upload/image-upload.vue +++ b/im-uniapp/components/image-upload/image-upload.vue @@ -15,6 +15,10 @@ } }, props: { + maxCount:{ + type: Number, + default: 1 + }, maxSize: { type: Number, default: 5*1024*1024 @@ -39,7 +43,7 @@ methods: { selectAndUpload() { uni.chooseImage({ - count: 9, //最多可以选择的图片张数,默认9 + count: this.maxCount, //最多可以选择的图片张数,默认9 sourceType: [this.sourceType], //album 从相册选图,camera 使用相机,默认二者都有。如需直接开相机或直接选相册,请只使用一个选项 sizeType: ['original'], //original 原图,compressed 压缩图,默认二者都有 success: (res) => { diff --git a/im-uniapp/package.json b/im-uniapp/package.json index d17374a..91b9952 100644 --- a/im-uniapp/package.json +++ b/im-uniapp/package.json @@ -6,16 +6,16 @@ "browser":"chrome", "env": { "UNI_PLATFORM": "h5", - "BASE_URL": "http://192.168.31.112:8888", - "WS_URL": "ws://192.168.31.112:8878/im" + "BASE_URL": "http://127.0.0.1:8888", + "WS_URL": "ws://127.0.0.1:8878/im" } }, "dev-wx-mini": { "title": "开发环境-微信小程序", "env": { "UNI_PLATFORM": "mp-weixin", - "BASE_URL": "http://192.168.31.112:8888", - "WS_URL": "ws://192.168.31.112:8878/im" + "BASE_URL": "http://127.0.0.1:8888", + "WS_URL": "ws://127.0.0.1:8878/im" } }, "prod-h5": { diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue index cc7d312..a17c516 100644 --- a/im-uniapp/pages/chat/chat-box.vue +++ b/im-uniapp/pages/chat/chat-box.vue @@ -32,7 +32,7 @@ - diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js index 4360a6f..60c4c91 100644 --- a/im-uniapp/store/chatStore.js +++ b/im-uniapp/store/chatStore.js @@ -67,11 +67,9 @@ export default { }, moveTop(state,idx){ let chat = state.chats[idx]; - // 放置头部 state.chats.splice(idx, 1); state.chats.unshift(chat); - console.log(state.chats) }, insertMessage(state, msgInfo) { // 获取对方id或群id @@ -195,8 +193,10 @@ export default { context.commit("setChats",res.data); resolve() }, - fail() { - resolve(); + fail(e) { + // 不存在聊天记录,清空聊天列表 + context.commit("setChats",[]); + resolve() } }); })