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

chenyabin

2021-05-14 de32f49313e2c7534009758193c41be61517f1d5

 src/views/popup/Popup.vue

@@ -42,7 +42,7 @@
          obj[this.props[key]] = content[key]
        }
      }
      console.log(obj)
      // console.log(obj)
      return obj
    },
    setDatas (layer) {