合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -89,6 +90,7 @@ public class TpTransaction implements Serializable {
     /**
      * 创建人
      */
+    @TableField(exist = false)
     private String userName;
 
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TransactionServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -63,10 +64,12 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("uuid", id);
 		queryWrapper.eq("type", "transaction");
-		List<TdImages> list = tdImagesMapper.selectList(queryWrapper);
+		List<TdImages> imagesList = tdImagesMapper.selectList(queryWrapper);
+		// 转换, 只保留 imageUrl 字段
+		List<String> stringList = imagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
 		Map<String,Object> map = Maps.newHashMap();
 		map.put("tpTransaction",tpTransaction);
-		map.put("list",list);
+		map.put("list",stringList);
 		responseBean.addSuccess(map);
 		return responseBean;
 	}

VUECODE/smart-property-manage/src/store/modules/transaction.js

@@ -30,9 +30,9 @@ const transaction = {
         })
       })
     },
-    TransactionById({ commit, state }, data) { // 查询二手租赁详情
+    TransactionById({ commit, state }, id) { // 查询二手租赁详情
       return new Promise((resolve, reject) => {
-        transactionById(data).then(response => {
+        transactionById(id).then(response => {
           resolve(response)
         }).catch(error => {
           reject(error)

VUECODE/smart-property-manage/src/views/social/transaction/info/transactionInfo.vue

@@ -1,9 +1,8 @@
 <template>
   <div id="root">
-    <span class="activityTile">{{ ruleForm.activityTitle }}</span>
-    <img :src="ruleForm.activityCarouselImg" width="700" height="500">
+    <span class="activityTile">{{ ruleForm.transactionTitle }}</span>
     <div class="activityContext">
-      {{ ruleForm.activityContent }}
+      {{ ruleForm.transactionContent }}
     </div>
     <div class="activityContextImg">
       <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
@@ -12,21 +11,17 @@
 </template>
 
 <script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+
 export default {
   data() {
     return {
       asOfdate: '2018/10/10 23:59:59',
       ruleForm: {
         id: '',
-        activityTitle: '',
-        activityCarouselImg: '', // 轮播图
-        activityContent: '', // 活动内容详细
-        contentImg: [], // 活动内容配图
-        signUpCount: '', // 报名人数统计
-        signUpMax: '', //  活动人数上限
-        registrationEndTime: '', // 报名活动结束时间
-        sort: 1, // 权重
-        status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
+        transactionTitle: '',
+        transactionContent: '', // 交易内容详细
+        contentImg: [] // 活动内容配图
       }
     }
   },
@@ -34,12 +29,17 @@ export default {
     this.getById(this.$route.params.id)
   },
   methods: {
+    ...mapActions('transaction', [
+      'TransactionById'
+    ]),
     getById(id) { // 根据ID获取活动信息
-      alert(id)
-      this.$store.dispatch('TransactionById', id).then((res) => {
-        const resData = res.data
-        this.ruleForm = resData.info
-        this.ruleForm.contentImg = resData.contentImg
+      this.TransactionById(id).then((res) => {
+        const resData = res.data.tpTransaction
+        this.ruleForm.transactionTitle = resData.transactionTitle
+        this.ruleForm.transactionContent = resData.transactionContent
+        this.ruleForm.contentImg = res.data.list
+      }).catch(() => {
+        console.log('get list error')
       })
     }
   }