Merge branch 'dev-circle-live-20200715' into 'release'

裁剪缩放优化，code review:bo.dang



See merge request !199

src/components/common/cropper.vue

@@ -171,21 +171,21 @@
 //               });
 
             },
-            cropstart:(event) => {
-              console.log(event.detail.originalEvent);
-              console.log(event.detail.action);
-
-              if(this.cropOption.aspectRatio == 0){
-              if(event.detail.action == "w"
-                || event.detail.action == "e"
-                || event.detail.action == "se"
-                || event.detail.action == "sw"
-                || event.detail.action == "ne"
-                || event.detail.action == "nw"){
-                event.preventDefault();
-              }
-              }
-            },
+            // cropstart:(event) => {
+            //   console.log(event.detail.originalEvent);
+            //   console.log(event.detail.action);
+            //
+            //   if(this.cropOption.aspectRatio == 0){
+            //   if(event.detail.action == "w"
+            //     || event.detail.action == "e"
+            //     || event.detail.action == "se"
+            //     || event.detail.action == "sw"
+            //     || event.detail.action == "ne"
+            //     || event.detail.action == "nw"){
+            //     event.preventDefault();
+            //   }
+            //   }
+            // },
 
             // zoom: function (event) {
             //   // Keep the image in its natural size

src/components/yqrange/baseinfo.vue

@@ -267,7 +267,9 @@
             }
             else if(_this.width > fileLimit.width ||  _this.height > fileLimit.height){
               vm.showCropper = true;
-              // return;
+              vm.currentOption.cvWidth = _this.width;
+              vm.currentOption.cvHeight = _this.height;
+              return;
             }
             else {
               openLoading(vm);