Merge branch 'master' of http://git.ketter.cn/farwalker/ycwh

admin_ui/src/views/ycwh/components/editDocumentInfo/index.vue

@@ -13,7 +13,7 @@
     </el-form-item>
     <el-form-item label="内容" prop="content">
       <!--<content-item v-if="contentItemVisible" ref="contentComp" :html.sync="form.content" />-->
-      <avue-ueditor v-model="form.content" v-bing="editorOptions"></avue-ueditor>
+      <avue-ueditor v-model="form.content" v-bind="editorOptions"></avue-ueditor>
     </el-form-item>
     <!--<el-form-item label="附件" prop="attachment">
         <el-upload class="upload-demo" :http-request="uploadImg" :data="{type:'att'}" :file-list="attachmentList" :on-remove="handleRemoveImg" :on-preview="handlePreview" :accept='["image/jpeg", "image/png", "image/tga", "image/gif", "image/bmp"]'>

admin_ui/src/views/ycwh/components/editFamousDish/index.vue

@@ -22,7 +22,7 @@
     </el-form-item>
     <el-form-item label="内容" prop="content">
       <!--<content-item v-if="contentItemVisible" ref="contentComp" :html.sync="form.content" />-->
-      <avue-ueditor v-model="form.content" v-bing="editorOptions"></avue-ueditor>
+      <avue-ueditor v-model="form.content" v-bind="editorOptions"></avue-ueditor>
     </el-form-item>
     <!--<el-form-item label="附件" prop="attachment">
         <el-upload class="upload-demo" :http-request="uploadImg" :data="{type:'att'}" :file-list="attachmentList" :on-remove="handleRemoveImg" :on-preview="handlePreview" :accept='["image/jpeg", "image/png", "image/tga", "image/gif", "image/bmp"]'>

admin_ui/src/views/ycwh/components/editFamousSnacks/index.vue

@@ -22,7 +22,7 @@
     </el-form-item>
     <el-form-item label="内容" prop="content">
       <!--<content-item v-if="contentItemVisible" ref="contentComp" :html.sync="form.content" />-->
-      <avue-ueditor v-model="form.content" v-bing="editorOptions"></avue-ueditor>
+      <avue-ueditor v-model="form.content" v-bind="editorOptions"></avue-ueditor>
     </el-form-item>
     <!--<el-form-item label="附件" prop="attachment">
         <el-upload class="upload-demo" :http-request="uploadImg" :data="{type:'att'}" :file-list="attachmentList" :on-remove="handleRemoveImg" :on-preview="handlePreview" :accept='["image/jpeg", "image/png", "image/tga", "image/gif", "image/bmp"]'>

admin_ui/src/views/ycwh/components/editFamousStore/index.vue

@@ -22,7 +22,7 @@
     </el-form-item>
     <el-form-item label="内容" prop="content">
       <!--<content-item v-if="contentItemVisible" ref="contentComp" :html.sync="form.content" />-->
-      <avue-ueditor v-model="form.content" v-bing="editorOptions"></avue-ueditor>
+      <avue-ueditor v-model="form.content" v-bind="editorOptions"></avue-ueditor>
     </el-form-item>
     <!--<el-form-item label="附件" prop="attachment">
         <el-upload class="upload-demo" :http-request="uploadImg" :data="{type:'att'}" :file-list="attachmentList" :on-remove="handleRemoveImg" :on-preview="handlePreview" :accept='["image/jpeg", "image/png", "image/tga", "image/gif", "image/bmp"]'>

admin_ui/src/views/ycwh/components/editProfessionalStyle/index.vue

@@ -13,7 +13,7 @@
     </el-form-item>
     <el-form-item label="内容" prop="content">
       <!--<content-item v-if="contentItemVisible" ref="contentComp" :html.sync="form.content" />-->
-      <avue-ueditor v-model="form.content" v-bing="editorOptions"></avue-ueditor>
+      <avue-ueditor v-model="form.content" v-bind="editorOptions"></avue-ueditor>
     </el-form-item>
     <!--<el-form-item label="附件" prop="attachment">
         <el-upload class="upload-demo" :http-request="uploadImg" :data="{type:'att'}" :file-list="attachmentList" :on-remove="handleRemoveImg" :on-preview="handlePreview" :accept='["image/jpeg", "image/png", "image/tga", "image/gif", "image/bmp"]'>