Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -321,7 +321,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题,status:"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)

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

@@ -1152,7 +1152,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             roomInfoList.add(roomInfo.getPhaseName()
             +roomInfo.getBuildingName()
             +roomInfo.getUnitName()
-            +roomInfo.getLevelName());
+            +roomInfo.getLevelName()
+            +roomInfo.getRoomNoName());
         }
         Map<String, Object> map = Maps.newHashMap();
         /*当前房产信息*/

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

@@ -770,7 +770,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuildingOwnerInfo.eq("community_id", tpUnit.getCommunityId())
 						.eq("phase_id", tpUnit.getPhaseId())
 						.eq("building_id", tpUnit.getBuildingId())
-						.eq("room_no_name", tpUnit.getName())
 						.eq("verify_status", 1);
 				}
 			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);

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

@@ -122,7 +122,7 @@ export const constantRouterMap = [
         path: '/social/transaction',
         component: () => import('@/views/social/transaction/index'),
         name: 'transaction-import',
-        meta: { title: '二手话题', icon: 'table' }
+        meta: { title: '话题', icon: 'table' }
       },
       {
         path: '/transaction/transaction',

VUECODE/smart-property-manage/src/views/building/info/index.vue

@@ -42,7 +42,7 @@
         </el-form-item>
         <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>  
         <el-form-item label="在当前房屋">
-          <span style="transform:translateY(80%);">{{ listQuery.phaseName + listQuery.buildingName + listQuery.unitName + listQuery.levelName + listQuery.roomNoName }}</span>
+          <span style="transform:translateY(80%);color:#A9A9A9;font-size: 14px; color: #606266;">{{ listQuery.phaseName + listQuery.buildingName + listQuery.unitName + listQuery.levelName + listQuery.roomNoName }}</span>
             <table style="transform:translateY(20%);">   
             <tr>
               <td>身份</td>
@@ -160,6 +160,11 @@ export default {
        this.listQuery.roomNoName = res.data.taUserVerify.roomNoName
        this.listQuery.roomInfoList  = res.data.roomInfoList
        this.listQuery.roleId = res.data.taUserVerify.roleId + ''
+       this.listQuery.phaseName = res.data.taUserVerify.phaseName
+       this.listQuery.unitName = res.data.taUserVerify.unitName
+       this.listQuery.buildingName = res.data.taUserVerify.buildingName
+       this.listQuery.levelName = res.data.taUserVerify.levelName
+
        console.log('')
       }).catch(() => {
         console.log('BuildingDetails error')

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

@@ -181,7 +181,7 @@ export default {
 
 }
 .activityTile{
-  font-size: 5px;
+  font-size: 14px;
 }
 .activityContext{
   margin-bottom: 20px;

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

@@ -44,7 +44,6 @@
         </div>
       </el-form-item>
       <el-form-item>
-        <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>