diff --git a/package-lock.json b/package-lock.json index bbdbd06..67cde37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12709,9 +12709,9 @@ } }, "vue-cropper": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.10.tgz", - "integrity": "sha512-v76nyDwMI4jvNppPlgWWpm8fQ3qVtoGZ758yLfoBRF762nJ68sjQ6z4m5Xc4d6VUbjDORm7NEduYKagxhO1MtQ==" + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.6.tgz", + "integrity": "sha512-54Z/AipXDBcE5nzJweTM+BryzSAcC0FCTMQLvLt6f4XanP4AWB3mPkQw3PG3NRICo7knljHO+N+pjZxYAKoTLQ==" }, "vue-cropperjs": { "version": "3.0.0", diff --git a/package.json b/package.json index 396be51..6b39fb2 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "build": "vue-cli-service build" }, "dependencies": { - "axios": "^0.18.0", "@tinymce/tinymce-vue": "^3.2.8", + "axios": "^0.18.0", "babel-polyfill": "^6.26.0", "blueimp-md5": "^2.19.0", "clipboard": "^2.0.11", @@ -25,7 +25,7 @@ "sortablejs": "^1.14.0", "vue": "^2.6.10", "vue-codemirror": "^4.0.6", - "vue-cropper": "^0.5.10", + "vue-cropper": "^0.5.5", "vue-cropperjs": "^3.0.0", "vue-pdf": "^4.3.0", "vue-quill-editor": "^3.0.6", diff --git a/src/components/img-upload/Cropper.vue b/src/components/img-upload/Cropper.vue index 1ec7578..a525d3d 100644 --- a/src/components/img-upload/Cropper.vue +++ b/src/components/img-upload/Cropper.vue @@ -19,13 +19,15 @@ :fixed-box="option.fixedBox" :fixed="fixed" :fixed-number="fixedNumber" - @realTime="realTime" /> + @realTime="realTimes" + >
+
@@ -128,7 +130,8 @@ export default { this.option.img = file.url this.option.size = file.size / 1024 > 200 ? 0.9 : 0.95 }, - realTime(data) { + realTimes(data) { + console.log('data=>',data) // 实时预览 this.previews = data }, diff --git a/src/setting.js b/src/setting.js index 2275aed..493ce0b 100644 --- a/src/setting.js +++ b/src/setting.js @@ -11,7 +11,7 @@ if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - host = 'http://192.168.31.151:9000/'// 榕 +// host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.117:9000/'// 赓 } else if (isPro) { jumpPath = 'https://www.huorantech.cn/judgmentPoint/' diff --git a/src/views/parnerOperation/learnMg.vue b/src/views/parnerOperation/learnMg.vue index 32040f2..311879d 100644 --- a/src/views/parnerOperation/learnMg.vue +++ b/src/views/parnerOperation/learnMg.vue @@ -646,7 +646,7 @@ export default { }).then(() => { this.submit(this.form.isRelease) }).catch(() => { - this.$router.back() + // this.$router.back() }) } else { this.$router.back()