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

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

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

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

@@ -16,7 +16,7 @@
         <el-button type="primary" @click="onSubmit">查询</el-button>
       </el-form-item>
     </el-form>
-    <div class="operation">
+    <div>
       <el-button type="primary" @click="addActivity">添加</el-button>
       <el-button type="warning" @click="ediActivity">修改</el-button>
       <el-button type="danger" @click="invalidActivity">作废</el-button>
@@ -287,9 +287,6 @@ export default {
 .form-inline{
   margin-left: 20px;
 }
-.operation {
-  margin-left: 20px;
-}
 .block {
   display: flex;
   justify-content: flex-end;

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -7,7 +7,7 @@
       </el-form-item>
       <el-form-item  prop="announcementCarouselImg" >
         <div >
-          <div style="transform:translateY(250%);">公告轮播图</div>
+          <div style="transform:translateY(250%);">公告配图</div>
         <div  style="width: 500px;padding-left:20%;">
         <el-upload 
           :show-file-list="false"

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

@@ -28,6 +28,7 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
+      <el-button type="danger" @click="deleteId">作废</el-button>
     </div>
     <el-table
       v-loading="listLoading"

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

@@ -83,31 +83,31 @@ export default {
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
       rules: {
         announcementTitle: [
-          { required: true, message: '请输入公告名称', trigger: 'blur' },
+          { required: true, message: '请输入话题名称', trigger: 'blur' },
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
         ],
         announcementContent: [
-          { required: true, message: '公告详细描述', trigger: 'blur' }
+          { required: true, message: '话题详细描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
-      }
+      },
+      lock: false
     }
   },
   methods: {
     submitForm(formName, status) {
-      console.log(status)
-      // 加载框
-    //   const loading = this.$loading({
-    //     lock: true,
-    //     text: 'Loading',
-    //     spinner: 'el-icon-loading',
-    //     background: 'rgba(0, 0, 0, 0.7)'
-    //   })
+      //加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+          if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('话题内容描述 和 话题配图至少要存在一个!')
             return
           }