Revert: Merge branch 'master' into my

src/components/resources/editor.vue

@@ -26,12 +26,7 @@
                 <div class="dialog-card">
                   序号：{{index}}
                 </div>
-                <img :src="moIMG.lookUrl" v-if="data.key === 'look1'" class="image">
-                <img :src="moIMG.playRadioUrl" v-if="data.key === 'radio1'" class="image">
-                <img :src="moIMG.playVideoUrl" v-if="data.key === 'play1'" class="image">
-                <img :src="moIMG.RefuelingUrl" v-if="data.key === 'refueling1'" class="image">
-                <img :src="moIMG.showBabyUrl" v-if="data.key === 'show1'" class="image">
-                <img :src="moIMG.RefuelingUrl2" v-if="data.key === 'refueling2'" class="image">
+                <img :src="data.imgUrl" class="image">
               </el-card>
               </div>
             </div>
@@ -794,12 +789,7 @@
 <script>
   import mouldImg from '../../util/mouldImgUrl'
   import {uploadFileApi} from "../../service/api";
-  import lookUrl from '../../assets/mould/example/look.png'
-  import playRadioUrl from '../../assets/mould/example/playRadio.png'
-  import playVideoUrl from '../../assets/mould/example/playVideo.png'
-  import RefuelingUrl from '../../assets/mould/example/Refueling.png'
-  import showBabyUrl from '../../assets/mould/example/showBaby.png'
-  import RefuelingUrl2 from '../../assets/mould/example/RefuelingUrl2.png'
+
   export default {
     name: "editor",
     props:[
@@ -808,14 +798,6 @@
     ],
     data(){
       return {
-        moIMG:{
-          lookUrl:lookUrl,
-          playRadioUrl:playRadioUrl,
-          playVideoUrl:playVideoUrl,
-          RefuelingUrl:RefuelingUrl,
-          showBabyUrl:showBabyUrl,
-          RefuelingUrl2:RefuelingUrl2
-        },
         // 放大缩小参数
         bigNum:50,
         // 弹窗参数

src/components/textarea/index.vue

@@ -180,6 +180,7 @@
           });
           return false
         }
+
         let str = `<p style="text-align: center"><img class="mce-object mce-object-audio" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="280" height="55" data-mce-p-controls="controls" data-mce-html="%0A%3Csource%20src%3D%22https%3A//cdn.singsingenglish.com/${this.radio[0].url}%22%20type%3D%22audio/mpeg%22%20/%3E" data-mce-object="audio"></p>`;
         console.log(str);
         this.insertContent(str);