ct

src/components/pages/selectGird.vue

@@ -228,6 +228,7 @@ export default {
           align-items: center;
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
+          padding-right: 16px;
 
           .applicationNames {
             width: calc(100% - 56px);

src/saas/AppConflictMediation/add.vue

@@ -18,7 +18,7 @@
       <div class="form-item form-item__imgs">
         <div class="form-item__wrapper">
           <div class="form-item__title">
-            <i style="opacity: 0;">*</i>
+            <i style="opacity: 0">*</i>
             <h2>图片上传</h2>
             <span>(最多9张)</span>
           </div>
@@ -99,7 +99,7 @@
         <div class="form-item form-item__imgs">
           <div class="form-item__wrapper">
             <div class="form-item__title">
-              <i style="opacity: 0;">*</i>
+              <i style="opacity: 0">*</i>
               <h2>图片上传</h2>
               <span>(最多9张)</span>
             </div>
@@ -113,7 +113,6 @@
     <div class="btn" @click="submit">上报</div>
 
     <u-select v-model="showSelect" :list="girdList" label-name="girdName" value-name="id" @confirm="confirmSelect" />
-
   </div>
 </template>
 
@@ -139,7 +138,7 @@
         opts: 1,
         name: '',
         lat: '',
-          lng: ''
+        lng: '',
       },
       dictList: [],
       arr: [],
@@ -149,7 +148,7 @@
   },
 
   computed: {
-      ...mapState(['user'])
+    ...mapState(['user']),
   },
 
   onLoad() {
@@ -166,8 +165,8 @@
           this.form.address = res.address
           this.form.lat = res.latitude
           this.form.lng = res.longitude
-          }
-        });
+        },
+      })
     },
 
     confirmSelect(e) {
@@ -180,12 +179,12 @@
     },
 
     getDict() {
-        this.$http.post(`/app/appclapeventgroup/list`).then(res => {
+      this.$http.post(`/app/appclapeventgroup/list`).then((res) => {
         if (res.code == 0) {
-            this.dictList = res.data.records.map(v => {
+          this.dictList = res.data.records.map((v) => {
             return {
               value: v.id,
-                label: v.groupName
+              label: v.groupName,
             }
           })
         }
@@ -199,7 +198,7 @@
     },
 
     getGirdList() {
-        this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then(res => {
+      this.$http.post(`/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`).then((res) => {
         if (res.code == 0) {
           this.arr = res.data
           this.girdList = res.data
@@ -248,11 +247,14 @@
       if (this.flag) return
       this.flag = true
 
-        this.$http.post(`/app/appclapeventinfo/addOrUpdate?`, {
+      this.$http
+        .post(`/app/appclapeventinfo/addOrUpdate?`, {
           ...this.form,
           files: this.form.files,
-          groupName: this.dictList.filter(v => v.value === this.form.groupId)[0].label
-        }).then(res => {
+          groupName: this.dictList.filter((v) => v.value === this.form.groupId)[0].label,
+          eventStatus: this.form.opts == 0 ? '2' : '0',
+        })
+        .then((res) => {
           this.$u.toast('上报成功')
           this.flag = false
           if (res.code == 0) {
@@ -262,8 +264,8 @@
             }, 600)
           }
         })
-      }
-    }
+    },
+  },
 }
 </script>
 
@@ -291,7 +293,7 @@
       justify-content: space-between;
       height: 128px;
       padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
+      border-bottom: 1px solid #dddddd;
 
       input {
         flex: 1;
@@ -305,7 +307,6 @@
         align-items: center;
         font-size: 32px;
 
-
         span {
           max-width: 400px;
           margin-right: 8px;
@@ -336,7 +337,7 @@
 
       i {
         font-size: 30px;
-          color: #FF4466;
+        color: #ff4466;
       }
 
       span {
@@ -352,8 +353,8 @@
       }
     }
 
-  
-      &.form-item__imgs, &.form-item__textarea {
+    &.form-item__imgs,
+    &.form-item__textarea {
       .form-item__wrapper {
         display: block;
         height: auto;
@@ -388,7 +389,7 @@
     .report {
       height: 112px;
       width: 45%;
-        background: #F5F5F5;
+      background: #f5f5f5;
       line-height: 112px;
       text-align: center;
       font-size: 30px;
@@ -406,10 +407,10 @@
     bottom: 0;
     width: 100%;
     height: 120px;
-      background: #3975C6;
+    background: #3975c6;
     line-height: 120px;
     text-align: center;
-      color: #FFFFFF;
+    color: #ffffff;
   }
 }
 </style>

src/saas/AppConflictMediation/detail.vue

@@ -110,6 +110,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'Detail',
   components: {},
@@ -122,7 +124,9 @@ export default {
       showPage: false,
     }
   },
-  computed: {},
+  computed: {
+    ...mapState(['user']),
+  },
   watch: {},
   onLoad(o) {
     this.$dict.load('realityStatus', 'clapDoStatus').then(() => {
@@ -156,8 +160,8 @@ export default {
     },
     previewImage(images, img) {
       uni.previewImage({
-        urls: images.map(v => v.url),
-        current: img
+        urls: images.map((v) => v.url),
+        current: img,
       })
     },
   },

src/saas/AppConflictMediation/myReply.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="myReply">1</div>
+</template>
+
+<script>
+export default {
+  name: 'myReply',
+  components: {},
+  props: {},
+  data() {
+    return {}
+  },
+  computed: {},
+  watch: {},
+  onLoad() {},
+  onShow() {},
+  methods: {},
+}
+</script>
+
+<style scoped lang="scss">
+.myReply {
+  height: 100%;
+}
+</style>

src/saas/AppNotification/AppNotification.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="notification">
     <template v-if="showList">
-      <AiTopFixed>
+      <AiTopFixed v-if="!onlyLast">
         <u-tabs :list="tabs" :is-scroll="false" height="96" :current="index" bar-width="192" @change="change"></u-tabs>
       </AiTopFixed>
       <div class="body" v-if="dataList.length">
@@ -43,10 +43,9 @@
           </template>
         </div>
       </div>
-
       <AiEmpty v-else/>
       <u-loadmore :status="status" v-if="dataList.length"/>
-      <AiAdd @add="handleAdd"/>
+      <AiAdd v-if="!onlyLast" @add="handleAdd"/>
       <u-popup v-model="show" mode="bottom">
         <div class="popup-wrap">
           <u-row justify="between">
@@ -97,6 +96,9 @@ export default {
     tabs() {
       return [{name: "最新公告"}, {name: "公告管理"}];
     },
+    onlyLast(){
+      return this.$route.query.last==1
+    },
     optList() {
       return [
         {

src/saas/AppSpecialPeople/add.vue

@@ -551,6 +551,7 @@ export default {
 <style lang="scss" scoped>
 .add {
   padding-bottom: 112px;
+  font-size: 32px;
 
   .item {
     width: 100%;