rabin %!s(int64=5) %!d(string=hai) anos
pai
achega
126acc3653
Modificáronse 2 ficheiros con 24 adicións e 4 borrados
  1. 23 3
      assets/lib/cropper/main.js
  2. 1 1
      assets/lib/layui/upload.js

+ 23 - 3
assets/lib/cropper/main.js

@@ -15,8 +15,16 @@ window.onload = function () {
   var dataScaleX = document.getElementById('dataScaleX');
   var dataScaleY = document.getElementById('dataScaleY');
 
+  var dataX_text = document.getElementById('dataX_text');
+  var dataY_text = document.getElementById('dataY_text');
+  var dataHeight_text = document.getElementById('dataHeight_text');
+  var dataWidth_text = document.getElementById('dataWidth_text');
+  var dataRotate_text = document.getElementById('dataRotate_text');
+  var dataScaleX_text = document.getElementById('dataScaleX_text');
+  var dataScaleY_text = document.getElementById('dataScaleY_text');
+
   var options = {
-    aspectRatio: 16 / 9,
+    aspectRatio: aspectRatioValue,
     preview: '.img-preview',
     ready: function (e) {
       //console.log(e.type);
@@ -53,6 +61,14 @@ window.onload = function () {
       dataRotate.value = typeof data.rotate !== 'undefined' ? data.rotate : '';
       dataScaleX.value = typeof data.scaleX !== 'undefined' ? data.scaleX : '';
       dataScaleY.value = typeof data.scaleY !== 'undefined' ? data.scaleY : '';
+
+      dataX_text.innerHTML = dataX.value;
+      dataY_text.innerHTML = dataY.value;
+      dataHeight_text.innerHTML = dataHeight.value;
+      dataWidth_text.innerHTML = dataWidth.value;
+      dataRotate_text.innerHTML = dataRotate.value;
+      dataScaleX_text.innerHTML = dataScaleX.value;
+      dataScaleY_text.innerHTML = dataScaleY.value;
     },
     zoom: function (e) {
       //console.log(e.type, e.detail.ratio);
@@ -218,8 +234,12 @@ window.onload = function () {
 
         case 'aspectRatio':
           cropper.destroy();
-          var tmp = data.value.split(':');
-          options.aspectRatio = tmp[0]/tmp[1];
+          if (data.value.indexOf(':') == -1) {
+            options.aspectRatio = data.value;
+          } else {
+            var tmp = data.value.split(':');
+            options.aspectRatio = tmp[0]/tmp[1];
+          }
           cropper = new Cropper(image, options);
 
           break;

+ 1 - 1
assets/lib/layui/upload.js

@@ -614,7 +614,7 @@ function picManage(e,v,k,s,i)
 	}
 	
 
-	var url = config.upload.replace('save', 'view') + '.manage&state='+s+'&key='+k+'&pic=' + pic + '&param=' + param;
+	var url = config.upload.replace('save', 'view') + '.manage&state='+s+'&key='+k+'&pic=' + pic + '&param=' + param+'&wh=150*150';
 	var layerConfig = {
 	  type: 2,
 	  title: '图片裁剪工具',