合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -64,4 +65,18 @@ public class TransactionController extends BaseController {
 		responseBean = transactionService.getTransactionList(tpTransaction,pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "获取二手租赁详情", notes = "获取二手租赁详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
+	})
+	@RequestMapping(value = "/transaction/{id}",method = RequestMethod.GET)
+	public ResponseBean getList(@PathVariable(value = "id") Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = transactionService.getTransactionInfo(id);
+		return responseBean;
+	}
 }

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

@@ -16,4 +16,11 @@ import com.community.huiju.model.TpTransaction;
 public interface ITransactionService extends IService<TpTransaction> {
 	
 	ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 获取交易信息详情
+	 * @param id
+	 * @return
+	 */
+	ResponseBean getTransactionInfo(Integer id);
 }

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpTransactionMapper;
+import com.community.huiju.model.TdImages;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.ITransactionService;
@@ -32,6 +34,9 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 	@Autowired
 	private TpTransactionMapper tpTransactionMapper;
 	
+	@Autowired
+	private TdImagesMapper tdImagesMapper;
+	
 	@Override
 	public ResponseBean getTransactionList(TpTransaction tpTransaction, Integer pageNum, Integer pageSize) {
 		ResponseBean responseBean = new ResponseBean();
@@ -44,4 +49,25 @@ public class TransactionServiceImpl extends ServiceImpl<TpTransactionMapper, TpT
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 获取交易信息详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public ResponseBean getTransactionInfo(Integer id) {
+		ResponseBean responseBean = new ResponseBean();
+		TpTransaction tpTransaction = tpTransactionMapper.selectById(id);
+		QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("uuid", id);
+		queryWrapper.eq("type", "transaction");
+		List<TdImages> list = tdImagesMapper.selectList(queryWrapper);
+		Map<String,Object> map = Maps.newHashMap();
+		map.put("tpTransaction",tpTransaction);
+		map.put("list",list);
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
 }

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -49,7 +49,7 @@
         >登录</el-button>
       </el-form>
     </div>
-    <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
+    <span class="bottom-desc">Copyright © 南京锦城佳业网络科技有限公司, All Rights Reserved.</span>
   </div>
 </template>
 

VUECODE/smart-property-manage/src/api/transaction.js

@@ -7,3 +7,11 @@ export function fetchList(query) {
     params: query
   })
 }
+
+// 查询 活动详情
+export function transactionById(id) {
+  return request({
+    url: '/transaction/' + id,
+    method: 'get'
+  })
+}

VUECODE/smart-property-manage/src/router/index.js

@@ -116,6 +116,13 @@ export const constantRouterMap = [
         name: 'transaction-import',
         meta: { title: '二手求购租赁管理', icon: 'table' }
       },
+      {
+        path: '/transaction/info',
+        component: () => import('@/views/social/transaction/info/transactionInfo'),
+        name: 'transaction-info',
+        hidden: true,
+        meta: { title: '二手求购租赁详情', icon: 'table' }
+      },
       {
         path: '/activity/add',
         component: () => import('@/views/social/activity/add/index'),

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

@@ -1,4 +1,4 @@
-import { fetchList } from '@/api/transaction'
+import { fetchList, transactionById } from '@/api/transaction'
 
 const transaction = {
   namespaced: true,
@@ -29,6 +29,15 @@ const transaction = {
           reject(error)
         })
       })
+    },
+    TransactionById({ commit, state }, data) { // 查询二手租赁详情
+      return new Promise((resolve, reject) => {
+        transactionById(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/login/index.vue

@@ -68,7 +68,7 @@
         <el-button v-else type="primary" style="width:100%;" disabled>登录</el-button>
       </el-form>
     </div>
-    <span class="bottom-desc">Copyright © 南京荟房网络科技有限公司, All Rights Reserved.</span>
+    <span class="bottom-desc">Copyright © 南京锦城佳业网络科技有限公司, All Rights Reserved.</span>
   </div>
 </template>
 

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

@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column label="标题" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.transactionTitle }}</span>
+          <span @click="handleLook(scope.row.id)" style="color: #409EFF;cursor: pointer">{{ scope.row.transactionTitle }}</span>
         </template>
       </el-table-column>
       <el-table-column label="查看人数" align="center">
@@ -203,14 +203,8 @@ export default {
       this.getEditCityList()
       this.getEditDistrictList()
     },
-    handleLook(row) {
-      this.setCurrent(row)
-      this.dialogLookFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.getEditCityList()
-      this.getEditDistrictList()
+    handleLook(id) {
+      this.$router.push({ name: 'transaction-info', params: { id: id }})
     },
     handleCreate() {
       this.resetDetail()

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

@@ -0,0 +1,133 @@
+<template>
+  <div id="root">
+    <span class="activityTile">{{ ruleForm.activityTitle }}</span>
+    <img :src="ruleForm.activityCarouselImg" width="700" height="500">
+    <div class="activityContext">
+      {{ ruleForm.activityContent }}
+    </div>
+    <div class="activityContextImg">
+      <img v-for="item in ruleForm.contentImg" :src="item" width="700" height="500" >
+    </div>
+  </div>
+</template>
+
+<script>
+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 是已修改
+      }
+    }
+  },
+  mounted() {
+    this.getById(this.$route.params.id)
+  },
+  methods: {
+    getById(id) { // 根据ID获取活动信息
+      this.$store.dispatch('TransactionById', id).then((res) => {
+        const resData = res.data
+        this.ruleForm = resData.info
+        this.ruleForm.contentImg = resData.contentImg
+      })
+    },
+    formatDate(val) {
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    ediActivity() { // 修改活动
+      this.$router.push({ name: 'activity-edi', params: { id: this.ruleForm.id }})
+    }
+  }
+}
+</script>
+
+<style scoped>
+#root {
+  display: flex;
+  flex-flow: column;
+  width: 700px;
+  margin-top: 50px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.activityTile{
+  text-align: center;
+  font-size: 30px;
+  margin-bottom: 10px;
+}
+.activityContext{
+  margin-top: 20px;
+  margin-bottom: 20px;
+  font-size: 20px;
+  justify-items: center;
+}
+.progress {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+.text-progress {
+  width: 500px;
+  float: left;
+  align-content: center;
+  position: absolute;
+  margin-top: 12px;
+}
+.people-number {
+  position: relative;
+  margin-left: 180px;
+}
+.outer-layer {
+  background-color: gainsboro;
+  height: 3px;
+  width: 450px;
+  margin-top: -10px;
+  position: relative;
+}
+.inner-layer {
+  background-color: aquamarine;
+  height: 6px;
+  width: 100px;
+  position: relative;
+  margin-top: -4px;
+}
+.circular {
+  border: 1px #001528 solid;
+  border-radius: 10px;
+  /*background-color: chartreuse;*/
+  width: 20px;
+  height: 20px;
+  position: relative;
+  margin-left: 452px;
+  margin-top: 11px;
+  float: left;
+}
+.people-limit {
+  margin-top: 13px;
+}
+.bom-button{
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 100px;
+}
+</style>