david пре 2 година
родитељ
комит
671d047f0c
5 измењених фајлова са 10 додато и 7 уклоњено
  1. 2 0
      .env.development
  2. 1 1
      .env.production
  3. 2 1
      package.json
  4. 4 4
      src/components/Tinymce/index.vue
  5. 1 1
      src/utils/region.js

+ 2 - 0
.env.development

@@ -15,3 +15,5 @@ VUE_APP_FRONTEND_WEBSITE='http://local.ng.frontend.ele.com'
 VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
 # 请求token前缀
 VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '
+# 区域js文件地址
+VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'

+ 1 - 1
.env.production

@@ -23,7 +23,7 @@ VUE_APP_BASE_DO_API='http://16.163.228.151:8042'
 # CDN文件地址
 VUE_APP_CDN_API='http://16.163.228.151:8042'
 # 区域js文件地址
-VUE_APP_AREA_JS='http://ng-upload.elken.com'
+VUE_APP_SYSTEM_JS='http://ng-upload.elken.com'
 # 结算页面地址
 VUE_APP_BASE_WEBSITE='http://16.163.228.151:8042'
 # 会员页面地址

+ 2 - 1
package.json

@@ -15,6 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "codemirror": "5.45.0",
@@ -39,7 +40,7 @@
     "script-loader": "0.7.2",
     "sortablejs": "1.8.4",
     "squire-rte": "^2.0.2",
-    "tinymce": "^6.4.1",
+    "tinymce": "^5.10.3",
     "tinymce-vue": "^1.0.0",
     "to-mark": "^1.1.9",
     "tui-code-snippet": "^2.3.3",

+ 4 - 4
src/components/Tinymce/index.vue

@@ -17,10 +17,10 @@ import plugins from './plugins'
 import toolbar from './toolbar'
 import load from './dynamicLoadScript'
 
-// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
-const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
-//const tinymceCDN = 'http://lib.baomitu.com/tinymce/4.9.3/tinymce.min.js'
-
+// // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
+// const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
+// //const tinymceCDN = 'http://lib.baomitu.com/tinymce/4.9.3/tinymce.min.js'
+const tinymceCDN = process.env.VUE_APP_SYSTEM_JS + `/cdn/tinymce/tinymce.min.js?ver=0.1`
 
 export default {
   name: 'Tinymce',

+ 1 - 1
src/utils/region.js

@@ -11,7 +11,7 @@ import regionInfo from "@/store/modules/region";
 let regionScriptLoaded = false
 
 const initRegion = function (vueObj) {
-	importScript(process.env.VUE_APP_AREA_JS + `/cdn/jsdata/ar_region_data.js?ver=0.1`, () => {
+	importScript(process.env.VUE_APP_SYSTEM_JS + `/cdn/jsdata/ar_region_data.js?ver=0.1`, () => {
 		if (regionScriptLoaded) return true
 		regionScriptLoaded = true
 		let ANRAN_REGION_DATA = AR_REGION_DATA