diff --git a/package.json b/package.json index 86a6df9..df1c66c 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "ant-design-vue": "^2.0.0-beta.9", "axios": "^0.21.0", "core-js": "^3.6.5", + "cropperjs": "^1.5.9", "dayjs": "^1.9.1", "postcss-pxtorem": "^5.1.1", "tim-js-sdk": "^2.8.0", diff --git a/public/css/cropper.min.css b/public/css/cropper.min.css new file mode 100644 index 0000000..e6e039a --- /dev/null +++ b/public/css/cropper.min.css @@ -0,0 +1,9 @@ +/*! + * Cropper.js v1.5.9 + * https://fengyuanchen.github.io/cropperjs + * + * Copyright 2015-present Chen Fengyuan + * Released under the MIT license + * + * Date: 2020-09-10T13:16:21.689Z + */.cropper-container{direction:ltr;font-size:0;line-height:0;position:relative;-ms-touch-action:none;touch-action:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.cropper-container img{display:block;height:100%;image-orientation:0deg;max-height:none!important;max-width:none!important;min-height:0!important;min-width:0!important;width:100%}.cropper-canvas,.cropper-crop-box,.cropper-drag-box,.cropper-modal,.cropper-wrap-box{bottom:0;left:0;position:absolute;right:0;top:0}.cropper-canvas,.cropper-wrap-box{overflow:hidden}.cropper-drag-box{background-color:#fff;opacity:0}.cropper-modal{background-color:#000;opacity:.5}.cropper-view-box{display:block;height:100%;outline:1px solid #39f;outline-color:rgba(51,153,255,.75);overflow:hidden;width:100%}.cropper-dashed{border:0 dashed #eee;display:block;opacity:.5;position:absolute}.cropper-dashed.dashed-h{border-bottom-width:1px;border-top-width:1px;height:33.33333%;left:0;top:33.33333%;width:100%}.cropper-dashed.dashed-v{border-left-width:1px;border-right-width:1px;height:100%;left:33.33333%;top:0;width:33.33333%}.cropper-center{display:block;height:0;left:50%;opacity:.75;position:absolute;top:50%;width:0}.cropper-center:after,.cropper-center:before{background-color:#eee;content:" ";display:block;position:absolute}.cropper-center:before{height:1px;left:-3px;top:0;width:7px}.cropper-center:after{height:7px;left:0;top:-3px;width:1px}.cropper-face,.cropper-line,.cropper-point{display:block;height:100%;opacity:.1;position:absolute;width:100%}.cropper-face{background-color:#fff;left:0;top:0}.cropper-line{background-color:#39f}.cropper-line.line-e{cursor:ew-resize;right:-3px;top:0;width:5px}.cropper-line.line-n{cursor:ns-resize;height:5px;left:0;top:-3px}.cropper-line.line-w{cursor:ew-resize;left:-3px;top:0;width:5px}.cropper-line.line-s{bottom:-3px;cursor:ns-resize;height:5px;left:0}.cropper-point{background-color:#39f;height:5px;opacity:.75;width:5px}.cropper-point.point-e{cursor:ew-resize;margin-top:-3px;right:-3px;top:50%}.cropper-point.point-n{cursor:ns-resize;left:50%;margin-left:-3px;top:-3px}.cropper-point.point-w{cursor:ew-resize;left:-3px;margin-top:-3px;top:50%}.cropper-point.point-s{bottom:-3px;cursor:s-resize;left:50%;margin-left:-3px}.cropper-point.point-ne{cursor:nesw-resize;right:-3px;top:-3px}.cropper-point.point-nw{cursor:nwse-resize;left:-3px;top:-3px}.cropper-point.point-sw{bottom:-3px;cursor:nesw-resize;left:-3px}.cropper-point.point-se{bottom:-3px;cursor:nwse-resize;height:20px;opacity:1;right:-3px;width:20px}@media (min-width:768px){.cropper-point.point-se{height:15px;width:15px}}@media (min-width:992px){.cropper-point.point-se{height:10px;width:10px}}@media (min-width:1200px){.cropper-point.point-se{height:5px;opacity:.75;width:5px}}.cropper-point.point-se:before{background-color:#39f;bottom:-50%;content:" ";display:block;height:200%;opacity:0;position:absolute;right:-50%;width:200%}.cropper-invisible{opacity:0}.cropper-bg{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC")}.cropper-hide{display:block;height:0;position:absolute;width:0}.cropper-hidden{display:none!important}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-drag-box,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 7b136fa..a710c38 100644 --- a/public/index.html +++ b/public/index.html @@ -70,6 +70,7 @@ } })(1366, 1024); + + \ No newline at end of file diff --git a/src/import-png.d.ts b/src/import-png.d.ts index faab5e1..3c267b8 100644 --- a/src/import-png.d.ts +++ b/src/import-png.d.ts @@ -28,4 +28,6 @@ declare module 'vue-cropper'{ declare var FB: any; -declare var TCPlayer: any; \ No newline at end of file +declare var TCPlayer: any; + +declare var Cropper: any; \ No newline at end of file diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index 856834e..2134965 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -509,6 +509,9 @@

{{lan.$t('huobitishi')}}

+ + + @@ -530,6 +533,7 @@ import { uploadflie } from "@/utils/vod"; import store from "@/store"; import smile from "@/static/images/smile.png"; import smilet from "@/static/images/smilet.png"; +import imghead from "@/components/imghead.vue" import { changetel, checksmscode, @@ -556,10 +560,12 @@ export default defineComponent({ UserOutlined, PlaySquareOutlined, NavBottom, + imghead }, setup() { let issum = true; const lan: any = useI18n(); + const touxiang = ref(false); interface SpeakItem { lang: string; proficiency: number; @@ -996,17 +1002,27 @@ export default defineComponent({ userinfo.value.currencyValue = e; // editsystemsetting({currency:e}) } + const imgfire = ref() async function uploadspic(file: AntUpload) { - const res = await uploadflie(file.file, (info: any) => { - console.log(info); - // uploadpicprogress.value = info.percent.toFixed(2) * 100; - }); - console.log(res); + // const res = await uploadflie(file.file, (info: any) => { + // console.log(info); + // // uploadpicprogress.value = info.percent.toFixed(2) * 100; + // }); + // console.log(res); - // picinfo.fileId=res.fileId - // picinfo.url=res.video.url + // // picinfo.fileId=res.fileId + // // picinfo.url=res.video.url + // formData.value.img = res.video.url; + // setheadimg(res.video.url); + console.log(file.file) + imgfire.value = file.file; + touxiang.value = true; + + } + function imgupload(res: any){ formData.value.img = res.video.url; setheadimg(res.video.url); + touxiang.value = false; } // function beforeVideoUpload(file: any){ @@ -1081,7 +1097,10 @@ export default defineComponent({ video, imgs, mrqh, - huobi + huobi, + touxiang, + imgfire, + imgupload }; }, }); diff --git a/yarn.lock b/yarn.lock index 3a94896..3b9a39a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3117,6 +3117,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +cropperjs@^1.5.9: + version "1.5.9" + resolved "https://registry.npm.taobao.org/cropperjs/download/cropperjs-1.5.9.tgz?cache=0&sync_timestamp=1599745509586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcropperjs%2Fdownload%2Fcropperjs-1.5.9.tgz#4ff9d31e02ad04d2fc5df0044207c2ad53d99da8" + integrity sha1-T/nTHgKtBNL8XfAEQgfCrVPZnag= + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"