暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -31,10 +31,10 @@ public class HKConstant {
      * <p>请将地址配置正确.</p>
      * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
      */
-   public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+   // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
     //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
-    //public static final String OPENAPI_IP_PORT_HTTP = "http://huifang.vipgz1.idcfengye.com";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://huifang.vipgz1.idcfengye.com";
 
     /**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseMapper.java

@@ -21,5 +21,5 @@ public interface TaVisitorLicenseMapper {
 
     void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
 
-    List<Integer> findTaVistorLicenseById(Integer id);
+    List<String> findTaVistorLicenseById(Integer id);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaVisitor.java

@@ -34,7 +34,7 @@ public class TaVisitor {
 
     private Date updateDate;
 
-    private List<Integer> carLicense;
+    private List<String> carLicense;
 
     public Integer getId() {
         return id;
@@ -156,11 +156,11 @@ public class TaVisitor {
         this.updateDate = updateDate;
     }
 
-    public List<Integer> getCarLicense() {
+    public List<String> getCarLicense() {
         return carLicense;
     }
 
-    public void setCarLicense(List<Integer> carLicense) {
+    public void setCarLicense(List<String> carLicense) {
         this.carLicense = carLicense;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -50,9 +50,19 @@ public class TpMessage {
     private String content;
     
     /**
-     * 消息图标
+     * 已读消息图标
      */
-    private String messageIcon;
+    private String readMessageIcon;
+    
+    /**
+     * 未读消息图标
+     */
+    private String unreadMessageIcon;
+    
+    /**
+     * 消息详情url链接
+     */
+    private String messageDetailUrl;
 
     public Integer getId() {
         return id;
@@ -214,11 +224,27 @@ public class TpMessage {
         this.content = content;
     }
     
-    public String getMessageIcon() {
-        return messageIcon;
+    public String getReadMessageIcon() {
+        return readMessageIcon;
+    }
+    
+    public void setReadMessageIcon(String readMessageIcon) {
+        this.readMessageIcon = readMessageIcon;
+    }
+    
+    public String getUnreadMessageIcon() {
+        return unreadMessageIcon;
+    }
+    
+    public void setUnreadMessageIcon(String unreadMessageIcon) {
+        this.unreadMessageIcon = unreadMessageIcon;
+    }
+    
+    public String getMessageDetailUrl() {
+        return messageDetailUrl;
     }
     
-    public void setMessageIcon(String messageIcon) {
-        this.messageIcon = messageIcon;
+    public void setMessageDetailUrl(String messageDetailUrl) {
+        this.messageDetailUrl = messageDetailUrl;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -75,7 +75,8 @@ public class SocialServiceImpl implements SocialServiceI {
         if (null != allViewNum){
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
-        return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+        TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+        return tpAnnouncement;
     }
 
     /**
@@ -289,7 +290,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
             tpTransactionMapper.insertSelective(tpTransaction);
-            insertTdImage(tpTransaction, imageUrl, userId);
+            insertTdImage(tpTransaction, imageUrl, userId,Constant.TRANSACTION);
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
             return response;
@@ -298,11 +299,19 @@ public class SocialServiceImpl implements SocialServiceI {
         return response;
     }
 
-    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId) throws IOException {
+    /**
+     * 图片入库
+     * @param tpTransaction
+     * @param imageUrl
+     * @param userId
+     * @param type 服务：service, 公告：announcement , 活动：activity  租赁 ： transaction
+     * @throws IOException
+     */
+    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId,String type) throws IOException {
         TdImages tdImages = new TdImages();
         Integer uuId = tpTransaction.getId();
         tdImages.setImageUrl(imageUrl);
-        tdImages.setType(Constant.SOCIAL);
+        tdImages.setType(type);
         tdImages.setUuid(uuId);
         tdImages.setCreateUser(userId);
         tdImages.setCreateTime(new Date());

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -137,7 +137,6 @@ public class TaUserServiceImpl implements ITaUserService {
             TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(currentUser.getId());
             taUserVO.setRole(taSysRole.getRoleName());
             // 人脸是否已录入
-            // TODO 这里目前定死为已录入, 后期根据人脸业务做判断
             // taUserVO.setFace("register");
             if ("1".equals(currentUser.getFaceStatus())) {
                 taUserVO.setFace("register");
@@ -405,6 +404,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setStatus(Constant.EFFECTIVE+"");
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
+        user.setFaceStatus("0");
         user.setRemark("这是业主添加的!");
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaVistorServiceImpl.java

@@ -57,11 +57,11 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
             taVisitorMapper.insertSelective(taVisitor);
 
-            for (Integer taCarLicense : taVisitor.getCarLicense()){
+            for (String taCarLicense : taVisitor.getCarLicense()){
                 TaVisitorLicense taVisitorLicense = new TaVisitorLicense();
                 taVisitorLicense.setCommunityId(communityId);
                 taVisitorLicense.setVisitorId(taVisitor.getId());
-                taVisitorLicense.setLicense(taCarLicense.toString());
+                taVisitorLicense.setLicense(taCarLicense);
                 taVisitorLicense.setCreateUser(userId);
                 taVisitorLicense.setCreateDate(new Date());
                 taVisitorLicense.setUpdateUser(userId);
@@ -84,7 +84,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
 
         for (TaVisitor taVisitor : taVisitors){
             if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
-                List<Integer> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
+                List<String> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
                 taVisitor.setCarLicense(taVisitorLicenses);
             }
         }

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorLicenseMapper.xml

@@ -126,7 +126,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="findTaVistorLicenseById" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
+  <select id="findTaVistorLicenseById" resultType="java.lang.String" parameterType="java.lang.Integer" >
     select
       license
     from ta_visitor_license

CODE/smart-community/app-api/src/main/resources/mapper/TaVisitorMapper.xml

@@ -315,5 +315,6 @@
     from ta_visitor
     where community_id = #{communityId,jdbcType=INTEGER}
     and ta_user_id = #{userId,jdbcType=INTEGER}
+    order by create_date DESC
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -22,7 +22,9 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
     <result column="content" property="content" jdbcType="VARCHAR" />
-    <result column="message_icon" property="messageIcon" jdbcType="VARCHAR" />
+    <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
+    <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
+    <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -284,13 +286,15 @@
         k.status,
         r.content,
         d.name as ticket_status,
-        y.name as message_icon
+        i.read_message_icon,
+		i.unread_message_icon,
+		i.message_detail_url
     FROM
         tp_message t
     LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}
     LEFT JOIN tp_ticket_record r on t.ticket_id = r.ticket_id AND r.community_id = #{communityId,jdbcType=INTEGER}  AND k.status = r.status
     LEFT JOIN sys_dictionary d on k.status = d.code AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
-    LEFT JOIN sys_dictionary y on t.message_type = y.code AND y.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "message_type_img" )
+    LEFT JOIN tp_message_icon i on t.message_type = i.message_type
     WHERE
         t.uuid_type = 1
         AND t.community_id = #{communityId,jdbcType=INTEGER}

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -51,12 +51,15 @@ public class Constant {
     /** 住户APP端待办 **/
     public static final Integer MODEL_TYPE_UPCOMING = 2;
 
-    /** 社交公告类型**/
+    /** 社交/图片 公告类型**/
     public static final String ANNOUNCEMENT = "announcement";
 
-    /** 社交活动类型**/
+    /** 社交/图片 活动类型**/
     public static final String ACTIVITY = "activity";
 
+    /** 社交/图片 租贷类型**/
+    public static final String TRANSACTION = "transaction";
+
     /** 社交二手租赁类型**/
     public static final String LEASE = "lease";
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/ImageController.java

@@ -0,0 +1,45 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.ImageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: ImageController
+ * @Description: 图片上传以及获取url
+ * @date 2018/10/31
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "图片操作API", description = "图片操作API")
+public class ImageController {
+
+    @Autowired
+    private ImageServiceI imageService;
+
+    @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
+    @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -32,7 +32,6 @@ public class ToBanner {
     @NotBlank(message = "banner类型不能为空!")
     private String bannerType;
 
-    @NotBlank(message = "跳转的URL不能为空!")
     private String externalLink;
 
     private String bannerTitle;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/ImageServiceI.java

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author admin
+ * @Title: ImageServiceI
+ * @Description: TODO
+ * @date 2018/11/5
+ */
+public interface ImageServiceI {
+    String getImageUrl(MultipartFile uploadFile) throws IOException;
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ImageServiceimpl.java

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.aliyun.oss.OSSClient;
+import com.community.huiju.service.ImageServiceI;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * @author weichaochao
+ * @Title: ImageServiceimpl
+ * @Description: 获取图片地址实现类
+ * @date 2018/11/5
+ */
+@Service("ImageService")
+public class ImageServiceimpl implements ImageServiceI {
+
+    private static String endpoint = "http://oss-cn-shanghai.aliyuncs.com";
+    private static String accessKeyId = "LTAIkc75dpkJw8Lb";
+    private static String accessKeySecret = "v4bvXCaix6vSDTCFfwSAdqV53iFEQw";
+    private static String bucketName = "jingcheng-h5temp";
+
+    @Override
+    public String getImageUrl(MultipartFile uploadFile) throws IOException {
+
+        String imgName = System.currentTimeMillis() + ".png";
+        // 创建OSSClient实例
+        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        // 上传
+        long time = System.currentTimeMillis();
+
+        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
+
+        // 关闭client
+        ossClient.shutdown();
+        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
+        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
+        return url;
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -55,6 +55,11 @@ public class ToBannerServiceImpl implements IToBannerService {
                 response.addError("Banner内容不能为空");
                 return response;
             }
+        }else {
+            if (StringUtils.isBlank(banner.getExternalLink())) {
+                response.addError("跳转URL不能为空");
+                return response;
+            }
         }
 
         Date effTime = banner.getEffTime();

CODE/smart-community/operate-api/src/main/resources/bootstrap.yml

@@ -13,6 +13,10 @@ spring:
         serviceId: config-server
   session:
     store-type: jdbc
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 100MB
 eureka:
   client:
     service-url:

VUECODE/smart-operate-manage/src/components/Wangeditor/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <div id="wangeditor">
+    <div ref="editorElem" style="text-align:left"/>
+  </div>
+</template>
+
+<script>
+import E from 'wangeditor'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'EditorElem',
+  props:['content'], // 接收父组件的方法
+  data() {
+    return {
+      editorContent: this.content, // 内容
+      editorObject: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'token'
+    ])
+  },
+  mounted() {
+    this.editorObject = new E(this.$refs.editorElem) // 创建富文本实例
+    var editor = this.editorObject
+    editor.customConfig.onchange = (html) => {
+      this.editorContent = html
+      this.childWangeditorValue() // 把这个html通过catchData的方法传入父组件
+      // this.catchData(html) // 把这个html通过catchData的方法传入父组件
+    }
+    editor.customConfig.uploadImgServer = process.env.BASE_API + '/uploadimage'
+    editor.customConfig.uploadFileName = 'uploadFiles'
+    editor.customConfig.uploadImgHeaders = {
+      'Accept': '*/*',
+      'Authorization': 'Bearer ' + this.token // 头部token
+    }
+    editor.customConfig.menus = [ // 菜单配置
+      'head',
+      'list', // 列表
+      'justify', // 对齐方式
+      'bold',
+      'fontSize', // 字号
+      'italic',
+      'underline',
+      'image', // 插入图片
+      'foreColor', // 文字颜色
+      'undo', // 撤销
+      'redo' // 重复
+    ]
+    // 下面是最重要的的方法
+    editor.customConfig.uploadImgHooks = {
+      before: function(xhr, editor, files) {
+        // 图片上传之前触发
+        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files是选择的图片文件
+        // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
+        // return {
+        //     prevent: true,
+        //     msg: '放弃上传'
+        // }
+      },
+      success: function(xhr, editor, result) {
+        // 图片上传并返回结果，图片插入成功之后触发
+        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+        this.imgUrl = Object.values(result.data).toString()
+      },
+      fail: function(xhr, editor, result) {
+        // 图片上传并返回结果，但图片插入错误时触发
+        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+      },
+      error: function(xhr, editor) {
+        // 图片上传出错时触发
+        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+      },
+      timeout: function(xhr, editor) {
+        // 图片上传超时时触发
+        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+      },
+      // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
+      // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
+      customInsert: function(insertImg, result, editor) {
+        // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
+        // insertImg 是插入图片的函数，editor 是编辑器对象，result 是服务器端返回的结果
+        // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
+        const url = Object.values(result.data)// result.data就是服务器返回的图片名字和链接
+        JSON.stringify(url)// 在这里转成JSON格式
+        insertImg(url)
+        // result 必须是一个 JSON 格式字符串！！！否则报错
+      }
+    }
+    editor.create()
+    editor.txt.html(this.editorContent)
+  },
+  methods: {
+    childWangeditorValue() {
+      console.log('富文本组件的值:', this.editorContent)
+      this.$emit('wangeditorEvent', this.editorContent)
+    },
+    setWangeditorValue(value) { // 父组件调用此方法传入参数
+      this.editorObject.txt.html(value)
+    }
+  }
+}
+
+</script>

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -60,7 +60,10 @@
           <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
         </el-form-item>
         <el-form-item :label-width="formLabelWidth" label="内容详情">
-          <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor v-on:wangeditorEvent="wangeditorValue"></wangeditor>
+          </div>
         </el-form-item>
       </div>
     </el-form>
@@ -76,6 +79,7 @@
 import { mapState, mapActions } from 'vuex'
 import waves from '@/directive/waves' // Waves directive
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
   { key: 'US', display_name: 'USA' },
@@ -89,7 +93,7 @@ const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
 }, {})
 export default {
   name: 'AddBanner',
-  components: { Pagination },
+  components: { Pagination, Wangeditor },
   directives: { waves },
   filters: {
     statusFilter(status) {
@@ -171,6 +175,10 @@ export default {
       this.addForm.bannerContent = ''
       this.addForm.bannerDescription = ''
     },
+    wangeditorValue(value){
+      console.log("富文本内容:" + value)
+      this.addForm.bannerContent = value      //在这里接受子组件传过来的参数，赋值给data里的参数
+    },
     dialogForm(isVaule) {
       if (isVaule === '0') {
         this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div id="app" class="app-container">
     <el-form ref="form" :model="form">
       <el-form-item :label-width="formLabelWidth" label="标题">
         <el-input v-model="form.title"/>
@@ -62,9 +62,11 @@
         <!-- <el-form-item :label-width="formLabelWidth" label="内容详情">
           <el-input v-model="form.bannerContent" placeholder="内容详情"/>
         </el-form-item> -->
-        <div id="wangeditor">
-          <div ref="editorElem" style="text-align:left"></div>
-        </div>  
+        <el-form-item :label-width="formLabelWidth" label="内容详情">
+          <div id="father">
+            <wangeditor ref="refEditor" v-on:wangeditorEvent="wangeditorValue"></wangeditor>
+          </div>
+        </el-form-item>
       </div>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -77,9 +79,9 @@
 <script>
 // import { updateArticle, createBanner } from '@/api/banner' // getBanner
 import { mapState, mapActions } from 'vuex'
-import wangeditor from 'wangeditor'
 import waves from '@/directive/waves' // Waves directive
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
   { key: 'US', display_name: 'USA' },
@@ -93,7 +95,7 @@ const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
 }, {})
 export default {
   name: 'UpdateBanner',
-  components: { Pagination },
+  components: { Pagination, Wangeditor },
   directives: { waves },
   filters: {
     statusFilter(status) {
@@ -155,6 +157,9 @@ export default {
     this.getByBannerId(this.$route.params.id)
     this.listQuery = this.$route.params.listQuery
   },
+  updated() {
+    this.$refs.refEditor.setWangeditorValue(this.form.bannerContent)
+  },
   methods: {
     ...mapActions('community', [
       'FetchCommunityList',
@@ -176,6 +181,10 @@ export default {
       this.form.bannerContent = ''
       this.form.bannerDescription = ''
     },
+    wangeditorValue(value){
+      console.log("富文本内容:" + value)
+      this.form.bannerContent = value      //在这里接受子组件传过来的参数，赋值给data里的参数
+    },
     dialogForm(isVaule) {
       if (isVaule === '0') {
         this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
@@ -217,6 +226,7 @@ export default {
     getByBannerId(bannerId) {
       this.$store.dispatch('GetByBannerId', bannerId).then(res => {
         this.form = res
+        // this.catchData(this.form.bannerContent)
         this.showContent()
       })
     },