Skip to content

P
pica-admin-consultation
提交 3bd5ce0a 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

Merge branch 'develop' into 'release' 

Develop

See merge request !130
上级 6dd8db56 2540b688
隐藏空白字符变更
内嵌 并排
正在显示 包含 170 行增加 和 11 行删除
package-lock.json
浏览文件 @ 3bd5ce0a
...@@ -22,6 +22,123 @@ ...@@ -22,6 +22,123 @@
"regenerator-runtime": "^0.13.4" "regenerator-runtime": "^0.13.4"
} }
}, },
"@better-scroll/core": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fcore/-/core-2.4.2.tgz",
"integrity": "sha1-5pRwAS15kjoYA0w+STFyD7sG6uU=",
"requires": {
"@better-scroll/shared-utils": "^2.4.2"
}
},
"@better-scroll/indicators": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2findicators/-/indicators-2.4.2.tgz",
"integrity": "sha1-nHJkenZOVA8/81aTfFTYLHcceKo=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/infinity": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2finfinity/-/infinity-2.4.2.tgz",
"integrity": "sha1-gsPmFVX+rx04gs+jXusczgn5Hhs=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/mouse-wheel": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fmouse-wheel/-/mouse-wheel-2.4.2.tgz",
"integrity": "sha1-3qcKYNwqN5XvatVp0t6ltMfpr0w=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/movable": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fmovable/-/movable-2.4.2.tgz",
"integrity": "sha1-84XmXSPOogMf3cUt1OtPUr1fxOc=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/nested-scroll": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fnested-scroll/-/nested-scroll-2.4.2.tgz",
"integrity": "sha1-RGgPSwIXZGElDmvm2V8qxhaaHJg=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/observe-dom": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fobserve-dom/-/observe-dom-2.4.2.tgz",
"integrity": "sha1-zB5tgqj1NSXCgsmkvOpdG+jCHJU=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/observe-image": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fobserve-image/-/observe-image-2.4.2.tgz",
"integrity": "sha1-tuVdIx0Lslcduxh3jaks+93i3VQ=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/pull-down": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fpull-down/-/pull-down-2.4.2.tgz",
"integrity": "sha1-a5iyi9c+m2lLCFepxzh55wM5y5Y=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/pull-up": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fpull-up/-/pull-up-2.4.2.tgz",
"integrity": "sha1-JTV87ve6x1IJMPBjGJa2OhD4Km8=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/scroll-bar": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fscroll-bar/-/scroll-bar-2.4.2.tgz",
"integrity": "sha1-JXhWodon1l64mawm8BBgr7+AC9s=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/shared-utils": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fshared-utils/-/shared-utils-2.4.2.tgz",
"integrity": "sha1-GsXJdJVycJOiKoAJVgeV3V48GNo="
},
"@better-scroll/slide": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fslide/-/slide-2.4.2.tgz",
"integrity": "sha1-AkUorldRai7pm+o0Y4FYnk5qA5w=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/wheel": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fwheel/-/wheel-2.4.2.tgz",
"integrity": "sha1-DddLA1meAagtVdKfbcrXqKUDvXU=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@better-scroll/zoom": {
"version": "2.4.2",
"resolved": "http://192.168.110.93:4873/@better-scroll%2fzoom/-/zoom-2.4.2.tgz",
"integrity": "sha1-wmwt8zEu11sx8CA8Xy5hgavAbF4=",
"requires": {
"@better-scroll/core": "^2.4.2"
}
},
"@pica-core/web-buried-point": { "@pica-core/web-buried-point": {
"version": "1.0.9", "version": "1.0.9",
"resolved": "http://192.168.110.93:4873/@pica-core%2fweb-buried-point/-/web-buried-point-1.0.9.tgz", "resolved": "http://192.168.110.93:4873/@pica-core%2fweb-buried-point/-/web-buried-point-1.0.9.tgz",
...@@ -1271,11 +1388,24 @@ ...@@ -1271,11 +1388,24 @@
} }
}, },
"better-scroll": { "better-scroll": {
"version": "0.1.15", "version": "2.4.0",
"resolved": "http://192.168.110.93:4873/better-scroll/-/better-scroll-0.1.15.tgz", "resolved": "http://192.168.110.93:4873/better-scroll/-/better-scroll-2.4.0.tgz",
"integrity": "sha1-F71fwXXS+0ItNwFjyKueKHKbL8E=", "integrity": "sha1-5/4Y60ANDjNjJu6YF3HfM2VXDyQ=",
"requires": { "requires": {
"babel-runtime": "^6.0.0" "@better-scroll/core": "^2.4.0",
"@better-scroll/indicators": "^2.4.0",
"@better-scroll/infinity": "^2.4.0",
"@better-scroll/mouse-wheel": "^2.4.0",
"@better-scroll/movable": "^2.4.0",
"@better-scroll/nested-scroll": "^2.4.0",
"@better-scroll/observe-dom": "^2.4.0",
"@better-scroll/observe-image": "^2.4.0",
"@better-scroll/pull-down": "^2.4.0",
"@better-scroll/pull-up": "^2.4.0",
"@better-scroll/scroll-bar": "^2.4.0",
"@better-scroll/slide": "^2.4.0",
"@better-scroll/wheel": "^2.4.0",
"@better-scroll/zoom": "^2.4.0"
} }
}, },
"big.js": { "big.js": {
......
src/components/IM/chat.vue
浏览文件 @ 3bd5ce0a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
v-show="showChat" v-show="showChat"
> >
<section v-show="toggleChatSize" class="component-content" id="screenSet"> <section v-show="toggleChatSize" class="component-content" id="screenSet">
<article class="center" v-loadmore="getOldMSGHistory"> <article class="center BSListWraper" v-loadmore="getOldMSGHistory">
<section class="c-header"> <section class="c-header">
<div class="header-line"> <div class="header-line">
<div class="c-header-l"> <div class="c-header-l">
...@@ -323,6 +323,8 @@ export default { ...@@ -323,6 +323,8 @@ export default {
doctorName: "", doctorName: "",
doctorImg: "", doctorImg: "",
toggleChatSize: true, toggleChatSize: true,
loadingListToggle: true,
loadingInstanceToggle: null
}; };
}, },
computed: { computed: {
...@@ -358,16 +360,17 @@ export default { ...@@ -358,16 +360,17 @@ export default {
this.chatInit(); this.chatInit();
} }
}, },
showChat (nv) {
if(nv){
this.scrollToTOLoad();
}
}
}, },
created() {}, created() {},
mounted() { mounted() {
cacheMap = {}; cacheMap = {};
this.$nextTick(() => {
// _this.containerHeight = document.body.clientHeight - 80;
// _this.getElmByID("msgContentId").style.height = "400px";
});
}, },
methods: { methods: {
...@@ -463,6 +466,7 @@ export default { ...@@ -463,6 +466,7 @@ export default {
// 将新消息合并到之前的消息中, 并且重置最后一条消息 // 将新消息合并到之前的消息中, 并且重置最后一条消息
if (res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
this.convertMessageList(res.data, 3); this.convertMessageList(res.data, 3);
this.hasNoHistoryData = false;
} else { } else {
this.hasNoHistoryData = true; this.hasNoHistoryData = true;
} }
...@@ -472,6 +476,9 @@ export default { ...@@ -472,6 +476,9 @@ export default {
type: "error", type: "error",
}); });
} }
this.loadingListToggle = true;
}).finally( () => {
this.loadingListToggle = true;
}); });
}, },
...@@ -484,13 +491,21 @@ export default { ...@@ -484,13 +491,21 @@ export default {
}; };
this.POST("/im/team/message/history", params).then((res) => { this.POST("/im/team/message/history", params).then((res) => {
if (res.code === "000000") { if (res.code === "000000") {
this.convertMessageList(res.data, 1); if (res.data && res.data.length > 0) {
this.convertMessageList(res.data, 1);
this.hasNoHistoryData = false;
} else {
this.hasNoHistoryData = true;
}
} else { } else {
this.$message({ this.$message({
message: res.message, message: res.message,
type: "error", type: "error",
}); });
} }
this.loadingListToggle = true;
}).finally( () => {
this.loadingListToggle = true;
}); });
}, },
...@@ -1032,6 +1047,20 @@ export default { ...@@ -1032,6 +1047,20 @@ export default {
toggleChatModal() { toggleChatModal() {
this.toggleChatSize = !this.toggleChatSize; this.toggleChatSize = !this.toggleChatSize;
}, },
scrollToTOLoad () {
const scrollBoxDom = document.querySelector(".scroll-box");
const that = this;
console.log('---scrollBoxDom', scrollBoxDom);
scrollBoxDom.addEventListener('scroll', function () {
if(scrollBoxDom.scrollTop == 0 && this.loadingListToggle) {
this.loadingListToggle = false;
that.getOldMSGHistory();
}
})
}
}, },
beforeDestroy() { beforeDestroy() {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或