Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-04-07 7c3ff469d37be883d7634bb4261bc5d54c89d2a5

 src/views/popup/Dialog.vue

@@ -5,6 +5,7 @@
            width="30%"
            :modal="false"
            :close-on-click-modal="false"
             @close='closeDialog'
            center>
        <slot></slot>
    </el-dialog>
@@ -27,6 +28,9 @@
  methods: {
    show () {
      this.centerDialogVisible = true
    },
    closeDialog () {
      this.$emit('closeDialog')
    }
  }
}