|
|
@@ -657,7 +657,7 @@ var app = new Vue({
|
|
|
$image = $("#cropImg");
|
|
|
alert(32)
|
|
|
// var canvas = $image.cropper('getCroppedCanvas');
|
|
|
- var canvas = $image.cropper('getCroppedCanvas',_this.cropParams.cropData);
|
|
|
+ /*var canvas = $image.cropper('getCroppedCanvas',_this.cropParams.cropData);
|
|
|
var url = canvas.toDataURL('image/jepg');
|
|
|
var timestamp = Date.parse(new Date());
|
|
|
var name = timestamp + ".jpeg";
|
|
|
@@ -674,7 +674,7 @@ var app = new Vue({
|
|
|
var data = _this.cropParams;
|
|
|
data.url = url;
|
|
|
data.preview = url;
|
|
|
- // data.fileData = _this.dataURLtoFile(url, name);
|
|
|
+ data.fileData = _this.dataURLtoFile(url, name);
|
|
|
_this.picList.push(data);
|
|
|
}
|
|
|
alert(35)
|
|
|
@@ -684,9 +684,9 @@ var app = new Vue({
|
|
|
_this.cropParams = {};
|
|
|
$("#cropImg").cropper('destroy');
|
|
|
_this.jc = null;
|
|
|
- }, 500);
|
|
|
- /*canvas.toBlob(function (e) {
|
|
|
- console.log(e||event); //生成Blob的图片格式
|
|
|
+ }, 500);*/
|
|
|
+ canvas.toBlob(function (e) {
|
|
|
+ //生成Blob的图片格式
|
|
|
if (e != null) {
|
|
|
var timestamp = Date.parse(new Date());
|
|
|
e.name = timestamp + ".png";
|
|
|
@@ -705,7 +705,7 @@ var app = new Vue({
|
|
|
}
|
|
|
|
|
|
setTimeout(function () {
|
|
|
-
|
|
|
+ $.closePopup();
|
|
|
$.hideLoading();
|
|
|
_this.cropParams = {};
|
|
|
$("#cropImg").cropper('destroy');
|
|
|
@@ -721,7 +721,7 @@ var app = new Vue({
|
|
|
$.hideLoading();
|
|
|
}, 1000);
|
|
|
}
|
|
|
- }, "image/jpeg");*/
|
|
|
+ }, "image/jpeg");
|
|
|
|
|
|
}
|
|
|
|