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

litian

2024-12-30 739e4c590b6b058149ee909e77d2077fffda262f

 src/App.vue

@@ -12,12 +12,11 @@
    <mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
    <botany v-if="activeBook.name == 'botany'"></botany>
    <civilAviation v-if="activeBook.name == 'civilAviation'"></civilAviation>
    <civilServices
      v-if="activeBook.name == 'civilServices'"
    ></civilServices>
    <meetingPlanners
      v-if="activeBook.name == 'meetingPlanners'"
    ></meetingPlanners>
    <civilServices v-if="activeBook.name == 'civilServices'"></civilServices>
    <meetingPlanners v-if="activeBook.name == 'meetingPlanners'"></meetingPlanners>
    <aviationBasicSkills v-if="activeBook.name == 'aviationBasicSkills'"></aviationBasicSkills>
    <aviationSafety  v-if="activeBook.name == 'aviationSafety'"></aviationSafety>
    <aviationEtiquette  v-if="activeBook.name == 'aviationEtiquette'"></aviationEtiquette>
  </div>
</template>
<script>
@@ -54,9 +53,11 @@
    artAndDrama: () => import("./books/artAndDrama/view/index.vue"),
    botany: () => import("./books/botany/view/index.vue"),
    civilAviation: () => import("./books/civilAviation/view/index.vue"),
    civilServices: () =>
      import("./books/civilServices/view/index.vue"),
    meetingPlanners: () => import("./books/meetingPlanners/view/index.vue"),
    civilServices: () =>import("./books/civilServices/view/index.vue"),
    meetingPlanners: () =>import("./books/meetingPlanners/view/index.vue"),
    aviationBasicSkills: () => import("./books/aviationBasicSkills/view/index.vue"),
    aviationSafety: ()=> import("./books/aviationSafety/view/index.vue"),
    aviationEtiquette: ()=> import("./books/aviationEtiquette/view/index.vue"),
  },
  data() {
    return {
@@ -96,11 +97,13 @@
      // civilAviation
      // civilServices
      // meetingPlanners
      // aviationBasicSkills
      // aviationSafety
      this.activeBook = await this.config.getBookConfig(
        process.env.VUE_APP_RESOURCE_CTX +
          (process.env.VUE_APP_ENV == "product"
            ? process.env.VUE_APP_BOOK_ID
            : "mathBook")
      process.env.VUE_APP_RESOURCE_CTX +
        (process.env.VUE_APP_ENV == "product"
          ? process.env.VUE_APP_BOOK_ID
          : "aviationEtiquette")
      );

      // this.activeBook = await this.config.getBookConfig(