Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

package.json

@@ -17,7 +17,7 @@
     "lodash": "^4.17.15",
     "moment": "^2.27.0",
     "naf-core": "^0.1.2",
-    "tinymce": "^5.2.2",
+    "tinymce": "5.2.2",
     "vue": "^2.6.11",
     "vue-meta": "^2.4.0",
     "vue-route": "^1.5.1",

src/views/pcenter/parts/infoFrom.vue

@@ -173,8 +173,8 @@ export default {
     },
     setEditor() {
       //skin right
-      let skin_url = (process.env.NODE_ENV === 'development' ? '' : 'admin/cms/') + 'static/tinymce/skins/ui/oxide';
-      let lang_url = (process.env.NODE_ENV === 'development' ? '/' : '/admin/cms/') + 'static/tinymce/langs/zh_CN.js';
+      let skin_url = (process.env.NODE_ENV === 'development' ? '' : 'count/cms/') + 'static/tinymce/skins/ui/oxide';
+      let lang_url = (process.env.NODE_ENV === 'development' ? '/' : '/count/') + 'static/tinymce/langs/zh_CN.js';
       this.$set(this.editor, `skin_url`, skin_url);
       this.$set(this.editor, `lang_url`, lang_url);
     },