Commit 988ed8e8 by xiawei

a

parent fe21861a
<!--
* @Author: your name
* @Date: 2020-09-14 16:53:49
* @LastEditTime: 2020-10-15 09:42:52
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: /consoles_program/Users/xiawei/gdy/web-live/components/modules-pc/chatBox/index.vue
-->
<template>
<div class="chat-box">
<div class="top-chat-list">
......
......@@ -45,6 +45,7 @@
</template>
<script>
const Uploader = process.client ? require('@gdyfe/uploader') : {};
import { sendChat, sendPhoto } from '@/plugins/API/apiAll';
import { mapGetters } from 'vuex';
import emojiBox from './emoji';
......@@ -146,11 +147,21 @@ export default {
}
this.showEmoji = !this.showEmoji;
},
_uplaod() {
async _uplaod() {
if (this._isDisabled()) {
return false;
}
this.$refs.file.click();
if (process.env.private === true) {
const uploader = new Uploader.default('cmecloud', {
accessKeyId: 'JH948REBJO5CGXZ1FQMH',
accessKeySecret: 'hOIEE5oUCHSScTMggatG2UxwOvEScrcgeoVdCUZt',
endpoint: 'eos-beijing-4.cmecloud.cn'
});
const res = await uploader.openUploader();
this._sendPhoto(res);
} else {
this.$refs.file.click();
}
},
_uploadImg(e) {
const self = this;
......
......@@ -36,6 +36,7 @@
</div>
</template>
<script>
const Uploader = process.client ? require('@gdyfe/uploader') : {};
import { sendPhoto, sendPhotoByWeixin } from '@/plugins/API/apiAll';
import UserAgent from '@/plugins/UserAgent/index';
import { mapGetters } from 'vuex';
......@@ -119,7 +120,7 @@ export default {
self._sendPhoto(newsrc);
};
},
_uplaod() {
async _uplaod() {
const self = this;
if (UserAgent.isWx()) {
const wx = window.wx;
......@@ -141,7 +142,17 @@ export default {
}
});
} else {
this.$refs.file.click();
if (process.env.private === true) {
const uploader = new Uploader.default('cmecloud', {
accessKeyId: 'JH948REBJO5CGXZ1FQMH',
accessKeySecret: 'hOIEE5oUCHSScTMggatG2UxwOvEScrcgeoVdCUZt',
endpoint: 'eos-beijing-4.cmecloud.cn'
});
const res = await uploader.openUploader();
this._sendPhoto(res);
} else {
this.$refs.file.click();
}
}
},
async _sendPhoto(src) {
......
......@@ -27,6 +27,7 @@
},
"dependencies": {
"@gdyfe/ink-marks": "^1.1.0",
"@gdyfe/uploader": "^2.0.3",
"@nuxtjs/axios": "^5.3.6",
"@nuxtjs/component-cache": "^1.1.5",
"@nuxtjs/router": "^1.5.0",
......
......@@ -875,6 +875,16 @@
dayjs "^1.8.34"
pako "^1.0.11"
"@gdyfe/uploader@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@gdyfe/uploader/-/uploader-2.0.3.tgz#36c373655e3cc4767dc803f63302eac5de823f8b"
integrity sha512-9ya27QwxeTNUFHSIB8F4g8bUBZrK6sZ/kI7HGlUgq8BI7HGP7UY30P/950TAAbBY1B38+cvSqHp0qjGEaLKHkg==
dependencies:
ali-oss "^6.11.1"
aws-sdk "^2.762.0"
dayjs "^1.9.1"
object-hash "^2.0.3"
"@nodelib/fs.scandir@2.1.3":
version "2.1.3"
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
......@@ -1802,6 +1812,38 @@ ali-oss@^6.10.0:
utility "^1.8.0"
xml2js "^0.4.16"
ali-oss@^6.11.1:
version "6.11.2"
resolved "https://registry.yarnpkg.com/ali-oss/-/ali-oss-6.11.2.tgz#fed279a9d373f0d1ad278edf614f710f99f73e19"
integrity sha512-rNeYm5yogNOABCY9G27RgB6BGJ0BK+nQGicfDXKp1Fq7G/eJMZYwBNXdM420uAIUoMM81uFOtSIRYBRF6IxPwA==
dependencies:
address "^1.0.0"
agentkeepalive "^3.4.1"
any-promise "^1.3.0"
bowser "^1.6.0"
co-defer "^1.0.0"
copy-to "^2.0.1"
dateformat "^2.0.0"
debug "^2.2.0"
destroy "^1.0.4"
end-or-error "^1.0.1"
get-ready "^1.0.0"
humanize-ms "^1.2.0"
is-type-of "^1.0.0"
js-base64 "^2.5.2"
jstoxml "^0.2.3"
merge-descriptors "^1.0.1"
mime "^2.4.5"
mz-modules "^2.1.0"
platform "^1.3.1"
pump "^3.0.0"
sdk-base "^2.0.1"
stream-http "2.8.2"
stream-wormhole "^1.0.4"
urllib "^2.33.1"
utility "^1.8.0"
xml2js "^0.4.16"
alife-logger@^1.8.3:
version "1.8.20"
resolved "https://registry.yarnpkg.com/alife-logger/-/alife-logger-1.8.20.tgz#8e0abc2c8c0733ed943ff48d5b29eb17425f6526"
......@@ -2046,6 +2088,21 @@ available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
dependencies:
array-filter "^1.0.0"
aws-sdk@^2.762.0:
version "2.771.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.771.0.tgz#ff4beb0a04d6ab1ae962c85dfb42e3e9bfe2b93b"
integrity sha512-fqNGusCwkdemx3yFqvQbU1+xq/PB2wGq7EQIrrTZx/zxfXUp+7+PnrHzXtViCRghN0tylLghBfWYD4VcVcqi7g==
dependencies:
buffer "4.9.2"
events "1.1.1"
ieee754 "1.1.13"
jmespath "0.15.0"
querystring "0.2.0"
sax "1.2.1"
url "0.10.3"
uuid "3.3.2"
xml2js "0.4.19"
axios-retry@^3.1.8:
version "3.1.8"
resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.1.8.tgz#ffcfed757e1fab8cbf832f8505bb0e0af47c520c"
......@@ -2340,7 +2397,7 @@ buffer-xor@^1.0.3:
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
buffer@^4.3.0:
buffer@4.9.2, buffer@^4.3.0:
version "4.9.2"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
......@@ -3246,6 +3303,11 @@ dayjs@^1.8.34:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.35.tgz#67118378f15d31623f3ee2992f5244b887606888"
integrity sha512-isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ==
dayjs@^1.9.1:
version "1.9.3"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.9.3.tgz#b7f94b22ad2a136a4ca02a01ab68ae893fe1a268"
integrity sha512-V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw==
de-indent@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
......@@ -3987,6 +4049,11 @@ eventemitter3@^4.0.0:
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
events@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
events@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
......@@ -4890,7 +4957,7 @@ icss-utils@^4.0.0, icss-utils@^4.1.1:
dependencies:
postcss "^7.0.14"
ieee754@^1.1.4:
ieee754@1.1.13, ieee754@^1.1.4:
version "1.1.13"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
......@@ -5375,6 +5442,11 @@ jiti@^0.1.11:
resolved "https://registry.yarnpkg.com/jiti/-/jiti-0.1.11.tgz#8b27b92e4c0866b3c8c91945c55a99a1db17a782"
integrity sha512-zSPegl+ageMLSYcq1uAZa6V56pX2GbNl/eU3Or7PFHu10a2YhLAXj5fnHJGd6cHZTalSR8zXGH8WmyuyufMhLA==
jmespath@0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
js-base64@^2.5.2:
version "2.6.4"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
......@@ -6259,6 +6331,11 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
object-hash@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
object-inspect@^1.7.0, object-inspect@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
......@@ -7984,6 +8061,11 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
sax@1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o=
sax@>=0.6.0, sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
......@@ -9009,6 +9091,14 @@ url-loader@^2.3.0:
mime "^2.4.4"
schema-utils "^2.5.0"
url@0.10.3:
version "0.10.3"
resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=
dependencies:
punycode "1.3.2"
querystring "0.2.0"
url@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
......@@ -9127,6 +9217,11 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
uuid@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
uuid@^3.3.2:
version "3.4.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
......@@ -9525,6 +9620,14 @@ ws@^6.0.0:
dependencies:
async-limiter "~1.0.0"
xml2js@0.4.19:
version "0.4.19"
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
dependencies:
sax ">=0.6.0"
xmlbuilder "~9.0.1"
xml2js@^0.4.16:
version "0.4.23"
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
......@@ -9538,6 +9641,11 @@ xmlbuilder@~11.0.0:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
xmlbuilder@~9.0.1:
version "9.0.7"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
xregexp@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment