bug修改

src/views/modules/communityParty/activity/index.vue

@@ -181,7 +181,7 @@
         gridList: [],//所属网格
         unitList: [],
         statuslist: [
-          { value: 0, label: '未进行' },
+          { value: 0, label: '未开始' },
           { value: 1, label: '进行中' },
           { value: 2, label: '已结束' },
           { value: 3, label: '已取消' }
@@ -250,7 +250,7 @@
       getStatusText(status) {
         switch (status) {
           case 0:
-            return '未进行';
+            return '未开始';
           case 1:
             return '进行中';
           case 2:
@@ -285,8 +285,8 @@
         const url = "/actual/base/communityActivity/page";
 
         let params = {
-        //  pageSize: this.pageSize,
+         pageSize: this.pageSize,
-          //pageNo: this.pageNo,
+          pageNo: this.pageNo,
           agencyId: this.agencyId,
           ...this.formData,
         };
@@ -395,7 +395,7 @@
         const url = "/actual/base/activityType/page"
         let params = {
           // agencyId: this.agencyId
-          pageSize: 20,
+          pageSize: 10,
           pageNo: 1,
           typeName: "",
           enabled: 0
@@ -597,7 +597,7 @@
           address: "",
           assistingParty: ""
         }
-        this.pageSize = 20
+        this.pageSize = 10
         this.pageNo = 1
         // this.loadTable()
         this.communityActivityList()

src/views/modules/communityParty/activity/initiateActivity.vue

@@ -82,7 +82,7 @@
                 <div v-if="records">
                     <div v-if="!online">
                         <el-form-item label="活动人数" label-width="140px">
-                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" :max="10"
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
                             label="描述文字"></el-input-number>
                         </el-form-item>
                         <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
@@ -126,8 +126,8 @@
 
                 <div v-if="online">
                     <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
-                        <el-date-picker v-model.trim="formData.cutOffTime" type="date" value-format="yyyy-MM-dd"
+                        <el-date-picker v-model.trim="formData.cutOffTime"  type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                            format="yyyy-MM-dd" placeholder="选择报名截止时间" style="width:280px">
+                        format="yyyy-MM-dd HH:mm:ss" placeholder="选择报名截止时间" style="width:280px">
                         </el-date-picker>
                     </el-form-item>
 
@@ -137,7 +137,7 @@
                     </el-form-item>
 
                     <el-form-item label="活动人数" label-width="140px">
-                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" :max="10"
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
                             label="描述文字"></el-input-number>
                     </el-form-item>
 
@@ -733,7 +733,7 @@ export default {
                 online: 0,//开关
                 cutOffTime: "",//截止时间
                 points: 0,//积分
-                participants: 1,//活动人数
+                participants: 0,//活动人数
                 sendMessage: 0,//推送数
                 sumUp: "",//活动总结
                 activityImgs: [],//图片列表

src/views/modules/communityParty/comPromotion/add.vue

@@ -36,14 +36,12 @@
                     </div>
                 </el-form-item>
 
-                <el-form-item label="首页置顶" style="display: block" prop="peopleCount" label-width="150px">
+                <el-form-item label="首页置顶" style="display: block" prop="top" label-width="150px">
-                    <el-switch v-model="top" @change="handleOnlineRegistration"></el-switch>
+                    <el-switch v-model="formData.top" @change="handleOnlineRegistration"></el-switch>
                 </el-form-item>
 
-                <el-form-item label="消息推送" label-width="140px">
+                <el-form-item label="消息推送" label-width="140px" prop="sendMsg">
-                    <el-checkbox-group v-model="formData.sendMsg">
+                        <el-checkbox v-model="formData.sendMsg"   @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
-                        <el-checkbox  label="是否通过公众号推送给社区居民"></el-checkbox>
-                    </el-checkbox-group>
                 </el-form-item>
 
 
@@ -80,21 +78,21 @@ var geocoder // 新建一个正逆地址解析类
 let loading // 加载动画
 export default {
   data() {
-      let initFormData = () => {
+    //   let initFormData = () => {
-          let _form = {
+    //       let _form = {
-            title: "",//标题
+    //         title: "",//标题
-            content: "",//内容
+    //         content: "",//内容
-            tagId: "",//标签id
+    //         tagId: "",//标签id
-            coverPic: "",//封面图
+    //         coverPic: "",//封面图
-            releaseTime: "",//发布时间
+    //         releaseTime: "",//发布时间
-            sendMsg: 0,//是否推送
+    //         sendMsg: 0,//是否推送
-            top: 0,//是否置顶
+    //         top: 0,//是否置顶
-            status: 0 //状态
+    //         status: 0 //状态
       
-          }
+    //       }
 
-          return _form
+    //       return _form
-      }
+    //   }
       return {
         adverTagList:[],
 
@@ -118,11 +116,21 @@ export default {
 
           keyWords: '',
           activityId: '',
-          formData: initFormData(),
+          formData: {   
+            title: "",//标题
+            content: "",//内容
+            tagId: "",//标签id
+            coverPic: "",//封面图
+            releaseTime: "",//发布时间
+            sendMsg: false,//是否推送
+            top: false,//是否置顶
+            status: 0 //状态
+        },
           serviceList: [],
         //   gridList: [],
           agencyId: '',
           agencyName:"",
+          releaseTime: '',
 
           demandOptions: [],
           uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@@ -134,11 +142,15 @@ export default {
   mounted() {
     this.agencyName=this.$store.state.user.agencyName,
     this.agencyId=this.$store.state.user.agencyId,
-      this.advertisingTag()
+    this.advertisingTag()
+    this.setDefaultReleaseTime();
       
   },
 
   methods: {
+    checkbox1(val){
+        console.log(val);
+    },
     handleFileRemoved(file) {
       // 处理从子组件接收到的删除文件的信息
       console.log('File removed:', file);
@@ -164,10 +176,10 @@ export default {
             if(row!=null){
                  this.formData = JSON.parse(JSON.stringify(row));
             }
-       
             this.formType=typeid
-            console.log(this.formData);
+            console.log(this.formData,"5164");
             this.endLoading();
+            this.setDefaultReleaseTime()
         },
     async advertisingTag () {
           const url = "/actual/base/advertisingTag/page"
@@ -187,11 +199,13 @@ export default {
           }
         },
       handleOnlineRegistration(value) {
-          // console.log(value)
+          console.log(this.fileList);
-          if (value) {
+          if( value && this.fileList.length==0){
-              this.formData.top = 0;
+            console.log("51545");
-          } else {
+            this.$message.error("置顶需上传封面图片")
-              this.formData.top = 1;
+            this.formData.top = false;
+            
+            
           }
       },
 
@@ -250,6 +264,7 @@ export default {
           this.$refs['ref_form'].validate((valid, messageObj) => {
             this.formData.agencyName= this.agencyName
             this.formData.agencyId= this.agencyId
+            this.formData.status= 0
             console.log("this.formData看看里面村的什么",this.formData)
             if (!valid) {
               app.util.validateRule(messageObj)
@@ -264,7 +279,9 @@ export default {
           if (this.formType === 'edit') {
               let url = '/actual/base/communityPublicity/update'
               this.formData.sendMsg= this.formData.sendMsg? 1:0
-        
+              this.formData.top= this.formData.top? 1:0
+                console.log(this.formData.top);
+              console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
                   this.$message({
@@ -283,6 +300,7 @@ export default {
               let url = '/actual/base/communityPublicity/save'
               console.log(this.formData,"formData");
               this.formData.sendMsg= this.formData.sendMsg? 1:0
+              this.formData.top= this.formData.top? 1:0
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
                   this.$message({
@@ -302,7 +320,6 @@ export default {
       },
 
       handleCancle() {
-
           this.resetData()
           this.$emit('dialogCancle')
 
@@ -310,7 +327,7 @@ export default {
 
       resetData() {
           this.fileList = []
-          this.top = false
+          this.top = 0
           this.formType = ''
           this.formData = {
 
@@ -331,7 +348,29 @@ export default {
           if (loading) {
               loading.close()
           }
-      }
+      },
+      setDefaultReleaseTime() {
+      const currentDate = new Date();
+      const formattedDate = this.formatDate(currentDate, 'yyyy-MM-dd HH:mm:ss');
+      this.formData.releaseTime = formattedDate;
+    },
+    formatDate(date, format) {
+      const pad = (n) => (n < 10 ? '0' + n : n);
+      const year = date.getFullYear();
+      const month = pad(date.getMonth() + 1);
+      const day = pad(date.getDate());
+      const hours = pad(date.getHours());
+      const minutes = pad(date.getMinutes());
+      const seconds = pad(date.getSeconds());
+      return format
+        .replace('yyyy', year)
+        .replace('MM', month)
+        .replace('dd', day)
+        .replace('HH', hours)
+        .replace('mm', minutes)
+        .replace('ss', seconds);
+    }
+  
   },
   computed: {
       dataRule() {
@@ -348,7 +387,8 @@ export default {
               ],
               tagId: [
                   { required: true, message: '请选择文章标签', trigger: 'blur' }
-              ]
+              ],
+        
           }
       },
 

src/views/modules/communityParty/comPromotion/index.vue

@@ -87,7 +87,7 @@
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
       width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-      <add ref="ref_form"  @dialogCancle="addFormCancle"
+      <add ref="ref_form"  v-if="formShow" @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"></add>
     </el-dialog>