Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

litian

昨天 2ca7f1e9d3ff3c54ec5d10688a33c628ec296f8b

 src/App.vue

@@ -51,9 +51,6 @@
    <behaviorObserveAndGuid
      v-if="activeBook.name == 'behaviorObserveAndGuid'"
    ></behaviorObserveAndGuid>
    <preschoolBasicKnowledge
      v-if="activeBook.name == 'preschoolBasicKnowledge'"
    ></preschoolBasicKnowledge>
    <policiesAndRegulations
      v-if="activeBook.name == 'policiesAndRegulations'"
    ></policiesAndRegulations>
@@ -177,14 +174,14 @@
        },
      });
    } else {
      // childHealth
      // lifeCare
      // sportsAndHealth
      // embedded
      // english
      // artAndDance
      // artAndDrama
      // mathBook
      // childHealth        // 学前儿童卫生与保健
      // lifeCare           // 婴幼儿生活照护
      // sportsAndHealth    // 体育与健康
      // embedded           // 嵌入式组态控制技术（第3版）(铁道社)
      // english            // 新标准通用职场英语
      // artAndDance        // 艺术舞蹈
      // artAndDrama        // 艺术戏剧
      // mathBook           // 数学
      // civilAviation       // 民航概论
      // civilServices       // 服务心理
      // meetingPlanners     // 会议策划
@@ -211,14 +208,8 @@
        process.env.VUE_APP_RESOURCE_CTX +
          (process.env.VUE_APP_ENV == "product"
            ? process.env.VUE_APP_BOOK_ID
            : "cognitiveLanDevEduAges0to3")
            : "mathBook")
      );
      // this.activeBook = await this.config.getBookConfig(
      //   'http://182.92.203.7:3007/books/resource/'+
      //   (process.env.VUE_APP_ENV == "product"
      //     ? process.env.VUE_APP_BOOK_ID
      //     : "botany")
      // );
      // 测试试读30页
      // this.activeBook.tryPageCount = 10;
      this.config.activeBook = this.activeBook;