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

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

@@ -19,6 +19,7 @@
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
+      <span style="color: darkgray;font-size:14px;padding-left:13%">建议尺寸：首页banner 1080*750，服务页banner 1080*500，广告位banner 1080*290，大小不超过200KB</span>
       <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           :show-file-list="false"

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

@@ -19,6 +19,7 @@
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
+      <span style="color: darkgray;font-size:14px;padding-left:13%">建议尺寸：首页banner 1080*750，服务页banner 1080*500，广告位banner 1080*290，大小不超过200KB</span>
       <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           :show-file-list="false"

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

@@ -158,7 +158,7 @@ export default {
             <span>{node.label}</span>
             <span>
               <el-button size="mini" type="text" on-click={ () => this.append(data) }>添加子节点</el-button>
-              <el-button size="mini" type="text" on-click={ () => this.remove(data) }>删除节点及子节点</el-button>
+              <el-button size="mini" type="text" on-click={ () => this.remove(data) }>删除当前节点及子节点</el-button>
             </span>
           </span>);
       }

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

@@ -7,7 +7,7 @@
          <el-option label="议事大厅(投诉，建议，表扬，社区明星评比，业委员会选举，组织活动等)" value="0"/>
          <el-option label="友令互助(借物，宠物寄养，搭伙用餐，搭手帮忙，邻里提醒，组织春游等)" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
-         <el-option label="二手租赁(咸鱼太贵，快递费太贵，想租个车位？小区里面就能买卖)" value="-1"/>
+         <el-option label="二手租赁(咸鱼太贵，快递费太贵，想租个车位？小区里面就能买卖)" value="2"/>
          <el-option label="其他(还有其他的？畅所欲言吧)" value="3"/>
         </el-select>
       </el-form-item>
@@ -17,7 +17,7 @@
       <el-form-item label="话题内容描述" prop="transactionContent">
         <el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等" style="width: 80%;"/>
       </el-form-item>
-      <el-form-item label="话题配图">
+      <el-form-item label="* 话题配图">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
@@ -100,8 +100,8 @@ export default {
       })
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('话题内容描述 和 话题配图至少要存在一个!')
+          if (this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('话题配图不能为空!')
             return
           }
           this.ruleForm.status = status // 发布状态

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

@@ -8,12 +8,12 @@
          <span v-if="ruleForm.type==='3'">{{'其他话题'}}</span>
       </el-form-item>
       <el-form-item label="话题标题">
-        <div class="activityContext">
+        <div>
           {{ ruleForm.transactionTitle }}
         </div>
       </el-form-item>  
       <el-form-item label="详情描述">
-        <div class="activityContext">
+        <div>
           {{ ruleForm.transactionContent }}
         </div>
       </el-form-item>

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

@@ -113,8 +113,8 @@ export default {
       })  
       this.$refs[formName].validate((valid) => {
       if (valid) {
-          if (this.ruleForm.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
-            this.$message.error('内容描述 和 图至少要存在一个!')
+          if (this.ruleForm.contentImg.length <= 0) {
+            this.$message.error('话题配图不能为空!')
             // 关闭加载框
             loading.close()
             return