Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/views/h5editor/index.vue

@@ -789,7 +789,7 @@ export default {
         this.$store.dispatch("getPageByThemeId", this.itemId);
       }
 
-      this.getPicList(this.itemId);
+      // this.getPicList(this.itemId);
     } else {
       this.$store.dispatch("createTheme");
       this.$store.dispatch("addPage");

src/vuex/editor/actions.js

@@ -141,16 +141,18 @@ export const getPageByThemeId = ({ dispatch, commit }, id) => {
   });
   api.getPageByThemeId(id).then((res) => {
     console.log("XXXXXXXXXXXXXXX", res);
-    // res.pages = res.pages || [];
-    // res.backgroundAudio = res.backgroundAudio || '';
-    // res.pages.forEach((page) => {
-    //   page.elements.forEach((element) => {
-    //     element.animatedFont = element.animatedFont || ''
-    //     element.eleCanvas = element.eleCanvas || ''
-    //   })
-    // })
-    // commit(types.SET_CUR_EDITOR_THEME, res)
-    // commit(types.SET_CUR_EDITOR_PAGE, res.pages[0])
+    var single = JSON.parse(res.single.jsonString);
+    console.log("XXXXXXXXXXXXXXX", single);
+    single.pages = single.pages || [];
+    single.backgroundAudio = single.backgroundAudio || '';
+    single.pages.forEach((page) => {
+      page.elements.forEach((element) => {
+        element.animatedFont = element.animatedFont || ''
+        element.eleCanvas = element.eleCanvas || ''
+      })
+    })
+    commit(types.SET_CUR_EDITOR_THEME, single)
+    commit(types.SET_CUR_EDITOR_PAGE, single.pages[0])
     loading.close()
     setTimeout(function () {