diff --git a/src/components/PopUps/Delete/index.vue b/src/components/PopUps/Delete/index.vue index 56e389e7..960a771e 100644 --- a/src/components/PopUps/Delete/index.vue +++ b/src/components/PopUps/Delete/index.vue @@ -28,7 +28,7 @@

{{ confirmation.text }}

- + Close
@@ -65,7 +65,6 @@ export default { isNameCorrect: true, input: '', viewState: 'input', - Error: false, confirmation: { text: 'Request has been sent, waiting for a response from the servers', icon: 'el-icon-loading', @@ -94,6 +93,10 @@ export default { iconStyle: 'font-size: 75px;' } }, + closePopup() { + this.dialogVisible = false + this.$emit('success', true) + }, checkAllSuccess() { return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess) }, @@ -121,14 +124,13 @@ export default { icon: 'el-icon-circle-check', iconStyle: 'font-size: 75px; color: green;' } - this.$emit('success', true) } else if (!response || response === 'error') { this.confirmation = { text: `Error deleting ${this.item.name} form ${this.type}s list. Please refresh your page and try again. If the Error persists, please contact dev team`, icon: 'el-icon-circle-close', iconStyle: 'font-size: 75px; color: red;' + } - this.$emit('success', false) } } } diff --git a/src/views/products/components/ProductDetail.vue b/src/views/products/components/ProductDetail.vue index 8e66f1f4..cdbb1e92 100644 --- a/src/views/products/components/ProductDetail.vue +++ b/src/views/products/components/ProductDetail.vue @@ -69,13 +69,26 @@ - + + + + + + + +