From 233395d0a56bcd9eb7e6890ba5fba5f173898837 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 06 八月 2024 17:31:44 +0800
Subject: [PATCH] 合并代码
---
src/App.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index ef3b19b..b1f30bd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,11 @@
<template>
<div id="app">
+
<childHealth v-if="activeBook.name == 'childHealth'"></childHealth>
<lifeCare v-if="activeBook.name == 'lifeCare'"></lifeCare>
<embedded v-if="activeBook.name == 'embedded'"></embedded>
<english v-if="activeBook.name == 'english'"></english>
- <sportsAndHealth
- v-if="activeBook.name == 'sportsAndHealth'"
- ></sportsAndHealth>
+ <sportsAndHealth v-if="activeBook.name == 'sportsAndHealth'"></sportsAndHealth>
<artAndDance v-if="activeBook.name == 'artAndDance'"></artAndDance>
<artAndDrama v-if="activeBook.name == 'artAndDrama'"></artAndDrama>
<mathBook v-if="activeBook.name == 'mathBook'"></mathBook>
@@ -34,10 +33,13 @@
async created() {
if (this.setGlobalState) {
this.setGlobalState({
+
initTestBook: async (bookId, tryPageCount) => {
+
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX + process.env.VUE_APP_BOOK_ID
);
+
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
if (tryPageCount) {
@@ -63,17 +65,25 @@
// mathBook
this.activeBook = await this.config.getBookConfig(
process.env.VUE_APP_RESOURCE_CTX +
- (process.env.VUE_APP_ENV == "product"
- ? process.env.VUE_APP_BOOK_ID
- : "english")
+ (process.env.VUE_APP_ENV == "product"
+ ? process.env.VUE_APP_BOOK_ID
+ : "artAndDance")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
this.config.activeBook = this.activeBook;
this.config.goodsStore = this.activeBook.storeRefcode;
}
+ },
+ methods: {
+
+ but() {
+ console.log(this.activeBook, 'this.activeBook789');
+ }
+
}
};
+
</script>
<style lang="less">
@@ -83,16 +93,19 @@
height: 100%;
margin: 0;
}
+
#app {
width: 100%;
height: 100%;
}
+
.highLight {
border: 1px dashed rgba(255, 255, 255, 0);
border-radius: 5px;
padding: 3px 0;
cursor: pointer;
}
+
.highLight:hover {
border: 1px dashed #949494 !important;
}
@@ -106,6 +119,7 @@
text-underline-thickness: 2px;
cursor: pointer;
}
+
.underline:hover {
border: 1px dashed #949494 !important;
}
--
Gitblit v1.9.1