From 328e1573f1fb4d362ffb667998a198e2b1a31e8d Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Mon, 28 Feb 2022 16:23:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  1 +
 src/components/Detail/addOrEdit.vue |  7 ++-
 src/components/Detail/editor.vue    | 92 ++++++++++++-----------------
 src/components/News/addOrEdit.vue   |  2 +-
 src/components/News/search.vue      |  2 +-
 5 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index f82f21b..7b692d6 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "vue-video-player": "^5.0.2",
     "vuedraggable": "^2.20.0",
     "vuex": "^3.1.0",
+    "wangeditor": "^4.7.12",
     "xlsx": "^0.11.16"
   },
   "devDependencies": {
diff --git a/src/components/Detail/addOrEdit.vue b/src/components/Detail/addOrEdit.vue
index 864b2b8..d401bd5 100644
--- a/src/components/Detail/addOrEdit.vue
+++ b/src/components/Detail/addOrEdit.vue
@@ -11,7 +11,8 @@
                 </el-cascader>
             </el-form-item> -->
             <el-form-item label="正文：" prop="content">
-                <editor ref="editor" :content="formLabelAlign.content" />
+                <editor v-model="formLabelAlign.content" :isClear="false" @change="change" />
+                <!-- <editor ref="editor" :content="formLabelAlign.content" /> -->
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" @click="submit(formLabelAlign)" :loading="loading">确定</el-button>
@@ -73,6 +74,10 @@
         },
 
         methods: {
+            change(val) {
+                console.log(val)
+            },
+
             // 位置选择
             handleChange(value) {
                 this.formLabelAlign.showPage = value
diff --git a/src/components/Detail/editor.vue b/src/components/Detail/editor.vue
index c1aa69d..70ac1eb 100644
--- a/src/components/Detail/editor.vue
+++ b/src/components/Detail/editor.vue
@@ -1,61 +1,47 @@
-<template>
-  <div id="editorSection"></div>
+<template lang="html">
+  <div>
+        <!-- id="editor1"对应挂载方式EditorInit1 -->
+        <!-- <div style="color:black;" id="editor1"></div> -->
+        <!-- ref="editor2"对应挂载方式EditorInit2 -->
+        <div style="color:black;text-align: left;" ref="editor2"></div>
+    </div>
 </template>
 
 <script>
-import Editor from "tui-editor"; /* ES6 */
-import "tui-editor/dist/tui-editor.css"; // editor's ui
-import "tui-editor/dist/tui-editor-contents.css"; // editor's content
-import "codemirror/lib/codemirror.css"; // codemirror
-import "highlight.js/styles/github.css"; // code block highlight
-import { init } from "echarts/lib/echarts";
+  import E from 'wangeditor'
+ export default {
+    methods:{
+        // WangEditor两种挂载方法，一种挂在id（EditorInit1），一种挂在ref（EditorInit2）
+        EditorInit1(){
+            const editor1 = new E ('#editor1');
+            editor1.create();
+        },
+        EditorInit2(){
+            const temp = this.$refs.editor2;
+            const editor2 = new E (temp);
+            editor2.create();
+        },
+    mounted(){
+        //记得在生命周期mounted中加上咱们写的函数，这里用EditorInit1或是EditorInit2都可以
+        this.EditorInit2();
+        },
 
-export default {
-  props:{
-    content:{
-      type: String,
-      default: ''
     }
-  },
-  watch: {
-    content(val){
-      if(val){
-        this.setValue(val)
-      }
-    }
-  },
-  mounted() {
-    this.initialize();
-    this.$nextTick(() => {
-      this.setValue(this.content)
-    })
-  },
-  beforeDestroy() {
-    this.tuieditor = null;
-    delete this.tuieditor;
-  },
-  methods: {
-    initialize() {
-      if (this.$el) {
-        this.tuieditor = new Editor({
-          el: document.querySelector("#editorSection"),
-          initialEditType: "wysiwyg",
-          previewStyle: "vertical",
-          height: "800px",
-        });
-        this.tuieditor.getHtml();
-      }
-    },
-
-    getValue() {
-      return this.tuieditor.getHtml()
-    },
-    setValue(val) {
-      this.tuieditor.setHtml(val);
-    }
-  }
-};
+}
 </script>
 
-<style>
+<style lang="css">
+  .editor {
+    width: 100%;
+    margin: 0 auto;
+    position: relative;
+    z-index: 0;
+  }
+  .toolbar {
+    border: 1px solid #ccc;
+  }
+  .text {
+    border: 1px solid #ccc;
+    min-height: 500px;
+  }
 </style>
diff --git a/src/components/News/addOrEdit.vue b/src/components/News/addOrEdit.vue
index f9fccaa..8680b0e 100644
--- a/src/components/News/addOrEdit.vue
+++ b/src/components/News/addOrEdit.vue
@@ -170,7 +170,7 @@
             }
             const code = localStorage.getItem('code')
             this.code = code
-            if(code === '0204' || code === '0210'){
+            if(code === '0204' || code === '0209' || code === '0210'){
                 this.formLabelAlign.showType = 1
             }
             if(code === '0207'){
diff --git a/src/components/News/search.vue b/src/components/News/search.vue
index 961d67b..9246be4 100644
--- a/src/components/News/search.vue
+++ b/src/components/News/search.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-wrap mb-4">
+  <div class="flex flex-wrap my-4">
     <div class="flex flex-row mr-5 mb-4 align-center">
       标题：
       <el-input

From da09abeb116ad5b80bc5d9f62c12029c03e1b021 Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Mon, 28 Feb 2022 17:00:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/editor.vue | 4 ++--
 src/router/menus/information.js  | 2 +-
 src/views/richText/index.vue     | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Detail/editor.vue b/src/components/Detail/editor.vue
index 02a76c7..422cf0d 100644
--- a/src/components/Detail/editor.vue
+++ b/src/components/Detail/editor.vue
@@ -35,8 +35,8 @@
         this.editor = new E( document.getElementById('editor') )
         this.editor.config.height = 800
         this.editor.config.uploadImgShowBase64 = false // base 64 存储图片
-        this.editor.config.uploadImgServer = `${BASE_API}/file/upload`// 配置服务器端地址
-        this.editor.config.uploadVideoServer = `${BASE_API}/file/upload`
+        this.editor.config.uploadImgServer = `${BASE_API}/file/uploadImg`// 配置服务器端地址
+        this.editor.config.uploadVideoServer = `${BASE_API}/file/uploadAudio`
         this.editor.config.uploadVideoName = 'file'
         this.editor.config.uploadFileName = 'file' // 后端接受上传文件的参数名
         this.editor.config.uploadImgMaxSize = 2 * 1024 * 1024 // 将图片大小限制为 2M
diff --git a/src/router/menus/information.js b/src/router/menus/information.js
index 20cdf1d..6fb1c9d 100644
--- a/src/router/menus/information.js
+++ b/src/router/menus/information.js
@@ -8,7 +8,7 @@ const commodityManagement = {
     children: [
         {
             path: '/information1',
-            // component: () => import('@/views/richText/index'),
+            component: () => import('@/views/richText/index'),
             code: '0601',
             // name: '基本信息',
             meta: {title: '基本信息', noCache: true, affix: false},
diff --git a/src/views/richText/index.vue b/src/views/richText/index.vue
index e7c8b2a..e43fb06 100644
--- a/src/views/richText/index.vue
+++ b/src/views/richText/index.vue
@@ -4,7 +4,7 @@
             <el-tab-pane label="详情页管理" name="DETAIL">
                 <detail :showPage="showPage" ref="detail" />
             </el-tab-pane>
-            <el-tab-pane label="轮播图管理" name="IMAGE">
+            <el-tab-pane label="轮播图管理" name="IMAGE" v-if="showBanner">
                 <banner :showPage="showPage" ref="banner" />
             </el-tab-pane>
         </el-tabs>
@@ -24,11 +24,15 @@
         data() {
             return {
                 activeName: 'DETAIL',
-                showPage: ''
+                showPage: '',
+                showBanner: true
             }
         },
         created() {
             this.showPage = localStorage.getItem('code')
+            if(this.showPage.length == 6){
+                this.showBanner = false
+            }
         },
         mounted() {
             this.$nextTick(() => {