From 08086690bf40bf12d27ca77cd108221ea499b0da Mon Sep 17 00:00:00 2001
From: caoyuchun <caoyuchun2003@gmail.com>
Date: Fri, 13 Sep 2024 13:22:40 +0800
Subject: [PATCH] cyc

---
 .env.sub                            |  6 ++++++
 package.json                        |  1 +
 public/index.html                   | 22 ++++++++++++++++++++++
 src/components/MindElixirDialog.vue |  8 ++++++--
 src/components/Navigation.vue       | 10 +++++++++-
 src/router/index.js                 |  7 ++++---
 src/views/Book.vue                  |  9 ++++-----
 vue.config.js                       |  1 +
 8 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 .env.sub

diff --git a/.env.sub b/.env.sub
new file mode 100644
index 0000000..4ef6b62
--- /dev/null
+++ b/.env.sub
@@ -0,0 +1,6 @@
+# NODE_ENV=sub
+VUE_APP_BASE_URL=/reading/
+# VUE_APP_BASE_URL1=/dist/
+# VUE_APP_NAME=caoyuchun
+# VUE_APP_EMAIL=caoyuchun2003@qq.com
+#   // base: process.env.NODE_ENV == "sub"? process.env.VUE_APP_BASE_URL:"",
diff --git a/package.json b/package.json
index 021dcec..e2115fa 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "build-sub": "vue-cli-service build --mode sub",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/public/index.html b/public/index.html
index d1ad552..972825d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,6 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <!-- <link rel="https://axdbook.zxkedu.com/bundles/app/images/zwsjimg2_06.png"> -->
+
     <!-- <title><%= htmlWebpackPlugin.options.title %></title> -->
     <title>电子书阅读器</title>
   </head>
@@ -12,6 +14,26 @@
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
+    <script>
+
+      setFavion = () => {
+        var link = document.querySelector("link[rel*='icon']")
+        // <link rel="icon" href="https://axdbook.zxkedu.com/bundles/app/images/zwsjimg2_06.png">
+        if (window.location.hostname.includes("axdbook")
+      ||window.location.hostname.includes("local") 
+      ){
+          // if (window.location.hostname.includes("local")){
+
+          document.title = "翱翔书苑-电子书阅读"
+          link.href = "../favicon.ico"
+          console.log(window.location.hostname)
+        }
+    
+      }
+
+      setFavion()
+
+    </script>
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>
diff --git a/src/components/MindElixirDialog.vue b/src/components/MindElixirDialog.vue
index d88fd1b..7143bab 100644
--- a/src/components/MindElixirDialog.vue
+++ b/src/components/MindElixirDialog.vue
@@ -1,11 +1,15 @@
 <template>
     <el-dialog
-      title="思维导图"
+      title="导图"
       :visible.sync="dialogVisible"
       width="80%"
       @close="handleClose"
     >
-        <div ref="mindElixirContainer" id="mindContainerID" style="width: 100%; height: 500px;"></div>
+    <div style="display: flex; width: 100%; justify-content: space-between;  margin-top: -30px;margin-bottom: 10px;">
+      <p>说明：请点击右键进行操作，编辑完成后需保存</p>
+      <!-- <el-button type="primary" @click="save"> 保存</el-button> -->
+    </div>
+        <div ref="mindElixirContainer" id="mindContainerID" style="width: 100%; height: 50vh;"></div>
         
         <template slot="footer">
 
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index df4a32d..e46ffe4 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -1,7 +1,8 @@
 <template>
        <div id="nav">
       <div>
-        <a :href=this.$store.state.redirecturl>返回首页</a> 
+        <a :href="backUrl">返回首页</a> 
+
       </div>
       <!-- <router-link to="/book">书籍</router-link> | -->
       <h3>{{this.$store.state.textBookData.textBooksName}}</h3>
@@ -46,6 +47,13 @@ export default {
             mindData:{}, 
         }
     },
+    computed:{
+
+      backUrl(){
+       return this.$store.state.redirecturl?this.$store.state.redirecturl:"../"
+      }
+
+    },
 
     async mounted() {
       this.bookId = this.$route.query.bookId
diff --git a/src/router/index.js b/src/router/index.js
index 1680ba3..2c1e591 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,7 +15,7 @@ const routes = [
     name: 'Book',
     component: () => import(/* webpackChunkName: "about" */ '../views/Book.vue'),
     meta:{
-      title:"新思课堂电子书阅读"
+      // title:"新思课堂电子书阅读"
     }
   },
   {
@@ -27,10 +27,11 @@ const routes = [
     component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
   }
 ]
-
+// base: process.env.NODE_ENV == "sub"? process.env.VUE_APP_BASE_URL:""
 const router = new VueRouter({
   mode: 'history',
-  base: process.env.BASE_URL,
+  base: process.env.VUE_APP_BASE_URL,
+  // base: "/dist/",
   routes
 })
 
diff --git a/src/views/Book.vue b/src/views/Book.vue
index 29d2da5..6f3e1b1 100644
--- a/src/views/Book.vue
+++ b/src/views/Book.vue
@@ -128,7 +128,7 @@ export default {
       userInfo:{},
       userId:{},
       classList:[],
-      classId:'',
+      classId:0,
       className:'',
       teacherData:{},
       studentData:{}
@@ -137,7 +137,6 @@ export default {
 
   created() {
     
-    document.title = "新思课堂电子书阅读"
     this.bookId = this.$route.query.bookId
 
     this.userId = getStore("userId")
@@ -175,10 +174,10 @@ export default {
     this.location = localStorage.getItem(this.textBookData.id)
 
     this.request()//  请求数据
-    setTimeout(() => {
+    setTimeout( async() => {
       // this.getData()
-      this.getMineData()
-      this.studySituation()
+     await this.getMineData()
+     await  this.studySituation()
       // this.getSetting()
     }, 800)
   },
diff --git a/vue.config.js b/vue.config.js
index d080542..f38efac 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,6 @@
 module.exports = {
   lintOnSave: false,
+  publicPath: './', // 设置公共路径为相对路径
   devServer: {
     proxy: {
       '/api': {