修复 bug

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

@@ -20,7 +20,7 @@
     </div>
     <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
     <div class="bom-button">
-      <el-button type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
+      <el-button v-if="isEdi" type="primary" style="width: 100px;" @click="ediActivity">修改</el-button>
     </div>
   </div>
 </template>
@@ -44,6 +44,7 @@ export default {
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
       },
+      isEdi: true, // 显示修改按钮
       innerW: 0 // 进度条
     }
   },
@@ -62,6 +63,9 @@ export default {
           console.log(this.$refs.innerDiv.style.width)
           console.log(this.innerW)
         }
+        if (this.ruleForm.status === '0') {
+          this.isEdi = false
+        }
       })
     },
     formatDate(val) {

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

@@ -75,7 +75,7 @@ export default {
     }
   },
   methods: {
-    submitForm(formName,status) {
+    submitForm(formName, status) {
       console.log(status)
       // 加载框
       const loading = this.$loading({
@@ -88,7 +88,7 @@ export default {
         if (valid) {
           if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
             this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
-            return 
+            return
           }
           this.ruleForm.status = status // 发布状态
           this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
@@ -112,12 +112,12 @@ export default {
           return false
         }
       })
-       // 关闭加载框
+      // 关闭加载框
       loading.close()
     },
-    resetForm(formName,status) {
+    resetForm(formName, status) {
       console.log(status)
-      this.submitForm(formName,status)
+      this.submitForm(formName, status)
     },
     handleAvatarSuccess(res, file) { // 轮播图上传回调
       this.ruleForm.announcementCarouselImg = res.data[0]

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

@@ -11,7 +11,7 @@
       </template>
     </div>
     <div class="bom-button">
-      <el-button type="primary" style="width: 150px;" @click="edi">修改</el-button>
+      <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">修改</el-button>
     </div>
   </div>
 </template>
@@ -32,7 +32,8 @@ export default {
         registrationEndTime: '', // 报名活动结束时间
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
-      }
+      },
+      isEdi: true // 默认显示修改按钮
     }
   },
   mounted() {
@@ -43,13 +44,17 @@ export default {
       this.ruleForm.id = this.$route.params.id
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
         const resData = res.data
-        this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle // 标题
-        this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent // 内容
-        this.ruleForm.announcementCarouselImg = resData.tpAnnouncement.announcementCarouselImg // 轮播图
-        this.sort = resData.tpAnnouncement.sort
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.ruleForm = announcement
         // 多张图片进行遍历
-        for (let i = 0; i < resData.studentList.length; i++) {
-          this.ruleForm.contentImg.push({ url: resData.studentList[i].imageUrl })
+        this.ruleForm.contentImg = []
+        for (let i = 0; i < imgList.length; i++) {
+          this.ruleForm.contentImg.push({ url: imgList[i].imageUrl })
+        }
+        console.log('详情', resData)
+        if (this.ruleForm.status === '0') {
+          this.isEdi = false
         }
       })
     },