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

裁剪优化，去掉测试代码，code review:bo.dang



See merge request !202

src/components/common/cropper.vue

@@ -210,8 +210,8 @@
         let _this = this
         const cropParam = this.cropper.getData()
         console.log('cropParam', cropParam);
-        cropParam.width = 160;
-        cropParam.height = 120;
+        // cropParam.width = 160;
+        // cropParam.height = 120;
         this.cropper.getCroppedCanvas().toBlob(function (blob) {
           var objecturl = window.URL.createObjectURL(blob);
           console.log('objecturl', objecturl);