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

src/assets/css/tripIndexNew2.css

@@ -576,6 +576,7 @@ html, body{
   }
   .travelDaysdetails-text0-r{
     margin-top: -8px;
+    text-indent: 116px;
   }
   .travelDaysdetails-text0-r>p{
     line-height: 42px;

src/components/EditTemplate.vue

@@ -7,7 +7,7 @@
 </style>
 
 <template>
-  <div :style="style">
+  <div>
     <!-- 图片上传组件辅助-->
 
     <el-upload :id="myImageUploader" :http-request="UploadAttachment" :show-file-list="false" action="" v-if="toolbar.image">
@@ -610,7 +610,7 @@
   Quill.register(Font, true);
   export default {
     name: 'edit',
-    props: ["editValue", "toolbarShow", "referenceList", "placeholder", "defaultAccount","style","quillStyle"],
+    props: ["editValue", "toolbarShow", "referenceList", "placeholder", "defaultAccount","quillStyle"],
     data() {
       return {
         myToolbar: '',

src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue

@@ -786,5 +786,7 @@
 
 </style>
 <style scoped>
+@import url('../../../../assets/css/tripIndexNew2.css');
   @import url('../../../../assets/css/tripIndexNewHV.css');
+  
 </style>