合并

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

         <el-input v-model="addForm.title"/> <!-- @keyup.delete="getFocus" -->
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="权重 *">
-        <el-input v-model="addForm.sort"/>
+        <el-input v-model="addForm.sort" type="number"/>
       </el-form-item>
       <el-form-item :label-width="formLabelWidth" label="生效时间 *">
         <el-date-picker

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

 <template>
   <div id="app" class="app-container">
     <el-form ref="form" :model="form">
-      <el-form-item :label-width="formLabelWidth" label="标题">
+      <el-form-item :label-width="formLabelWidth" label="标题 *">
         <el-input v-model="form.title"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="权重">
-        <el-input v-model="form.sort"/>
+      <el-form-item :label-width="formLabelWidth" label="权重 *">
+        <el-input v-model="form.sort" type="number"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="生效时间">
+      <el-form-item :label-width="formLabelWidth" label="生效时间 *">
         <el-date-picker
           v-model="form.effTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="失效时间">
+      <el-form-item :label-width="formLabelWidth" label="失效时间 *">
         <el-date-picker
           v-model="form.expTime"
           type="date"
           placeholder="选择日期时间"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner图">
+      <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner位">
+      <el-form-item :label-width="formLabelWidth" label="banner位  *">
         <el-select v-model="form.bannerPosition" placeholder="请选择位置">
           <el-option label="请选择位置" value="-1"/>
           <el-option
           <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
         </el-select>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="投放社区">
+      <el-form-item :label-width="formLabelWidth" label="投放社区 *">
         <el-select v-model="form.communityId" placeholder="请选择社区">
           <!-- <el-option label="请选择社区" value="-1"/> -->
           <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
           type="textarea"
           placeholder="请输入跳转描述"/>
       </el-form-item> -->
-      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+      <el-form-item :label-width="formLabelWidth" label="banner跳转 *">
         <el-radio v-model="form.bannerType" label="1" @change="showContent">外部超链接</el-radio>
         <el-radio v-model="form.bannerType" label="2" @change="showContent">自写文章</el-radio>
       </el-form-item>
-      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接">
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="跳转链接 *">
         <el-input v-model="form.externalLink" placeholder="跳转链接"/>
       </el-form-item>
       <div v-if="showContentVisible">
-        <el-form-item :label-width="formLabelWidth" label="内容标题">
+        <el-form-item :label-width="formLabelWidth" label="内容标题 *">
           <el-input v-model="form.bannerTitle" placeholder="内容标题"/>
         </el-form-item>
         <!-- <el-form-item :label-width="formLabelWidth" label="内容详情">
           <el-input v-model="form.bannerContent" placeholder="内容详情"/>
         </el-form-item> -->
-        <el-form-item :label-width="formLabelWidth" label="内容详情">
+        <el-form-item :label-width="formLabelWidth" label="内容详情 *">
           <div id="father">
             <wangeditor ref="refEditor" :content="form.bannerContent" @wangeditorEvent="wangeditorValue"/>
           </div>

VUECODE/smart-operate-manage/src/views/community/user/index.vue

       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
+      var hour = value.getHours()
+      var minutes = value.getMinutes()
+      var seconds = value.getSeconds()
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
     },
     lookUserLog(id) { // 跳转查看用户日志

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

           <span class="custom-tree-node">
             <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.append(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/activity/add/index.vue

         <el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 620px;"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
-        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页</span>
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页，建议尺寸1080*500，大小200KB以内</span>
         <div >
           <el-upload
             :show-file-list="false"

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

         <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
       </el-form-item>
       <el-form-item label="活动轮播图" prop="activityCarouselImg">
-        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页</span>
+        <span style="color: darkgray;font-size:14px">轮播图为横幅位展示图片，不会显示在活动详情页，建议尺寸1080*500，大小200KB以内</span>
         <div >
           <div style="width: 500px;">
             <el-upload

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

         <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 650px;"/>
       </el-form-item>
       <el-form-item label="公告轮播图" prop="announcementCarouselImg" >
-        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在公告详情页，建议尺寸1080*500，大小200KB以内</span>
         <div>
           <x-uploader v-model="ruleForm.announcementCarouselImg"/>
           <!--<div style="width: 500px;">-->

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

         <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 704px;"/>
       </el-form-item>
       <el-form-item label="公告轮播图" prop="announcementCarouselImg">
-        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+        <span style="color: darkgray;">轮播图为横幅位展示图片，不会显示在公告详情页，建议尺寸 1080*500，大小200KB以内</span>
         <div>
           <el-upload
             :show-file-list="false"

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

 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="150px" class="ruleForm">
 
-    <el-form-item class="filter-item" >
-        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
+    <el-form-item class="filter-item" label="话题类型" prop="type">
+      <el-select v-model="ruleForm.type" placeholder="请选择">
          <el-option label="议事大厅(投诉，建议，表扬，社区明星评比，业委员会选举，组织活动等)" value="0"/>
          <el-option label="友令互助(借物，宠物寄养，搭伙用餐，搭手帮忙，邻里提醒，组织春游等)" value="1"/>
          <!-- -1包括，二手，租赁，求购 -->
          <el-option label="二手租赁(咸鱼太贵，快递费太贵，想租个车位？小区里面就能买卖)" value="-1"/>
          <el-option label="其他(还有其他的？畅所欲言吧)" value="3"/>
         </el-select>
-        </div>
       </el-form-item>
-      <el-form-item  prop="transactionTitle">
-        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
+      <el-form-item  prop="transactionTitle" label="话题标题">
+       <el-input style="width: 80%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
       </el-form-item>
-      <el-form-item >
-        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等" style="width: 80%;"/></div>
+      <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>
-        <div >
-        <span>话题配图</span>
-        <div  style="padding-left:13%;transform:translateY(-20%);">
+      <el-form-item label="话题配图">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
-        </div>
-        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item prop="sort" >
-        <div style="display: flex; justify-content: flex-start;">
-          <span style="width: 120px;">权重值</span>
-          <el-input-number style="width: 130px;margin-left:-2%" v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
-        </div>
+      <el-form-item prop="sort" label="权重值">
+          <el-input-number style="width: 130px;" v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" style="margin-left:13%"  @click="submitForm('ruleForm','1')">发布</el-button>
       dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
       rules: {
-        announcementTitle: [
-          { required: true, message: '请输入话题名称', trigger: 'blur' },
-          { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
+        type: [
+          { required: true, message: '请选择话题类型', trigger: 'change' }
+        ],
+        transactionTitle: [
+          { required: true, message: '请输入话题标题', trigger: 'blur' }
         ],
-        announcementContent: [
-          { required: true, message: '话题详细描述', trigger: 'blur' }
+        transactionContent: [
+          { required: true, message: '请输入话题描述', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }

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

 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
-
-    <el-form-item class="filter-item" >
-        <div>话题类型&nbsp;&nbsp;<el-select v-model="ruleForm.type" placeholder="请选择" style="padding-left:4%;">
+    <el-form ref="ruleForm" :model="ruleForm"  :rules="rules" label-position="left" label-width="150px" class="ruleForm">
+      <el-form-item class="filter-item" label="话题类型" prop="type">
+        <el-select v-model="ruleForm.type" placeholder="请选择">
          <el-option label="选择状态" value="" />
          <el-option label="议事大厅" value="0"/>
          <el-option label="友令互助" value="1"/>
          <el-option label="二手租赁" value="2"/>
          <el-option label="其他" value="3"/>
         </el-select>
-        </div>
       </el-form-item>
-      <el-form-item  prop="transactionTitle">
-        <div>话题标题&nbsp;&nbsp;<el-input style="width: 80%;padding-left:4%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/></div>
+      <el-form-item  prop="transactionTitle" label="话题标题">
+        <el-input style="width: 80%;" v-model="ruleForm.transactionTitle" placeholder="20字以内"/>
       </el-form-item>
-      <el-form-item >
-        <div><span style="position:relative;top:-100px">话题详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.transactionContent" :rows="10" type="textarea" placeholder="内容，规则，时间等" style="width: 80%;"/></div>
+      <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>
-        <div >
-          <div>话题配图</div>
-        <div  style="padding-left:13%;transform:translateY(-20%);">
+      <el-form-item label="* 话题配图">
         <el-upload
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
-        </div>
-        </div>
         <el-dialog :visible.sync="dialogVisible">
           <img :src="dialogImageUrl" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item  prop="sort">
-        <div style="display: flex; justify-content: flex-start;">
-          <span style="width: 120px;">权重值</span>
+      <el-form-item  prop="sort" label="权重值">
+        <div>
           <el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange"/>
         </div>
       </el-form-item>
       <el-form-item>
-        <div style="padding-left:15%;">
-        <el-button type="primary" @click="submitForm('1')" >发布</el-button>
+        <div>
+        <el-button type="primary" @click="submitForm('ruleForm')" >发布</el-button>
         </div>
       </el-form-item>
     </el-form>
       imageUrl: '', // 轮播图预览
       dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
       dialogImageUrl: '', // 活动配图, 图片链接 (以单张为单位)
-      rules: {
-        announcementTitle: [
-          { required: true, message: '请输入公告名称', trigger: 'blur' },
-          { min: 1, max: 20, message: '长度在 15 个字符以内', trigger: 'blur' }
+       rules: {
+        type: [
+          { required: true, message: '请选择话题类型', trigger: 'change' }
         ],
-        announcementContent: [
-          { required: true, message: '公告详细描述', trigger: 'blur' }
+        transactionTitle: [
+          { required: true, message: '请输入话题标题', trigger: 'blur' }
+        ],
+        transactionContent: [
+          { required: true, message: '请输入话题描述', trigger: 'blur' }
+        ],
+        contentImg: [
+          { required: true, message: '话题配图',trigger: 'blur'}
         ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
     this.transactionById()
   },
   methods: {
-    submitForm(status) {
-      console.log(status)
-      // 加载框
-    //   const loading = this.$loading({
-    //     lock: true,
-    //     text: 'Loading',
-    //     spinner: 'el-icon-loading',
-    //     background: 'rgba(0, 0, 0, 0.7)'
-    //   })
-
+    submitForm(formName) {
+       //加载框
+      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.transactionContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('内容描述 和 图至少要存在一个!')
+            // 关闭加载框
+            loading.close()
             return
           }
-          this.ruleForm.status = status // 发布状态
+          this.ruleForm.status = 1 // 发布状态
           this.$store.dispatch('transaction/TransactionsEdit', this.ruleForm).then((res) => {
             this.$router.push({ name: 'transaction-import' })
             // this.$message.error(res.message)
           }).catch(() => {
             console.log('error AddActivity')
           })
-        
-  
-      // 关闭加载框
-      // loading.close()
+           } else {
+          console.log('error submit!!')
+          loading.close()
+          return false
+        }
+    })
+          // 关闭加载框
+      loading.close()
     },
     resetForm(formName, status) {
       console.log(status)