From 64933a09d2ddf02161aa0981e138385c296a6271 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 20 Feb 2023 13:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                               |  4 ++--
 .../productService/components/addProduct.vue   | 14 ++++++++------
 .../productService/components/addWelfare.vue   | 18 +++++++++++-------
 .../common/addCommonServiceProduct.vue         |  3 ++-
 .../components/confinement/addClubProduct.vue  | 17 ++++++++++-------
 .../confinement/addConfinementClub.vue         | 18 +++++++++++-------
 .../components/strategy/addStrategy.vue        | 15 +++++++++------
 7 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/.env.development b/.env.development
index 82421b8..ae62b32 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
-VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
+#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/views/productService/components/addProduct.vue b/src/views/productService/components/addProduct.vue
index 917fbce..5e68ba7 100644
--- a/src/views/productService/components/addProduct.vue
+++ b/src/views/productService/components/addProduct.vue
@@ -185,8 +185,9 @@
           <div class="xy-table-item-label">
             内容:
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          <div class="xy-table-item-content" style="width:680px">
+			  <xyTinymce v-if="isShow" v-model="form.content"></xyTinymce>
+            <!-- <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce> -->
           </div>
         </div>
       </template>
@@ -216,10 +217,11 @@
     Message
   } from 'element-ui'
 
-  import tinymce from "@/components/Tinymce"
+  // import tinymce from "@/components/Tinymce"
+    import xyTinymce from "@/components/XyTinymce/index.vue";
   export default {
     components: {
-      tinymce
+      xyTinymce
     },
     props: {
       types: Array
@@ -369,7 +371,7 @@
           sortnumber: res?.sortnumber,
           content: res?.content
         }
-        this.$refs['tinymce'].setContent(this.form.content || ' ')
+        // this.$refs['tinymce'].setContent(this.form.content || ' ')
       },
 
       //上传
@@ -491,7 +493,7 @@
           }
           
         } else {
-          this.$refs['tinymce'].setContent(' ')
+          // this.$refs['tinymce'].setContent(' ')
           this.$refs['dialog'].reset()
           this.id = ''
           this.type = ''
diff --git a/src/views/productService/components/addWelfare.vue b/src/views/productService/components/addWelfare.vue
index c454fd0..66923b2 100644
--- a/src/views/productService/components/addWelfare.vue
+++ b/src/views/productService/components/addWelfare.vue
@@ -78,9 +78,11 @@
           <div class="xy-table-item-label">
             内容:
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
-          </div>
+          <div class="xy-table-item-content" style="width:680px">
+			  <xyTinymce v-if="isShow" v-model="form.content"></xyTinymce>
+			  
+<!--            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+ -->          </div>
         </div>
       </template>
     </xy-dialog>
@@ -91,10 +93,12 @@
 import {store,save} from '@/api/package'
 import { Message } from 'element-ui'
 
-import tinymce from "@/components/Tinymce"
+// import tinymce from "@/components/Tinymce"
+  import xyTinymce from "@/components/XyTinymce/index.vue";
 export default {
   components:{
-    tinymce
+    // tinymce
+	xyTinymce
   },
   data() {
     return {
@@ -157,7 +161,7 @@ export default {
         poster:this.detail.poster,
         content:this.detail.content
       }
-      this.$refs['tinymce'].setContent(this.form.content)
+      // this.$refs['tinymce'].setContent(this.form.content)
     },
 
     submit(){
@@ -209,7 +213,7 @@ export default {
         this.id = ''
         this.type = ''
         this.$refs['dialog'].reset()
-        this.$refs['tinymce'].setContent(' ')
+        // this.$refs['tinymce'].setContent(' ')
       }
     }
   }
diff --git a/src/views/productService/components/common/addCommonServiceProduct.vue b/src/views/productService/components/common/addCommonServiceProduct.vue
index 0a18351..5a6ce60 100644
--- a/src/views/productService/components/common/addCommonServiceProduct.vue
+++ b/src/views/productService/components/common/addCommonServiceProduct.vue
@@ -239,7 +239,8 @@
             >内容：
           </div>
           <div class="xy-table-item-content" style="width: 680px">
-            <xy-tinymce v-model="form.content"></xy-tinymce>
+            <!-- <xy-tinymce v-model="form.content"></xy-tinymce> -->
+			<xyTinymce v-if="isShow" :height="200" v-model="form.content"></xyTinymce>
           </div>
         </div>
       </template>
diff --git a/src/views/productService/components/confinement/addClubProduct.vue b/src/views/productService/components/confinement/addClubProduct.vue
index 66c149d..76b7eb5 100644
--- a/src/views/productService/components/confinement/addClubProduct.vue
+++ b/src/views/productService/components/confinement/addClubProduct.vue
@@ -208,8 +208,10 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容：
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          <div class="xy-table-item-content" style="width: 680px;">
+			<xyTinymce v-if="isShow" :height="200" v-model="form.content"></xyTinymce>
+			  
+            <!-- <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce> -->
           </div>
         </div>
       </template>
@@ -232,11 +234,12 @@
   import {
     Message
   } from 'element-ui'
-
-  import tinymce from '@/components/Tinymce'
+import xyTinymce from "@/components/XyTinymce/index.vue";
+  // import tinymce from '@/components/Tinymce'
   export default {
     components: {
-      tinymce
+      // tinymce
+	  xyTinymce
     },
     data() {
       return {
@@ -394,7 +397,7 @@
           content: res?.content,
           video: res?.video
         }
-        this.$refs['tinymce'].setContent(this.form.content)
+        // this.$refs['tinymce'].setContent(this.form.content)
       },
 
       loadMoreClub() {
@@ -460,7 +463,7 @@
           this.type = ''
           this.clubs = []
           this.clubSelect.page = 1
-          this.$refs['tinymce'].setContent(" ")
+          // this.$refs['tinymce'].setContent(" ")
           this.$refs['dialog'].reset()
         }
       }
diff --git a/src/views/productService/components/confinement/addConfinementClub.vue b/src/views/productService/components/confinement/addConfinementClub.vue
index 0474d6a..e2b8e1c 100644
--- a/src/views/productService/components/confinement/addConfinementClub.vue
+++ b/src/views/productService/components/confinement/addConfinementClub.vue
@@ -124,9 +124,10 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容：
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
-          </div>
+          <div class="xy-table-item-content" style="width:680px">
+			<xyTinymce v-if="isShow" v-model="form.content"></xyTinymce>
+<!--            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+ -->          </div>
         </div>
       </template>
 
@@ -317,10 +318,13 @@
     Message
   } from 'element-ui'
 
-  import tinymce from '@/components/Tinymce'
+  // import tinymce from '@/components/Tinymce'
+  import xyTinymce from "@/components/XyTinymce/index.vue";
+  
   export default {
     components: {
-      tinymce
+      // tinymce
+	  xyTinymce
     },
     data() {
       return {
@@ -503,7 +507,7 @@
           online_customer_services_id: res?.online_customer_services_id
         }
         console.log(this.form)
-        this.$refs['tinymce'].setContent(this.form.content)
+        // this.$refs['tinymce'].setContent(this.form.content)
       },
 
       submit() {
@@ -594,7 +598,7 @@
           this.type = ''
           this.labelText = ''
           this.$refs['dialog'].reset()
-          this.$refs['tinymce'].setContent(' ')
+          // this.$refs['tinymce'].setContent(' ')
         }
         this.map = {}
       },
diff --git a/src/views/productService/components/strategy/addStrategy.vue b/src/views/productService/components/strategy/addStrategy.vue
index a4e490d..4e05176 100644
--- a/src/views/productService/components/strategy/addStrategy.vue
+++ b/src/views/productService/components/strategy/addStrategy.vue
@@ -48,8 +48,9 @@
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>内容：
           </div>
-          <div class="xy-table-item-content">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          <div class="xy-table-item-content" style="width:680px">
+			<xyTinymce v-if="isShow" v-model="form.content"></xyTinymce>
+            <!-- <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce> -->
           </div>
         </div>
       </template>
@@ -116,11 +117,13 @@ import {index as typeIndex} from "@/api/strategyType"
 import {store,save} from "@/api/strategy"
 import {getparameter} from '@/api/system/dictionary'
 
-import tinymce from "@/components/Tinymce"
+// import tinymce from "@/components/Tinymce"
+  import xyTinymce from "@/components/XyTinymce/index.vue";
+
 import { Message } from 'element-ui'
 export default {
   components:{
-    tinymce
+    xyTinymce
   },
   data() {
     return {
@@ -188,7 +191,7 @@ export default {
         label:this.detail.label,
         content:this.detail.content,
       }
-      this.$refs['tinymce'].setContent(this.form.content)
+      // this.$refs['tinymce'].setContent(this.form.content)
     },
     async getLabel(){
       const res = await getparameter({number:'label'})
@@ -255,7 +258,7 @@ export default {
       }else{
         this.id = ''
         this.type = ''
-        this.$refs['tinymce'].setContent(' ')
+        // this.$refs['tinymce'].setContent(' ')
         this.$refs['dialog'].reset()
       }
     }