+
@@ -187,11 +187,26 @@
this.$nextTick(() => {
this.getWatermarkList()
})
+ uni.$on('cropper', e => {
+ this.img = e
+ this.x = 32
+ this.y = 200
+ })
+ },
+
+ onUnload () {
+ uni.$off('cropper')
},
methods: {
...mapActions(['injectJWeixin']),
+ toClipping () {
+ uni.navigateTo({
+ url: `./Clipping?url=${encodeURIComponent(this.img)}`
+ })
+ },
+
onImgLoad () {
const img = document.querySelector('.waterMarker-img')
diff --git a/src/saas/AppCountryAlbum/components/ksp-cropper.vue b/src/saas/AppCountryAlbum/components/ksp-cropper.vue
new file mode 100644
index 00000000..cc63f9ab
--- /dev/null
+++ b/src/saas/AppCountryAlbum/components/ksp-cropper.vue
@@ -0,0 +1,952 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/saas/AppCountryAlbum/components/report/Daily.vue b/src/saas/AppCountryAlbum/components/report/Daily.vue
index 8782bb62..c36d3943 100644
--- a/src/saas/AppCountryAlbum/components/report/Daily.vue
+++ b/src/saas/AppCountryAlbum/components/report/Daily.vue
@@ -139,11 +139,13 @@
onLongpress (e) {
if (e.action === 'remove') {
this.richList.splice(e.index, 1)
- } else {
+ } else if (e.action === 'edit') {
this.currIndex = e.index
this.content = e.value
this.isShowText = true
+ } else {
+ this.richList[e.index].value = e.value
}
},
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index 95e07bf1..cfb9071d 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -148,11 +148,13 @@
onLongpress (e) {
if (e.action === 'remove') {
this.richList.splice(e.index, 1)
- } else {
+ } else if (e.action === 'edit') {
this.currIndex = e.index
this.content = e.value
this.isShowText = true
+ } else {
+ this.richList[e.index].value = e.value
}
},
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 4fb3dd8e..c7611517 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -169,11 +169,13 @@
onLongpress (e) {
if (e.action === 'remove') {
this.richList.splice(e.index, 1)
- } else {
+ } else if (e.action === 'edit') {
this.currIndex = e.index
this.content = e.value
this.isShowText = true
+ } else {
+ this.richList[e.index].value = e.value
}
},
diff --git a/src/saas/AppCountryAlbum/components/report/RenderContent.vue b/src/saas/AppCountryAlbum/components/report/RenderContent.vue
index e49ad338..b935822b 100644
--- a/src/saas/AppCountryAlbum/components/report/RenderContent.vue
+++ b/src/saas/AppCountryAlbum/components/report/RenderContent.vue
@@ -24,7 +24,7 @@
修改
+
剪裁
@@ -48,6 +48,19 @@
}
},
+ mounted () {
+ uni.$on('cropper', e => {
+ this.$emit('onLongpress', {
+ type: this.type,
+ value: e,
+ index: this.currIndex,
+ action: 'cropper'
+ })
+
+ this.isShow = false
+ })
+ },
+
methods: {
toEditText () {
this.$emit('onLongpress', {
@@ -73,6 +86,12 @@
this.isShow = false
},
+ toClipping () {
+ uni.navigateTo({
+ url: `./Clipping?url=${encodeURIComponent(this.value)}`
+ })
+ },
+
onLongpress (item, index) {
this.currIndex = index
this.type = item.type
diff --git a/src/saas/AppCountryAlbum/components/report/WorkReport.vue b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
index bc2a5643..0f9fce9e 100644
--- a/src/saas/AppCountryAlbum/components/report/WorkReport.vue
+++ b/src/saas/AppCountryAlbum/components/report/WorkReport.vue
@@ -138,11 +138,13 @@
onLongpress (e) {
if (e.action === 'remove') {
this.richList.splice(e.index, 1)
- } else {
+ } else if (e.action === 'edit') {
this.currIndex = e.index
this.content = e.value
this.isShowText = true
+ } else {
+ this.richList[e.index].value = e.value
}
},
diff --git a/src/saas/AppCountryAlbum/images/clipping/clipping1.png b/src/saas/AppCountryAlbum/images/clipping/clipping1.png
new file mode 100644
index 00000000..74de453f
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/clipping1.png differ
diff --git a/src/saas/AppCountryAlbum/images/clipping/clipping2.png b/src/saas/AppCountryAlbum/images/clipping/clipping2.png
new file mode 100644
index 00000000..b0370a58
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/clipping2.png differ
diff --git a/src/saas/AppCountryAlbum/images/clipping/clipping3.png b/src/saas/AppCountryAlbum/images/clipping/clipping3.png
new file mode 100644
index 00000000..190f7685
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/clipping3.png differ
diff --git a/src/saas/AppCountryAlbum/images/clipping/clipping4.png b/src/saas/AppCountryAlbum/images/clipping/clipping4.png
new file mode 100644
index 00000000..afcf7eec
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/clipping4.png differ
diff --git a/src/saas/AppCountryAlbum/images/clipping/clipping5.png b/src/saas/AppCountryAlbum/images/clipping/clipping5.png
new file mode 100644
index 00000000..3dd6466b
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/clipping5.png differ
diff --git a/src/saas/AppCountryAlbum/images/clipping/yuantu.png b/src/saas/AppCountryAlbum/images/clipping/yuantu.png
new file mode 100644
index 00000000..1594de71
Binary files /dev/null and b/src/saas/AppCountryAlbum/images/clipping/yuantu.png differ