Merge branch 'dev' into vite

# Conflicts: # examples/router/autoRoutes.js # package.json # packages/bigscreen/designer/components/Add.vue # project/dv/apps/AppGridDV.vue # vue.config.js
2022-08-23 11:14:38 +08:00
parent cef8dad5f0 de190a9076
commit a5dbdbe778
125 changed files with 15445 additions and 4898 deletions
--- a/project/sass/apps/AppNotification/components/manageDetail.vue
+++ b/project/sass/apps/AppNotification/components/manageDetail.vue
@@ -156,7 +156,7 @@
        }).then(res => {
          if (res && res.data) {
            this.detailObj = res.data;
-            this.$initWxOpenData()
+            this.$store.dispatch('initOpenData')
          }
        })
      },