From e296b2bd6cebec047d9406476bf6a7eb323deff9 Mon Sep 17 00:00:00 2001 From: YM <479443481@qq.com> Date: 星期三, 22 五月 2024 21:00:05 +0800 Subject: [PATCH] 调整 --- src/assets/js/config.js | 10 ++++++---- src/main.js | 2 +- src/App.vue | 26 ++++++++++++++++++-------- src/books/childHealth/view/content/index.vue | 12 ++++++------ 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/App.vue b/src/App.vue index e0274e7..e27c01e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ import childHealth from "./books/childHealth/view/index.vue"; import book from "./books/content/index.vue"; import embedded from "./books/embedded/view/index.vue"; -import english from "./books/English/view/index.vue" +import english from "./books/English/view/index.vue"; export default { name: "App", @@ -23,18 +23,28 @@ }, data() { return { - activeBook: {}, + activeBook: {} }; }, async created() { - this.activeBook = this.thisBookConfig; - console.log('鍥句功',this.activeBook); - if (this.$store.state.qiankun,this.$store.state.qiankun.getBookConfig) { - this.$store.state.qiankun.getBookConfig({ - bookConfig: this.activeBook, + if (this.setGlobalState) { + this.setGlobalState({ + initTestBook: async (bookId) => { + this.activeBook = await this.config.getBookConfig(bookId); + console.log("鍥句功", this.activeBook); + if ( + (this.$store.state.qiankun, this.$store.state.qiankun.getBookConfig) + ) { + this.$store.state.qiankun.getBookConfig({ + bookConfig: this.activeBook + }); + } + } }); + } else { + this.activeBook = await this.config.getBookConfig(); } - }, + } }; </script> diff --git a/src/assets/js/config.js b/src/assets/js/config.js index 791bda3..2696dba 100644 --- a/src/assets/js/config.js +++ b/src/assets/js/config.js @@ -1,10 +1,12 @@ import axios from "axios"; -export const resourceCtx = "http://182.92.203.7:3007/books/resource/1"; // 璧勬簮璇锋眰鍦板潃 +export const resourceCtx = "http://182.92.203.7:3007/books/resource/"; // 璧勬簮璇锋眰鍦板潃 export let activeBook = {}; // 璧勬簮璇锋眰鍦板潃 export let goodsStore = ""; // 璇锋眰鏁欐潗閰嶇疆淇℃伅 -const getBookConfig = async () => { - const response = await axios.get(resourceCtx + "/bookConfig.json"); +const getBookConfig = async (bookId) => { + const response = await axios.get( + resourceCtx + (bookId ? bookId : "1") + "/bookConfig.json" + ); activeBook = response.data; goodsStore = response.data.storeRefcode; return response.data; @@ -20,6 +22,6 @@ tokenKey, goodsStore, appId, - getBookConfig, + getBookConfig }; export default config; diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue index 702c809..c778d99 100644 --- a/src/books/childHealth/view/content/index.vue +++ b/src/books/childHealth/view/content/index.vue @@ -296,16 +296,16 @@ ).querySelectorAll(".theme-border"); // 鑾峰彇閰嶇疆鐨勪富棰樿壊 const bookThemeColor = - this.thisBookConfig && this.thisBookConfig.bookThemeColor - ? this.thisBookConfig.bookThemeColor + this.config.activeBook && this.config.activeBook.bookThemeColor + ? this.config.activeBook.bookThemeColor : null; const chapterThemeColor = - this.thisBookConfig && this.thisBookConfig.chapterThemeColor - ? this.thisBookConfig.chapterThemeColor + this.config.activeBook && this.config.activeBook.chapterThemeColor + ? this.config.activeBook.chapterThemeColor : null; const pageThemeColor = - this.thisBookConfig && this.thisBookConfig.pageThemeColor - ? this.thisBookConfig.pageThemeColor + this.config.activeBook && this.config.activeBook.pageThemeColor + ? this.config.activeBook.pageThemeColor : null; colorDom.forEach((domItem) => { // 鑾峰彇绔犺妭銆侀〉鐮� diff --git a/src/main.js b/src/main.js index f7438ce..be449f0 100644 --- a/src/main.js +++ b/src/main.js @@ -10,7 +10,7 @@ // 鑷畾涔夐厤缃� import config from "@/assets/js/config"; Vue.prototype.config = config; -Vue.prototype.thisBookConfig = await config.getBookConfig(); +// Vue.prototype.thisBookConfig = await config.getBookConfig(); // 璇锋眰澶勭悊 import MG from "@/assets/js/middleGround/WebMiddleGroundApi"; -- Gitblit v1.9.1