修改

src/views/giftManage/giftList.vue

@@ -164,7 +164,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item style="width: 800px" label="礼品图片" prop="imgUrl">
-                    <el-tooltip content="建议图片宽高比260*200" placement="top-start">
+                    <el-tooltip comment="建议图片宽高比260*200" placement="top-start">
                         <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
                             :on-remove="handleRemove">
@@ -178,9 +178,9 @@
                 <el-form-item
                     style="width: 800px"
                     label="礼品说明"
-                    prop="content"
+                    prop="comment"
                     >
-                <tinymce v-model="dataForm.content" ref="tinymce"></tinymce>
+                <tinymce v-model="dataForm.comment" ref="tinymce"></tinymce>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -381,7 +381,7 @@ export default {
                 purchaserName: '',
             },
             dataForm: {
-                content: undefined,
+                comment: undefined,
                 name: undefined,
                 seq: undefined,
                 productAttribute: undefined,
@@ -406,7 +406,7 @@ export default {
                 actualStock: [{ required: true, message: "请设置库存量", trigger: "blur" }],
                 deliveryType: [{ required: true, message: "请选择兑换方式", trigger: "blur" }],
                 location: [{ required: true, message: "请选择礼品所在地", trigger: "blur" }],
-                content: [{ required: true, message: "说明不能为空", trigger: "blur" }],
+                comment: [{ required: true, message: "说明不能为空", trigger: "blur" }],
             },
             dialogListVisible: false,
             dialogRelatedVisible:false,
@@ -499,7 +499,7 @@ export default {
         },
         resetForm() {
             this.dataForm = {
-                content: undefined,
+                comment: undefined,
                 name: undefined,
                 seq: undefined,
                 productAttribute: undefined,
@@ -544,7 +544,7 @@ export default {
         },
         handleUpdate(row) {
             this.dataForm = Object.assign({}, row);
-            let content = this.dataForm.content;
+            let comment = this.dataForm.comment;
             if (row.productAttribute == 1) {
                 this.deliveryTypeList = [
                     {
@@ -581,7 +581,7 @@ export default {
             this.dialogStatus = 'update'
             this.dialogFormVisible = true
             this.$nextTick(() => {
-                this.$refs.tinymce.setContent(content);
+                this.$refs.tinymce.setContent(comment);
                 this.$refs['dataForm'].clearValidate()
             })
         },

src/views/goodsManage/goodsList.vue

@@ -160,7 +160,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item style="width: 800px" label="商品图片" prop="imgUrl">
-                    <el-tooltip content="建议图片宽高比260*200" placement="top-start">
+                    <el-tooltip comment="建议图片宽高比260*200" placement="top-start">
                         <el-upload :limit="1" :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images"
                             :on-success="handleGallerySucess" :on-exceed="handleExceed" :before-upload="uploadBannerImg"
                             :on-remove="handleRemove">
@@ -178,9 +178,9 @@
                 <el-form-item
                     style="width: 800px"
                     label="商品说明"
-                    prop="content"
+                    prop="comment"
                     >
-                <tinymce v-model="dataForm.content" ref="tinymce"></tinymce>
+                <tinymce v-model="dataForm.comment" ref="tinymce"></tinymce>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -298,7 +298,7 @@ export default {
                 actualStock: [{ required: true, message: "请设置库存量", trigger: "blur" }],
                 deliveryType: [{ required: true, message: "请选择兑换方式", trigger: "blur" }],
                 location: [{ required: true, message: "请选择商品所在地", trigger: "blur" }],
-                content: [{ required: true, message: "说明不能为空", trigger: "blur" }],
+                comment: [{ required: true, message: "说明不能为空", trigger: "blur" }],
             },
             dialogListVisible: false,
             fileImgUrl: this.upLoadUrl,
@@ -377,7 +377,7 @@ export default {
         },
         resetForm() {
             this.dataForm = {
-                content: undefined,
+                comment: undefined,
                 name: undefined,
                 seq: undefined,
                 productAttribute: undefined,
@@ -423,7 +423,7 @@ export default {
         },
         handleUpdate(row) {
             this.dataForm = Object.assign({}, row);
-            let content = this.dataForm.content;
+            let comment = this.dataForm.comment;
             if (row.productAttribute == 1) {
                 this.deliveryTypeList = [
                     {
@@ -460,7 +460,7 @@ export default {
             this.dialogStatus = 'update'
             this.dialogFormVisible = true
             this.$nextTick(() => {
-                this.$refs.tinymce.setContent(content);
+                this.$refs.tinymce.setContent(comment);
                 this.$refs['dataForm'].clearValidate()
             })
         },