From 9e244e7b2d9f8c6e1da40e228b3034137eae0b90 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 13 十二月 2024 18:57:53 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
.env.product | 4 ++--
src/assets/js/config.js | 2 +-
src/components/teditor/index.vue | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.env.product b/.env.product
index 382d80f..cdf8efa 100644
--- a/.env.product
+++ b/.env.product
@@ -1,8 +1,8 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/civilServices'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/mathBook'
# VUE_APP_RESOURCE_CTX = 'http://182.92.203.7:3007/books/resource/'
# VUE_APP_PUBLIC_PATH = 'http://182.92.203.7:3007/books/book/botany'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook/botany/civilAviation/civilServices/meetingPlanners"
-VUE_APP_BOOK_ID = 'civilServices'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'mathBook'
\ No newline at end of file
diff --git a/src/assets/js/config.js b/src/assets/js/config.js
index 0aea566..36a866a 100644
--- a/src/assets/js/config.js
+++ b/src/assets/js/config.js
@@ -1,7 +1,7 @@
import axios from "axios";
export const resourceCtx = "http://182.92.203.7:3007/books/resource/"; // 璧勬簮璇锋眰鍦板潃
// export const resourceCtx = "https://jsek.bnuic.com/books/resource/"; // 璧勬簮璇锋眰鍦板潃
-export const tinymceBaseUrl = 'https://jsek.bnuic.com/home'
+export const tinymceBaseUrl = 'https://jsek.bnuic.com/home/'
export let activeBook = {}; // 璧勬簮璇锋眰鍦板潃
export let goodsStore = "";
// 璇锋眰鏁欐潗閰嶇疆淇℃伅
diff --git a/src/components/teditor/index.vue b/src/components/teditor/index.vue
index 8cde8c1..5a54de4 100644
--- a/src/components/teditor/index.vue
+++ b/src/components/teditor/index.vue
@@ -59,9 +59,9 @@
"#" + this.tinymceId
),
language_url:
- this.config.tinymceBaseUrl + "/tinymce/langs/zh_CN.js", // 璇█鍖呯殑璺緞锛屽叿浣撹矾寰勭湅鑷繁鐨勯」鐩紝鏂囨。鍚庨潰闄勪笂涓枃js鏂囦欢
+ process.env.VUE_APP_PUBLIC_PATH + "/tinymce/langs/zh_CN.js", // 璇█鍖呯殑璺緞锛屽叿浣撹矾寰勭湅鑷繁鐨勯」鐩紝鏂囨。鍚庨潰闄勪笂涓枃js鏂囦欢
language: "zh_CN", //璇█
- skin_url: this.config.tinymceBaseUrl + "/tinymce/skins/ui/oxide", // skin璺緞锛屽叿浣撹矾寰勭湅鑷繁鐨勯」鐩�
+ skin_url: process.env.VUE_APP_PUBLIC_PATH + "/tinymce/skins/ui/oxide", // skin璺緞锛屽叿浣撹矾寰勭湅鑷繁鐨勯」鐩�
height: 400, //缂栬緫鍣ㄩ珮搴�
branding: false, //鏄惁绂佺敤鈥淧owered by TinyMCE鈥�
menubar: "edit insert format table", //椤堕儴鑿滃崟鏍忔樉绀�
@@ -80,11 +80,11 @@
statusbar: false,
file_picker_types: "file",
content_css:
- this.config.tinymceBaseUrl +
+ process.env.VUE_APP_PUBLIC_PATH +
"/tinymce/skins/content/default/content.css", //浠ss鏂囦欢鏂瑰紡鑷畾涔夊彲缂栬緫鍖哄煙鐨刢ss鏍峰紡锛宑ss鏂囦欢闇�鑷繁鍒涘缓骞跺紩鍏�
external_plugins: {
"kityformula-editor":
- this.config.tinymceBaseUrl +
+ process.env.VUE_APP_PUBLIC_PATH +
"/tinymce/plugins/kityformula-editor/plugin.min.js",
},
// 鏂囦欢涓婁紶
--
Gitblit v1.9.1