上报

src/project/weiyang/AppPatrolReport/AppPatrolReport.vue

@@ -94,9 +94,9 @@ export default {
     // }
   },
   onReachBottom() {
-    // if (!this.tabIndex) {
+    if (!this.tabIndex) {
-    //   this.$nextTick(() => this.$refs['List'].nextPage())
+      uni.$emit('nextPage')
-    // }
+    }
   },
 }
 </script>

src/project/weiyang/AppPatrolReport/Content.vue

@@ -192,7 +192,7 @@ export default {
   }
   .contents {
     width: calc(100% - 64px);
-    margin: 16px 0 0 32px;
+    margin: 0 0 0 32px;
     padding-bottom: 252px;
   }
   ::v-deep .u-form {

src/project/weiyang/AppPatrolReport/Detail.vue

@@ -247,7 +247,7 @@ uni-page-body {
   }
   .header-top {
     display: flex;
-    margin: 16px 0 30px 0;
+    margin: 0 0 30px 0;
     padding: 32px 32px 0;
     .avatars {
       width: 80px;

src/project/weiyang/AppPatrolReport/List.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="list">
-    <div class="top-tab" :style="{'top': `${statusBarHeight+50}px`}">
+    <div class="top-tab" :style="{'top': `${statusBarHeight+44}px`}">
       <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#222"
         active-color="#1D2229" :bar-style="barStyle"  font-size="34" @change="change"></u-tabs>
       <div class="select-top">
@@ -67,7 +67,7 @@ export default {
       ],
       currentTabs: 0,
       current: 1,
-      pages: 0,
+      pages: 2,
       searchGrid: {girdName: ''},
       showType: false,
       eventStatus: '',
@@ -90,18 +90,20 @@ export default {
     }
   },
   mounted() {
-    console.log(1)
     this.searchGrid.girdId = this.user.girdId
     this.searchGrid.girdName = this.user.girdName
-    this.current = 1
     this.$dict.load('clapEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory', 'residentEventSource').then(() => {
-      this.getList()
+      this.getListInit()
       this.getIsAdd()
     })
+    uni.$on('nextPage', () => {
+      this.nextPage()
+    })
   },
   methods: {
     getListInit() {
       this.current = 1
+      this.pages = 2
       this.getList()
     },
     nextPage() {
@@ -109,10 +111,11 @@ export default {
       this.getList()
     },
     getList() {
+      if(this.current > this.pages) return
       let {current, eventStatus, searchGrid: {id: girdId}} = this
       this.$instance.post(`/app/apppatrolreportinfov2/listByGirdMember`, null, {
         params: {
-          size: 10,
+          size: 4,
           current, 
           eventStatus, 
           girdId,
@@ -132,19 +135,16 @@ export default {
         this.eventStatus = e[0].value
         this.eventStatusText = e[0].label
       }
-      this.current = 1
+      this.getListInit()
-      this.getList()
     },
 
     handleSelectGird(v) {
       this.searchGrid = v
-      this.current = 1
+      this.getListInit()
-      this.getList()
     },
     clearGrid() {
       this.searchGrid = {girdName: ''}
-      this.current = 1
+      this.getListInit()
-      this.getList()
     },
 
     goDetail(item) {
@@ -152,11 +152,10 @@ export default {
     },
 
     change(index) {
-      this.current = 1
       this.datas = []
       this.eventStatus = ''
       this.currentTabs = index
-      this.getList()
+      this.getListInit()
     },
 
     linkTo(url) {
@@ -235,7 +234,8 @@ export default {
   }
 
   .list-content {
-    margin: 244px 0 200px 32px;
+    margin: 228px 0 0 32px;
+    padding-bottom: 200px;
   }
 
   .item {

src/project/weiyang/AppPatrolReport/StatisticsList.vue

@@ -130,7 +130,7 @@ uni-page-body {
     }
   }
   .list-content {
-    margin: 16px 0 0 32px;
+    margin: 0 0 0 32px;
   }
 
   .item {

src/project/weiyang/AppPeopleList/PeopleList.vue

@@ -229,20 +229,25 @@ export default {
       })
     },
     confirmTag() {
-      var residentId = [], residentLabelList = []
+      var residentIds = [], residentLabelList = []
       this.datas.map((item) => {
         if(item.isCheck) {
-          residentId.push(item.id)
+          residentIds.push(item.id)
         }
       })
       this.tagList.map((item) => {
-        residentLabelList.push(item)
+        if(item.isCheck) {
+          var e = {
+            labelId: item.id,
+            labelName: item.labelName
+          }
+          residentLabelList.push(e)
+        }
+        
       })
-      this.$instance.post('app/appresidentlabel/batchUpdate', {
+      this.$instance.post('app/appresidentlabel/batchUpdate', { residentIds,residentLabelList }).then((res) => {
-        residentIds: residentId,
-        residentLabelList
-      }).then((res) => {
         if (res.code == 0) {
+          this.showTag = false
           this.$u.toast('操作成功')
           this.getList()
         }
@@ -288,7 +293,7 @@ export default {
       }
       .area-content {
         width: 100%;
-        padding: 26px 32px;
+        padding: 26px 0;
         box-sizing: border-box;
         font-family: PingFangSC-Regular;
         font-size: 32px;

src/project/weiyang/AppPhotoReport/PhotoDetail.vue

@@ -32,29 +32,30 @@
     </AiGroup> -->
     <!-- <u-gap height="24"/> -->
     <!-- <u-tabs :list="[{name:'办理进度'},{name:'我的评价'}]" :current="currentTab" @change="v=>currentTab=v"/> -->
-    <div class="border-r pad-b252">
+    <div :class="isShowBtn ? 'pad-b252' : ''">
-      <div class="tab-content">
+      <div class="border-r">
-        <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)" :class="currentTab == index ? 'active' : ''">{{ item.name }}
+        <div class="tab-content">
-          <span class="active-line" v-if="currentTab == index"/>
+          <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="tabClick(index)" :class="currentTab == index ? 'active' : ''">{{ item.name }}
+            <span class="active-line" v-if="currentTab == index"/>
+          </div>
         </div>
+        <u-gap height="24"/>
+        <AiGroup noBorder v-if="currentTab=='0'">
+          <AiStep v-for="(item,i) in process" :key="item.id" :index="i">
+            <div class="start">
+              <div class="fill stepTitle" v-text="item.systemExplain"/>
+              <div class="color-999 mar-r32 stepTime" v-text="item.doTime"/>
+            </div>
+            <div v-if="item.doExplain" class="stepContent mar-t8" v-text="item.doExplain"/>
+            <div class="imgs">
+              <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index" @click="previewImage(item.files, e.url)"/>
+            </div>
+            <u-gap height="48"/>
+          </AiStep>
+        </AiGroup>
+        <AiEvaluation v-if="currentTab=='1' && showEvaluation" :bid="info.id" type="show"/>
       </div>
-      <u-gap height="24"/>
-      <AiGroup noBorder v-if="currentTab=='0'">
-        <AiStep v-for="(item,i) in process" :key="item.id" :index="i">
-          <div class="start">
-            <div class="fill stepTitle" v-text="item.systemExplain"/>
-            <div class="color-999 mar-r32 stepTime" v-text="item.doTime"/>
-          </div>
-          <div v-if="item.doExplain" class="stepContent mar-t8" v-text="item.doExplain"/>
-          <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index" @click="previewImage(item.files, e.url)"/>
-          </div>
-          <u-gap height="48"/>
-        </AiStep>
-      </AiGroup>
     </div>
-    
-    <AiEvaluation v-if="currentTab=='1' && showEvaluation" :bid="info.id" type="show"/>
     <AiEvaluation v-if="info.eventStatus > 1 && showEvaluation" v-model="evaluation" class="fixed-bottom bg-fff" :bid="info.id">
       <div class="footer">
         <div class="btn">去评价</div>
@@ -104,6 +105,9 @@ export default {
     tabList() {
       var list =  !this.evaluation.id ? [{name:'办理进度'}] : [{name:'办理进度'},{name:'我的评价'}]
       return list
+    },
+    isShowBtn() {
+      return this.info.eventStatus > 1 && this.showEvaluation && !this.evaluation.id
     }
   },
   onShow() {
@@ -183,6 +187,7 @@ export default {
     padding: 32px 0 32px 32px;
     box-sizing: border-box;
     background-color: none!important;
+    border-radius: 16px;
   }
   h2 {
     font-family: PingFangSC-SNaNpxibold;

src/project/weiyang/AppPhotoReport/PhotoForm.vue

@@ -221,7 +221,7 @@ export default {
       if (this.flag) return
       
       this.$loading()
-      this.$instance.post(`/app/apppatrolreportinfov2/addByGirdMember`, {
+      this.$instance.post(`/app/apppatrolreportinfov2/addByApplet`, {
         ...this.form,
         openid: this.user.openid,
         portrait: this.user.avatarUrl,
@@ -272,7 +272,7 @@ export default {
     margin-bottom: 24px;
     background: #fff;
     width: calc(100% - 64px);
-    margin: 16px 0 32px 32px;
+    margin: 0 0 32px 32px;
     border-radius: 16px;
   }