|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<view class="content">
|
|
|
- <view class="cropper-wrapper" style="height:617px">
|
|
|
+ <view class="cropper-wrapper" style="height:100vh">
|
|
|
<canvas class="cropper" disable-scroll="true" @touchstart="touchStart" @touchmove="touchMove"
|
|
|
@touchend="touchEnd" :style="{ width: cropperOpt.width, height: cropperOpt.height }"
|
|
|
canvas-id="cropper"></canvas>
|
|
@@ -77,39 +77,41 @@
|
|
|
// let pathurl = url + '/user/upload';上传服务器地址
|
|
|
this.weCropper.getCropperImage(avatar => {
|
|
|
if (avatar) {
|
|
|
- this.parseBlob(avatar)
|
|
|
- // this.saveHeadImgFile(avatar)
|
|
|
- // 获取到裁剪后的图片
|
|
|
- // uni.redirectTo({
|
|
|
- // url: '/pages/user/upload?avatar=' + avatar
|
|
|
- // })
|
|
|
//下面是上传到服务器的方法
|
|
|
- // uni.uploadFile({
|
|
|
- // url: config.def().baseUrlNew + 'appendix/api/uploadFiles',
|
|
|
- // filePath: avatar,
|
|
|
- // name: 'file',
|
|
|
- // // formData: { token: token, userId: userId},
|
|
|
- // success: res => {
|
|
|
- // debugger
|
|
|
- // console.log('uploadImage success, res is:', res);
|
|
|
- // uni.showToast({
|
|
|
- // title: '上传成功',
|
|
|
- // icon: 'success',
|
|
|
- // duration: 1000
|
|
|
- // });
|
|
|
- // },
|
|
|
- // ail: err => {
|
|
|
- // console.log('uploadImage fail', err);
|
|
|
- // uni.showModal({
|
|
|
- // content: err.errMsg,
|
|
|
- // showCancel: false
|
|
|
- // });
|
|
|
- // uni.hideLoading();
|
|
|
- // },
|
|
|
- // complete: () => {
|
|
|
- // console.log('complate');
|
|
|
- // }
|
|
|
- // });
|
|
|
+ // #ifdef H5
|
|
|
+ this.parseBlob(avatar)
|
|
|
+ // #endif
|
|
|
+ // #ifdef APP-PLUS
|
|
|
+ let pcUserInfo = uni.getStorageSync('pcUserInfo')
|
|
|
+ uni.uploadFile({
|
|
|
+ url: config.def().baseUrlNew + 'appendix/api/uploadFiles',
|
|
|
+ filePath: avatar,
|
|
|
+ name: 'fileName',
|
|
|
+ formData: {
|
|
|
+ companyId: pcUserInfo.compId,
|
|
|
+ modelId: '',
|
|
|
+ vesselId: '',
|
|
|
+ },
|
|
|
+ success: res => {
|
|
|
+ let src = JSON.parse(res.data).data.appendixPath
|
|
|
+ console.log(src)
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages/user/set_picture?src=' + src
|
|
|
+ });
|
|
|
+ },
|
|
|
+ ail: err => {
|
|
|
+ console.log('uploadImage fail', err);
|
|
|
+ uni.showModal({
|
|
|
+ content: err.errMsg,
|
|
|
+ showCancel: false
|
|
|
+ });
|
|
|
+ uni.hideLoading();
|
|
|
+ },
|
|
|
+ complete: () => {
|
|
|
+ console.log('complate');
|
|
|
+ }
|
|
|
+ });
|
|
|
+ // #endif
|
|
|
} else {
|
|
|
console.log('获取图片失败,请稍后重试');
|
|
|
}
|
|
@@ -118,7 +120,8 @@
|
|
|
parseBlob(base64) {
|
|
|
let that = this
|
|
|
var arr = base64.split(',');
|
|
|
- var mime = arr[0].match(/:(.*?);/)[1];
|
|
|
+ var mime = arr[0].match(/:(.*?);/)[0];
|
|
|
+ // var mime = arr[0].slice(arr[0].lastIndexOf("/")+1);
|
|
|
var bstr = atob(arr[1]);
|
|
|
var n = bstr.length;
|
|
|
var u8arr = new Uint8Array(n);
|
|
@@ -271,7 +274,7 @@
|
|
|
}
|
|
|
|
|
|
.cropper-buttons {
|
|
|
- background-color: #FFFFFF ;
|
|
|
+ background-color: #FFFFFF;
|
|
|
color: #22C572;
|
|
|
}
|
|
|
|
|
@@ -287,7 +290,7 @@
|
|
|
|
|
|
.cropper-buttons {
|
|
|
width: 100vw;
|
|
|
- height: 50px;
|
|
|
+ height: 60px;
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
justify-content: space-between;
|