Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/WebSet/plug-in/other_dialog.vue

@@ -124,7 +124,9 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="段落內容">
-              <el-input type="textarea" :rows="4" v-model="plugData.ParagraphContent"></el-input>
+              <!-- <el-input type="textarea" :rows="4" v-model="plugData.ParagraphContent"></el-input> -->
+              <my-edit  style="height:60vh"  v-on:edit-value="plugData.ParagraphContent  = arguments[0]" v-bind:editValue="plugData.ParagraphContent"
+                    v-bind:toolbarShow="toolbar"  v-bind:referenceList="DefaultList"></my-edit>
             </el-form-item>
           </el-col>
         </el-row>
@@ -159,11 +161,27 @@
   </div>
 </template>
 <script>
+import MyEdit from "@/components/EditTemplate.vue";
   export default {
     props: ["plugData"],
+    components:{MyEdit},
     data() {
       return {
-        checkIndex: 0
+        checkIndex: 0,
+        toolbar: {
+          clean: true, 
+          font: false, //字体
+          narrative: false, //叙述,
+          image:false,
+          bold: true, //加粗
+          underline: true, //下划线
+          header1: true, //H1
+          header2: true, //H2
+          fontColor: false, //字体颜色
+          fontBackgroundColor: false, //背景颜色
+          innerHeight: '60vh'
+        },
+        DefaultList: [],
       };
     },
     created() {},

src/plug/index.js

@@ -120,8 +120,8 @@ export default {
                 let locationName = window.location.hostname;
                 domainUrl = "http://192.168.10.128";
                 domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                // domainUrl = "http://192.168.10.123:8002";
-                domainUrl = "http://reborn.oytour.com";
+                domainUrl = "http://192.168.10.123:8002";
+                // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
                 let javaUrldo = "";