diff --git a/package-lock.json b/package-lock.json index 006f8b7..8a58554 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2988,6 +2988,44 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz", @@ -3061,6 +3099,13 @@ "slash": "^2.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "hash-sum": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz", @@ -3175,6 +3220,42 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } } } }, @@ -4888,9 +4969,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001319", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz", - "integrity": "sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw==" + "version": "1.0.30001418", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz", + "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==" }, "capture-exit": { "version": "2.0.0", @@ -16318,94 +16399,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/src/main.js b/src/main.js index b0883df..b1d508f 100644 --- a/src/main.js +++ b/src/main.js @@ -26,4 +26,5 @@ app.$mount() import http from "@/request/index.js" Vue.prototype.http=http -Vue.prototype.socketUrl = "ws://10.0.0.5:8080/webSocket" +// Vue.prototype.socketUrl = "ws://10.0.0.5:8080/webSocket" +Vue.prototype.socketUrl = "ws://yxx.ydool.net/webSocket" \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index ef09072..12b821b 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -92,11 +92,11 @@ "^/pre" : "" } // 此处pathRewrite加第二个参数是因为我的接口最后都有一个/api,在这个地方加/api等价于直接在target后加/api }, - "/sock" : { - // 预发布 - "target" : "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名 - "changeOrigin" : true // 是否跨域 - } + "/sock" : { + // 预发布 + "target" : "ws:// 10.0.0.5:8080/webSocket", // 目标接口域名 + "changeOrigin" : true // 是否跨域 + } } } } diff --git a/src/pages/famousArts/famousArts.vue b/src/pages/famousArts/famousArts.vue index 89c9a1c..86e0666 100644 --- a/src/pages/famousArts/famousArts.vue +++ b/src/pages/famousArts/famousArts.vue @@ -17,10 +17,10 @@ - + - + + + 已经没有更早的消息了 + + + 点击加载更多消息 + @@ -52,7 +58,7 @@ - + @@ -148,497 +154,6 @@ VoiceTimer: null, //表情定义 showEmji: '', - emojiList: [ - [{ - "url": "100.gif", - alt: "[微笑]" - }, { - "url": "101.gif", - alt: "[伤心]" - }, { - "url": "102.gif", - alt: "[美女]" - }, { - "url": "103.gif", - alt: "[发呆]" - }, { - "url": "104.gif", - alt: "[墨镜]" - }, { - "url": "105.gif", - alt: "[哭]" - }, { - "url": "106.gif", - alt: "[羞]" - }, { - "url": "107.gif", - alt: "[哑]" - }, { - "url": "108.gif", - alt: "[睡]" - }, { - "url": "109.gif", - alt: "[哭]" - }, { - "url": "110.gif", - alt: "[囧]" - }, { - "url": "111.gif", - alt: "[怒]" - }, { - "url": "112.gif", - alt: "[调皮]" - }, { - "url": "113.gif", - alt: "[笑]" - }, { - "url": "114.gif", - alt: "[惊讶]" - }, { - "url": "115.gif", - alt: "[难过]" - }, { - "url": "116.gif", - alt: "[酷]" - }, { - "url": "117.gif", - alt: "[汗]" - }, { - "url": "118.gif", - alt: "[抓狂]" - }, { - "url": "119.gif", - alt: "[吐]" - }, { - "url": "120.gif", - alt: "[笑]" - }, { - "url": "121.gif", - alt: "[快乐]" - }, { - "url": "122.gif", - alt: "[奇]" - }, { - "url": "123.gif", - alt: "[傲]" - }], - [{ - "url": "124.gif", - alt: "[饿]" - }, { - "url": "125.gif", - alt: "[累]" - }, { - "url": "126.gif", - alt: "[吓]" - }, { - "url": "127.gif", - alt: "[汗]" - }, { - "url": "128.gif", - alt: "[高兴]" - }, { - "url": "129.gif", - alt: "[闲]" - }, { - "url": "130.gif", - alt: "[努力]" - }, { - "url": "131.gif", - alt: "[骂]" - }, { - "url": "132.gif", - alt: "[疑问]" - }, { - "url": "133.gif", - alt: "[秘密]" - }, { - "url": "134.gif", - alt: "[乱]" - }, { - "url": "135.gif", - alt: "[疯]" - }, { - "url": "136.gif", - alt: "[哀]" - }, { - "url": "137.gif", - alt: "[鬼]" - }, { - "url": "138.gif", - alt: "[打击]" - }, { - "url": "139.gif", - alt: "[bye]" - }, { - "url": "140.gif", - alt: "[汗]" - }, { - "url": "141.gif", - alt: "[抠]" - }, { - "url": "142.gif", - alt: "[鼓掌]" - }, { - "url": "143.gif", - alt: "[糟糕]" - }, { - "url": "144.gif", - alt: "[恶搞]" - }, { - "url": "145.gif", - alt: "[什么]" - }, { - "url": "146.gif", - alt: "[什么]" - }, { - "url": "147.gif", - alt: "[累]" - }], - [{ - "url": "148.gif", - alt: "[看]" - }, { - "url": "149.gif", - alt: "[难过]" - }, { - "url": "150.gif", - alt: "[难过]" - }, { - "url": "151.gif", - alt: "[坏]" - }, { - "url": "152.gif", - alt: "[亲]" - }, { - "url": "153.gif", - alt: "[吓]" - }, { - "url": "154.gif", - alt: "[可怜]" - }, { - "url": "155.gif", - alt: "[刀]" - }, { - "url": "156.gif", - alt: "[水果]" - }, { - "url": "157.gif", - alt: "[酒]" - }, { - "url": "158.gif", - alt: "[篮球]" - }, { - "url": "159.gif", - alt: "[乒乓]" - }, { - "url": "160.gif", - alt: "[咖啡]" - }, { - "url": "161.gif", - alt: "[美食]" - }, { - "url": "162.gif", - alt: "[动物]" - }, { - "url": "163.gif", - alt: "[鲜花]" - }, { - "url": "164.gif", - alt: "[枯]" - }, { - "url": "165.gif", - alt: "[唇]" - }, { - "url": "166.gif", - alt: "[爱]" - }, { - "url": "167.gif", - alt: "[分手]" - }, { - "url": "168.gif", - alt: "[生日]" - }, { - "url": "169.gif", - alt: "[电]" - }, { - "url": "170.gif", - alt: "[炸弹]" - }, { - "url": "171.gif", - alt: "[刀子]" - }], - [{ - "url": "172.gif", - alt: "[足球]" - }, { - "url": "173.gif", - alt: "[瓢虫]" - }, { - "url": "174.gif", - alt: "[翔]" - }, { - "url": "175.gif", - alt: "[月亮]" - }, { - "url": "176.gif", - alt: "[太阳]" - }, { - "url": "177.gif", - alt: "[礼物]" - }, { - "url": "178.gif", - alt: "[抱抱]" - }, { - "url": "179.gif", - alt: "[拇指]" - }, { - "url": "180.gif", - alt: "[贬低]" - }, { - "url": "181.gif", - alt: "[握手]" - }, { - "url": "182.gif", - alt: "[剪刀手]" - }, { - "url": "183.gif", - alt: "[抱拳]" - }, { - "url": "184.gif", - alt: "[勾引]" - }, { - "url": "185.gif", - alt: "[拳头]" - }, { - "url": "186.gif", - alt: "[小拇指]" - }, { - "url": "187.gif", - alt: "[拇指八]" - }, { - "url": "188.gif", - alt: "[食指]" - }, { - "url": "189.gif", - alt: "[ok]" - }, { - "url": "190.gif", - alt: "[情侣]" - }, { - "url": "191.gif", - alt: "[爱心]" - }, { - "url": "192.gif", - alt: "[蹦哒]" - }, { - "url": "193.gif", - alt: "[颤抖]" - }, { - "url": "194.gif", - alt: "[怄气]" - }, { - "url": "195.gif", - alt: "[跳舞]" - }], - [{ - "url": "196.gif", - alt: "[发呆]" - }, { - "url": "197.gif", - alt: "[背着]" - }, { - "url": "198.gif", - alt: "[伸手]" - }, { - "url": "199.gif", - alt: "[耍帅]" - }, { - "url": "200.png", - alt: "[微笑]" - }, { - "url": "201.png", - alt: "[生病]" - }, { - "url": "202.png", - alt: "[哭泣]" - }, { - "url": "203.png", - alt: "[吐舌]" - }, { - "url": "204.png", - alt: "[迷糊]" - }, { - "url": "205.png", - alt: "[瞪眼]" - }, { - "url": "206.png", - alt: "[恐怖]" - }, { - "url": "207.png", - alt: "[忧愁]" - }, { - "url": "208.png", - alt: "[眨眉]" - }, { - "url": "209.png", - alt: "[闭眼]" - }, { - "url": "210.png", - alt: "[鄙视]" - }, { - "url": "211.png", - alt: "[阴暗]" - }, { - "url": "212.png", - alt: "[小鬼]" - }, { - "url": "213.png", - alt: "[礼物]" - }, { - "url": "214.png", - alt: "[拜佛]" - }, { - "url": "215.png", - alt: "[力量]" - }, { - "url": "216.png", - alt: "[金钱]" - }, { - "url": "217.png", - alt: "[蛋糕]" - }, { - "url": "218.png", - alt: "[彩带]" - }, { - "url": "219.png", - alt: "[礼物]" - }, ] - ], - //表情图片图床名称 - onlineEmoji: { - "100.gif": "AbNQgA.gif", - "101.gif": "AbN3ut.gif", - "102.gif": "AbNM3d.gif", - "103.gif": "AbN8DP.gif", - "104.gif": "AbNljI.gif", - "105.gif": "AbNtUS.gif", - "106.gif": "AbNGHf.gif", - "107.gif": "AbNYE8.gif", - "108.gif": "AbNaCQ.gif", - "109.gif": "AbNN4g.gif", - "110.gif": "AbN0vn.gif", - "111.gif": "AbNd3j.gif", - "112.gif": "AbNsbV.gif", - "113.gif": "AbNwgs.gif", - "114.gif": "AbNrD0.gif", - "115.gif": "AbNDuq.gif", - "116.gif": "AbNg5F.gif", - "117.gif": "AbN6ET.gif", - "118.gif": "AbNcUU.gif", - "119.gif": "AbNRC4.gif", - "120.gif": "AbNhvR.gif", - "121.gif": "AbNf29.gif", - "122.gif": "AbNW8J.gif", - "123.gif": "AbNob6.gif", - "124.gif": "AbN5K1.gif", - "125.gif": "AbNHUO.gif", - "126.gif": "AbNIDx.gif", - "127.gif": "AbN7VK.gif", - "128.gif": "AbNb5D.gif", - "129.gif": "AbNX2d.gif", - "130.gif": "AbNLPe.gif", - "131.gif": "AbNjxA.gif", - "132.gif": "AbNO8H.gif", - "133.gif": "AbNxKI.gif", - "134.gif": "AbNzrt.gif", - "135.gif": "AbU9Vf.gif", - "136.gif": "AbUSqP.gif", - "137.gif": "AbUCa8.gif", - "138.gif": "AbUkGQ.gif", - "139.gif": "AbUFPg.gif", - "140.gif": "AbUPIS.gif", - "141.gif": "AbUZMn.gif", - "142.gif": "AbUExs.gif", - "143.gif": "AbUA2j.gif", - "144.gif": "AbUMIU.gif", - "145.gif": "AbUerq.gif", - "146.gif": "AbUKaT.gif", - "147.gif": "AbUmq0.gif", - "148.gif": "AbUuZV.gif", - "149.gif": "AbUliF.gif", - "150.gif": "AbU1G4.gif", - "151.gif": "AbU8z9.gif", - "152.gif": "AbU3RJ.gif", - "153.gif": "AbUYs1.gif", - "154.gif": "AbUJMR.gif", - "155.gif": "AbUadK.gif", - "156.gif": "AbUtqx.gif", - "157.gif": "AbUUZ6.gif", - "158.gif": "AbUBJe.gif", - "159.gif": "AbUdIO.gif", - "160.gif": "AbU0iD.gif", - "161.gif": "AbUrzd.gif", - "162.gif": "AbUDRH.gif", - "163.gif": "AbUyQA.gif", - "164.gif": "AbUWo8.gif", - "165.gif": "AbU6sI.gif", - "166.gif": "AbU2eP.gif", - "167.gif": "AbUcLt.gif", - "168.gif": "AbU4Jg.gif", - "169.gif": "AbURdf.gif", - "170.gif": "AbUhFS.gif", - "171.gif": "AbU5WQ.gif", - "172.gif": "AbULwV.gif", - "173.gif": "AbUIzj.gif", - "174.gif": "AbUTQs.gif", - "175.gif": "AbU7yn.gif", - "176.gif": "AbUqe0.gif", - "177.gif": "AbUHLq.gif", - "178.gif": "AbUOoT.gif", - "179.gif": "AbUvYF.gif", - "180.gif": "AbUjFU.gif", - "181.gif": "AbaSSJ.gif", - "182.gif": "AbUxW4.gif", - "183.gif": "AbaCO1.gif", - "184.gif": "Abapl9.gif", - "185.gif": "Aba9yR.gif", - "186.gif": "AbaFw6.gif", - "187.gif": "Abaiex.gif", - "188.gif": "AbakTK.gif", - "189.gif": "AbaZfe.png", - "190.gif": "AbaEFO.gif", - "191.gif": "AbaVYD.gif", - "192.gif": "AbamSH.gif", - "193.gif": "AbaKOI.gif", - "194.gif": "Abanld.gif", - "195.gif": "Abau6A.gif", - "196.gif": "AbaQmt.gif", - "197.gif": "Abal0P.gif", - "198.gif": "AbatpQ.gif", - "199.gif": "Aba1Tf.gif", - "200.png": "Aba8k8.png", - "201.png": "AbaGtS.png", - "202.png": "AbaJfg.png", - "203.png": "AbaNlj.png", - "204.png": "Abawmq.png", - "205.png": "AbaU6s.png", - "206.png": "AbaaXn.png", - "207.png": "Aba000.png", - "208.png": "AbarkT.png", - "209.png": "AbastU.png", - "210.png": "AbaB7V.png", - "211.png": "Abafn1.png", - "212.png": "Abacp4.png", - "213.png": "AbayhF.png", - "214.png": "Abag1J.png", - "215.png": "Aba2c9.png", - "216.png": "AbaRXR.png", - "217.png": "Aba476.png", - "218.png": "Abah0x.png", - "219.png": "Abdg58.png" - }, - size: 10, page: 1, linkId: '', @@ -650,6 +165,7 @@ socketTask: null, is_open_socket: false, socketMsgQueue: [], //消息列表 + noMore: false, }; }, onLoad(option) { @@ -700,32 +216,37 @@ getMsgList() { // 消息列表 let _this = this - this.http.request('/chat/record/' + this.linkId, { + this.http.request('/chat/records/' + this.toUser, { size: this.size, page: this.page, }, "GET").then(res => { if (res.code == 200) { - if (res.data.records.length > 0) { - res.data.records.map(e => { - let senmsg = { - "content": e.content, - // "type": e.type, - "date": e.sendTime - } - let data = { - "uid": e.fromUser, - "toId": e.toUser, - "msg": senmsg, - "type": "text", - "time": e.sendTime - } - this.msgList.unshift(data) - }) - this.$nextTick(function() { - if (this.page == 1) { - this.setLoc() - } - }); + if(res.data){ + if (res.data.records.length > 0) { + res.data.records.map(e => { + let senmsg = { + "content": e.content, + // "type": e.type, + "date": e.sendTime + } + let data = { + "uid": e.fromUser, + "toId": e.toUser, + "msg": senmsg, + "type": "text", + "time": e.sendTime + } + this.msgList.unshift(data) + }) + this.$nextTick(function() { + if (this.page == 1) { + this.setLoc() + } + }); + } else { + this.page-- + this.noMore = true + } } } }).catch(e => { @@ -743,16 +264,21 @@ // } // } // 滚动到底部 - + }, - setLoc(){ + //更多 + getMore() { + this.page++ + this.getMsgList() + }, + setLoc() { this.scrollTop = 999; this.scrollAnimation = true; }, //处理图片尺寸，如果不处理宽高，新进入页面加载图片时候会闪 setPicSize(row) { - let maxW = uni.upx2px(350); - let maxH = uni.upx2px(350); + let maxW = uni.rpx2px(350); + let maxH = uni.rpx2px(350); if (row.msg.w > maxW || row.msg.h > maxH) { let scale = row.msg.w / row.msg.h; if (row.msg.w > row.msg.h) { @@ -782,25 +308,22 @@ this.addImgMsg(msg); break; } - this.$nextTick(function() { - this.scrollToView = 'msg' + msg.id - }); - }, - // 选择表情 - chooseEmoji() { - this.showEmji = this.showEmji == 'showEmoji' ? 'hideEmoji' : 'showEmoji'; - }, - // 隐藏表情 - hideEmoji() { - this.showEmji = this.showEmji == 'showEmoji' ? 'hideEmoji' : ''; - }, - //添加表情 - addEmoji(em) { - this.textMsg += em.alt; }, + // // 选择表情 + // chooseEmoji() { + // this.showEmji = this.showEmji == 'showEmoji' ? 'hideEmoji' : 'showEmoji'; + // }, + // // 隐藏表情 + // hideEmoji() { + // this.showEmji = this.showEmji == 'showEmoji' ? 'hideEmoji' : ''; + // }, + // //添加表情 + // addEmoji(em) { + // this.textMsg += em.alt; + // }, // 发送文字消息 sendText() { - this.hideEmoji(); + // this.hideEmoji(); if (!this.textMsg) { return; } @@ -811,56 +334,56 @@ this.sendMsg(this.textMsg, 'text'); this.textMsg = ''; }, - //替换表情符号为图片 - replaceEmoji(str) { - let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => { - console.log("item: " + item); - for (let i = 0; i < this.emojiList.length; i++) { - let row = this.emojiList[i]; - for (let j = 0; j < row.length; j++) { - let EM = row[j]; - if (EM.alt == item) { - //在线表情路径，图文混排必须使用网络路径 - let onlinePath = 'https://s2.ax1x.com/2019/04/12/' - let imgstr = ''; - console.log("imgstr: " + imgstr); - return imgstr; - } - } - } - }); - return '
' + replacedStr + '
'; - }, - // 选择图片发送 - chooseImage() { - this.hideEmoji(); - uni.chooseImage({ - sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 - success: (res) => { - for (let i = 0; i < res.tempFilePaths.length; i++) { - uni.getImageInfo({ - src: res.tempFilePaths[i], - success: (image) => { - console.log(image.width); - console.log(image.height); - let msg = { - url: res.tempFilePaths[i], - w: image.width, - h: image.height - }; - this.sendMsg(msg, 'img'); - } - }); - } - } - }); - }, + // //替换表情符号为图片 + // replaceEmoji(str) { + // let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => { + // console.log("item: " + item); + // for (let i = 0; i < this.emojiList.length; i++) { + // let row = this.emojiList[i]; + // for (let j = 0; j < row.length; j++) { + // let EM = row[j]; + // if (EM.alt == item) { + // //在线表情路径，图文混排必须使用网络路径 + // let onlinePath = 'https://s2.ax1x.com/2019/04/12/' + // let imgstr = ''; + // console.log("imgstr: " + imgstr); + // return imgstr; + // } + // } + // } + // }); + // return '
' + replacedStr + '
'; + // }, + // // 选择图片发送 + // chooseImage() { + // this.hideEmoji(); + // uni.chooseImage({ + // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 + // success: (res) => { + // for (let i = 0; i < res.tempFilePaths.length; i++) { + // uni.getImageInfo({ + // src: res.tempFilePaths[i], + // success: (image) => { + // console.log(image.width); + // console.log(image.height); + // let msg = { + // url: res.tempFilePaths[i], + // w: image.width, + // h: image.height + // }; + // this.sendMsg(msg, 'img'); + // } + // }); + // } + // } + // }); + // }, // 发送消息 sendMsg(content, type) { //实际应用中，此处应该提交长连接，模板仅做本地处理。 var nowDate = new Date(); - let lastid = this.msgList[this.msgList.length - 1].id; - lastid++; + // let lastid = this.msgList[this.msgList.length - 1].id; + // lastid++; let msg = { linkId: this.linkId, fromUser: this.myuid, @@ -896,117 +419,120 @@ "type": msg.type, } this.msgList.push(str) + this.$nextTick(function() { let oldScrollTopHeight = this.scrollTop - this.scrollTop = 1200; - }, - // 处理语音消息 - addVoiceMsg(msg) { - this.msgList.push(msg); - }, - // 处理图片消息 - addImgMsg(msg) { - msg = this.setPicSize(msg); - this.msgImgList.push(msg.msg.url); - this.msgList.push(msg); - }, - // 预览图片 - showPic(row) { - uni.previewImage({ - indicator: "none", - current: row.msg.url, - urls: this.msgImgList + this.scrollTop = oldScrollTopHeight + 200; }); - }, - // 播放语音 - playVoice(msg) { - this.playMsgid = msg.id; - this.AUDIO.src = msg.msg.url; - console.log("msg.msg.url: " + msg.msg.url); - this.AUDIO.play(); - }, - // 录音开始 - voiceBegin(e) { - if (e.touches.length > 1) { - return; - } - this.initPoint.Y = e.touches[0].clientY; - this.initPoint.identifier = e.touches[0].identifier; - this.RECORDER.start({ - format: "aac" - }); //录音开始, - }, - //录音开始UI效果 - recordBegin(e) { - this.recording = true; - this.voiceTis = '松开 结束'; - this.recordLength = 0; - this.recordTimer = setInterval(() => { - this.recordLength++; - }, 1000) - }, - // 录音被打断 - voiceCancel() { - this.recording = false; - this.voiceTis = '按住 说话'; - this.recordTis = '手指上滑 取消发送' - this.willStop = true; //不发送录音 - this.RECORDER.stop(); //录音结束 - }, - // 录音中(判断是否触发上滑取消发送) - voiceIng(e) { - if (!this.recording) { - return; - } - let touche = e.touches[0]; - //上滑一个导航栏的高度触发上滑取消发送 - if (this.initPoint.Y - touche.clientY >= uni.upx2px(100)) { - this.willStop = true; - this.recordTis = '松开手指 取消发送' - } else { - this.willStop = false; - this.recordTis = '手指上滑 取消发送' - } - }, - // 结束录音 - voiceEnd(e) { - if (!this.recording) { - return; - } - this.recording = false; - this.voiceTis = '按住 说话'; - this.recordTis = '手指上滑 取消发送' - this.RECORDER.stop(); //录音结束 - }, - //录音结束(回调文件) - recordEnd(e) { - clearInterval(this.recordTimer); - if (!this.willStop) { - plus.io.resolveLocalFileSystemURL(e.tempFilePath, function(entry) { - // 可通过entry对象操作test.html文件 - entry.file(function(file) { - console.log(file.size + '--' + file.name); - }); - }, function(e) { - alert("Resolve file URL failed: " + e.message); - }); - console.log("e: " + JSON.stringify(e)); - let msg = { - length: 0, - url: e.tempFilePath - } - let min = parseInt(this.recordLength / 60); - let sec = this.recordLength % 60; - min = min < 10 ? '0' + min : min; - sec = sec < 10 ? '0' + sec : sec; - msg.length = min + ':' + sec; - this.sendMsg(msg, 'voice'); - } else { - console.log('取消发送录音'); - } - this.willStop = false; }, - // 切换语音/文字输入 + // // 处理语音消息 + // addVoiceMsg(msg) { + // this.msgList.push(msg); + // }, + // // 处理图片消息 + // addImgMsg(msg) { + // msg = this.setPicSize(msg); + // this.msgImgList.push(msg.msg.url); + // this.msgList.push(msg); + // }, + // // 预览图片 + // showPic(row) { + // uni.previewImage({ + // indicator: "none", + // current: row.msg.url, + // urls: this.msgImgList + // }); + // }, + // // 播放语音 + // playVoice(msg) { + // this.playMsgid = msg.id; + // this.AUDIO.src = msg.msg.url; + // console.log("msg.msg.url: " + msg.msg.url); + // this.AUDIO.play(); + // }, + // // 录音开始 + // voiceBegin(e) { + // if (e.touches.length > 1) { + // return; + // } + // this.initPoint.Y = e.touches[0].clientY; + // this.initPoint.identifier = e.touches[0].identifier; + // this.RECORDER.start({ + // format: "aac" + // }); //录音开始, + // }, + // //录音开始UI效果 + // recordBegin(e) { + // this.recording = true; + // this.voiceTis = '松开 结束'; + // this.recordLength = 0; + // this.recordTimer = setInterval(() => { + // this.recordLength++; + // }, 1000) + // }, + // // 录音被打断 + // voiceCancel() { + // this.recording = false; + // this.voiceTis = '按住 说话'; + // this.recordTis = '手指上滑 取消发送' + // this.willStop = true; //不发送录音 + // this.RECORDER.stop(); //录音结束 + // }, + // // 录音中(判断是否触发上滑取消发送) + // voiceIng(e) { + // if (!this.recording) { + // return; + // } + // let touche = e.touches[0]; + // //上滑一个导航栏的高度触发上滑取消发送 + // if (this.initPoint.Y - touche.clientY >= uni.rpx2px(100)) { + // this.willStop = true; + // this.recordTis = '松开手指 取消发送' + // } else { + // this.willStop = false; + // this.recordTis = '手指上滑 取消发送' + // } + // }, + // // 结束录音 + // voiceEnd(e) { + // if (!this.recording) { + // return; + // } + // this.recording = false; + // this.voiceTis = '按住 说话'; + // this.recordTis = '手指上滑 取消发送' + // this.RECORDER.stop(); //录音结束 + // }, + + // //录音结束(回调文件) + // recordEnd(e) { + // clearInterval(this.recordTimer); + // if (!this.willStop) { + // plus.io.resolveLocalFileSystemURL(e.tempFilePath, function(entry) { + // // 可通过entry对象操作test.html文件 + // entry.file(function(file) { + // console.log(file.size + '--' + file.name); + // }); + // }, function(e) { + // alert("Resolve file URL failed: " + e.message); + // }); + // console.log("e: " + JSON.stringify(e)); + // let msg = { + // length: 0, + // url: e.tempFilePath + // } + // let min = parseInt(this.recordLength / 60); + // let sec = this.recordLength % 60; + // min = min < 10 ? '0' + min : min; + // sec = sec < 10 ? '0' + sec : sec; + // msg.length = min + ':' + sec; + // this.sendMsg(msg, 'voice'); + // } else { + // console.log('取消发送录音'); + // } + // this.willStop = false; + // }, + // // 切换语音/文字输入 switchVoice() { this.hideEmoji(); this.isVoice = this.isVoice ? false : true; @@ -1031,15 +557,34 @@ console.log("WebSocket连接正常打开中...！"); this.is_open_socket = true; // 注：只有连接正常打开中 ，才能正常成功发送消息 - this.socketTask.send({ - data: "uni-app发送一条消息", - async success() { - console.log("消息发送成功"); - }, - }); + // this.socketTask.send({ + // data: "uni-app发送一条消息", + // async success() { + // console.log("消息发送成功"); + // }, + // }); // 注：只有连接正常打开中 ，才能正常收到消息 this.socketTask.onMessage((res) => { console.log("收到服务器内容：" + res.data); + let msg = JSON.parse(res.data) + let senmsg = { + "content": msg.content, + // "type": e.type, + // "date": e.sendTime + } + let str = { + "uid": msg.fromUser, + "toId": msg.toUser, + "msg": senmsg, + "type": msg.type, + } + this.msgList.push(str) + this.$nextTick(function() { + let oldScrollTopHeight = this.scrollTop + this.scrollTop = oldScrollTopHeight + 200; + }); + + }); }) }, @@ -1054,7 +599,7 @@ } .icon { - font-size: 56upx; + font-size: 56rpx; color: #333; } @@ -1093,9 +638,9 @@ width: 96%; height: 42vw; - padding: 20upx 2%; + padding: 20rpx 2%; background-color: #f3f3f3; - border-top: solid 1upx #ddd; + border-top: solid 1rpx #ddd; position: fixed; z-index: 20; top: 100%; @@ -1129,7 +674,7 @@ } width: 98%; - min-height: 100upx; + min-height: 100rpx; padding: 0 1%; background-color: #f2f2f2; display: flex; @@ -1140,8 +685,8 @@ .voice, .more { flex-shrink: 0; - width: 90upx; - height: 100upx; + width: 90rpx; + height: 100rpx; display: flex; justify-content: center; align-items: center; @@ -1150,41 +695,41 @@ .send { //H5发送按钮左边距 /* #ifdef H5 */ - margin-left: 20upx; + margin-left: 20rpx; /* #endif */ flex-shrink: 0; - width: 100upx; - height: 100upx; + width: 100rpx; + height: 100rpx; display: flex; align-items: center; .btn { - width: 90upx; - height: 56upx; + width: 90rpx; + height: 56rpx; display: flex; justify-content: center; align-items: center; background: linear-gradient(to right, #f09b37, #eb632c); color: #fff; - border-radius: 6upx; - font-size: 24upx; + border-radius: 6rpx; + font-size: 24rpx; } } .textbox { width: 100%; - min-height: 70upx; - margin-top: 15upx; + min-height: 70rpx; + margin-top: 15rpx; .voice-mode { - width: calc(100% - 2upx); - height: 68upx; - border-radius: 70upx; - border: solid 1upx #cdcdcd; + width: calc(100% - 2rpx); + height: 68rpx; + border-radius: 70rpx; + border: solid 1rpx #cdcdcd; display: flex; justify-content: center; align-items: center; - font-size: 28upx; + font-size: 28rpx; background-color: #fff; color: #555; @@ -1195,15 +740,15 @@ .text-mode { width: 100%; - min-height: 70upx; + min-height: 70rpx; display: flex; background-color: #fff; - border-radius: 40upx; + border-radius: 40rpx; .box { width: 100%; - padding-left: 30upx; - min-height: 70upx; + padding-left: 30rpx; + min-height: 70rpx; display: flex; align-items: center; @@ -1214,8 +759,8 @@ .em { flex-shrink: 0; - width: 80upx; - height: 70upx; + width: 80rpx; + height: 70rpx; display: flex; justify-content: center; align-items: center; @@ -1231,7 +776,7 @@ top: 55%; left: 30%; background-color: rgba(0, 0, 0, .6); - border-radius: 20upx; + border-radius: 20rpx; .ing { width: 100%; @@ -1284,7 +829,7 @@ animation: volatility 1.5s ease-in-out -1.5s infinite alternate; -webkit-background-clip: text; -webkit-text-fill-color: transparent; - font-size: 150upx; + font-size: 150rpx; color: #f09b37; } } @@ -1298,7 +843,7 @@ .icon { color: #fff; - font-size: 150upx; + font-size: 150rpx; } } @@ -1307,7 +852,7 @@ height: 10vw; display: flex; justify-content: center; - font-size: 28upx; + font-size: 28rpx; color: #fff; &.change { @@ -1324,14 +869,19 @@ padding: 0 2%; position: absolute; top: 0; - bottom: 100upx; + bottom: 100rpx; + + .topText { + text-align: center; + padding: 18rpx 0 10rpx; + } .row { &:first-child { - margin-top: 20upx; + margin-top: 20rpx; } - padding: 20upx 0; + padding: 20rpx 0; .my .left, .other .right { @@ -1340,12 +890,12 @@ .bubble { max-width: 70%; - min-height: 50upx; - border-radius: 10upx; - padding: 15upx 20upx; + min-height: 50rpx; + border-radius: 10rpx; + padding: 15rpx 20rpx; display: flex; align-items: center; - font-size: 32upx; + font-size: 32rpx; word-break: break-word; &.img { @@ -1354,29 +904,29 @@ overflow: hidden; image { - max-width: 350upx; - max-height: 350upx; + max-width: 350rpx; + max-height: 350rpx; } } &.voice { .icon { - font-size: 40upx; + font-size: 40rpx; display: flex; align-items: center; } .icon:after { content: " "; - width: 53upx; - height: 53upx; + width: 53rpx; + height: 53rpx; border-radius: 100%; position: absolute; box-sizing: border-box; } .length { - font-size: 28upx; + font-size: 28rpx; } } } @@ -1385,13 +935,13 @@ .my .right, .other .left { flex-shrink: 0; - width: 80upx; - height: 80upx; + width: 80rpx; + height: 80rpx; image { - width: 80upx; - height: 80upx; - border-radius: 10upx; + width: 80rpx; + height: 80rpx; + border-radius: 10rpx; } } @@ -1401,7 +951,7 @@ justify-content: flex-end; .left { - min-height: 80upx; + min-height: 80rpx; align-items: center; justify-content: flex-end; @@ -1416,7 +966,7 @@ } .length { - margin-right: 20upx; + margin-right: 20rpx; } } @@ -1432,7 +982,7 @@ } .icon:after { - border-left: solid 10upx rgba(240, 108, 122, .5); + border-left: solid 10rpx rgba(240, 108, 122, .5); animation: my-play 1s linear infinite; } } @@ -1440,7 +990,7 @@ } .right { - margin-left: 15upx; + margin-left: 15rpx; } } @@ -1449,7 +999,7 @@ display: flex; .left { - margin-right: 15upx; + margin-right: 15rpx; } .right { @@ -1457,13 +1007,13 @@ .username { width: 100%; - height: 45upx; - font-size: 24upx; + height: 45rpx; + font-size: 24rpx; color: #999; display: flex; .name { - margin-right: 50upx; + margin-right: 50rpx; } } @@ -1478,7 +1028,7 @@ } .length { - margin-left: 20upx; + margin-left: 20rpx; } } @@ -1494,7 +1044,7 @@ } .icon:after { - border-right: solid 10upx rgba(255, 255, 255, .8); + border-right: solid 10rpx rgba(255, 255, 255, .8); animation: other-play 1s linear infinite; } diff --git a/src/pagesA/msg/msg.vue b/src/pagesA/msg/msg.vue index 2077d03..304b629 100644 --- a/src/pagesA/msg/msg.vue +++ b/src/pagesA/msg/msg.vue @@ -1,6 +1,6 @@