dmy 5 gadi atpakaļ
vecāks
revīzija
35c1082e13

+ 9 - 4
_src/components/chatMini/chatMini.vue

@@ -642,7 +642,7 @@ export default {
     /**
      * @des 处理消息发送
      */
-    handleSend (e) {
+    async handleSend (e) {
       // 判断是否被禁言
       if (this.blockList.some(id => id == this.userId)) {
         Message({
@@ -667,6 +667,9 @@ export default {
         msg: text
       }
 
+      // 清空输入框
+      this.inputMsg = ''
+
       // 用户不是第一次发言
       if (this.group.members[this.userId]) {
         let createTime = Date.now()
@@ -680,13 +683,15 @@ export default {
           loading: true
         })
         opt.createTime = createTime
-      }
 
-      this.doSendMsg(opt)
+        this.doSendMsg(opt)
+      } else {
+        // 发言后,才滚动底部
+        await this.doSendMsg(opt)
+      }
 
       // 滚到底部
       this.$nextTick(function () {
-        this.inputMsg = ''
         this.resizeToBottom()
       })
 

+ 4 - 1
_src/components/chatPin/index.vue

@@ -2,7 +2,7 @@
   <div class="chat-pinmsg" v-if="visible" @click="scrollToView">
     <label>消息:</label>
     <div class="msg-content">{{msg | decryptoMsg}}</div>
-    <i class="msg-close" @click="handleClose"></i>
+    <i class="msg-close" @click.stop="handleClose"></i>
   </div>
 </template>
 
@@ -52,6 +52,9 @@ export default {
       } else {
         this.$emit('pinMsgClose')
       }
+
+      //      event.stopPropagation()
+      //      return false
     },
     scrollToView (event) {
       this.$emit('scrollToView')

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/css/mini.488d4edc.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/js/mini.5afa93f9.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/js/mini.cf9c068a.js


+ 5 - 5
dist/precache-manifest.a81992b2b7953db3f50fb2db122cf4c1.js → dist/precache-manifest.bc544114b650b56c350c6ee44b252be7.js

@@ -24,12 +24,12 @@ self.__precacheManifest = [
     "url": "/dist/js/index.51b63a0d.js"
   },
   {
-    "revision": "9c9d659c1a9d081f0d61",
-    "url": "/dist/css/mini.f987f1a4.css"
+    "revision": "e338d5dc5fb284d7663f",
+    "url": "/dist/css/mini.488d4edc.css"
   },
   {
-    "revision": "9c9d659c1a9d081f0d61",
-    "url": "/dist/js/mini.5afa93f9.js"
+    "revision": "e338d5dc5fb284d7663f",
+    "url": "/dist/js/mini.cf9c068a.js"
   },
   {
     "revision": "2fad952a20fbbcfd1bf2ebb210dccf7a",
@@ -56,7 +56,7 @@ self.__precacheManifest = [
     "url": "/dist/../protected/views/index.html"
   },
   {
-    "revision": "3f8a4136962e25e1ed33c2cc4a659786",
+    "revision": "529872aba323f738a75e4ae79b619c96",
     "url": "/dist/../protected/views/mini.html"
   },
   {

+ 1 - 1
dist/sw.js

@@ -1,4 +1,4 @@
-importScripts("/dist/precache-manifest.a81992b2b7953db3f50fb2db122cf4c1.js");
+importScripts("/dist/precache-manifest.bc544114b650b56c350c6ee44b252be7.js");
 
 /**
  * Welcome to your Workbox-powered service worker!

+ 2 - 2
protected/views/mini.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><!--[if IE]><link rel="icon" href="/dist/favicon.ico"><![endif]--><title>MeeChat</title><link href=/dist/css/chunk-common.8c86bc0a.css rel=preload as=style><link href=/dist/css/chunk-vendors.f66650d8.css rel=preload as=style><link href=/dist/css/mini.f987f1a4.css rel=preload as=style><link href=/dist/js/chunk-common.624e70d5.js rel=preload as=script><link href=/dist/js/chunk-vendors.1c5d4e4f.js rel=preload as=script><link href=/dist/js/mini.5afa93f9.js rel=preload as=script><link href=/dist/css/chunk-vendors.f66650d8.css rel=stylesheet><link href=/dist/css/chunk-common.8c86bc0a.css rel=stylesheet><link href=/dist/css/mini.f987f1a4.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=/dist/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/dist/img/icons/favicon-16x16.png><link rel=manifest href=/dist/manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=MeeChat><link rel=apple-touch-icon href=/dist/img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=/dist/img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=/dist/img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><div id=app></div><script>window.EOS_PROTOCOL = 'https'
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><!--[if IE]><link rel="icon" href="/dist/favicon.ico"><![endif]--><title>MeeChat</title><link href=/dist/css/chunk-common.8c86bc0a.css rel=preload as=style><link href=/dist/css/chunk-vendors.f66650d8.css rel=preload as=style><link href=/dist/css/mini.488d4edc.css rel=preload as=style><link href=/dist/js/chunk-common.624e70d5.js rel=preload as=script><link href=/dist/js/chunk-vendors.1c5d4e4f.js rel=preload as=script><link href=/dist/js/mini.cf9c068a.js rel=preload as=script><link href=/dist/css/chunk-vendors.f66650d8.css rel=stylesheet><link href=/dist/css/chunk-common.8c86bc0a.css rel=stylesheet><link href=/dist/css/mini.488d4edc.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=/dist/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/dist/img/icons/favicon-16x16.png><link rel=manifest href=/dist/manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=MeeChat><link rel=apple-touch-icon href=/dist/img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=/dist/img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=/dist/img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><div id=app></div><script>window.EOS_PROTOCOL = 'https'
       window.EOS_HOST = 'proxy.eosnode.tools'
-      window.EOS_PORT = '443'</script><script src=/dist/js/chunk-vendors.1c5d4e4f.js></script><script src=/dist/js/chunk-common.624e70d5.js></script><script src=/dist/js/mini.5afa93f9.js></script></body></html>
+      window.EOS_PORT = '443'</script><script src=/dist/js/chunk-vendors.1c5d4e4f.js></script><script src=/dist/js/chunk-common.624e70d5.js></script><script src=/dist/js/mini.cf9c068a.js></script></body></html>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels